Mercurial > pidgin

diff src/gtkconv.c @ 9301:3d5519a84d02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10105] Some stuff. Mostly from nosnilmot. Re-split the raise on events preference for IMs and chats. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 17 Jun 2004 01:18:21 +0000
parents 98f01c233a40
children 8e1ddf5d81d0
line wrap: on
line diff
--- a/src/gtkconv.c	Thu Jun 17 00:26:57 2004 +0000
+++ b/src/gtkconv.c	Thu Jun 17 01:18:21 2004 +0000
@@ -4680,7 +4680,7 @@
 	g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL);
 
 	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
-		gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+		gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")) {
 
 		gaim_conv_window_raise(gaim_conversation_get_window(conv));
 	}
@@ -4745,7 +4745,7 @@
 	/* Raise the window, if specified in prefs. */
 	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
 	    /* we may want to change this */
-		gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+		gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) {
 
 		gaim_conv_window_raise(gaim_conversation_get_window(conv));
 	}
@@ -4776,7 +4776,11 @@
 
 	win = gaim_conversation_get_window(conv);
 
-	if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
+		((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
+		 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
+		(gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
+		 gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
 		gaim_conv_window_show(win);
 	}
 
@@ -6029,7 +6033,8 @@
 	gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP);
 	gaim_prefs_add_int("/gaim/gtk/conversations/button_type",
 					   GAIM_BUTTON_TEXT_IMAGE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/raise_on_events", FALSE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/chat/raise_on_events", FALSE);
 
 
 	/* Conversations -> Chat */