Mercurial > pidgin.yaz

diff src/gtkblist.c @ 9640:bc2079a32fd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10488] I warmenhoved patch 996233 from Jon Oberheide. Thanks Jon! From his description: The main purpose of this patch is to set the focus of a conversation when it is created. Currently, the focus is set when the conversation is created from: - double-clicking a buddy on the buddy list - right-clicking a buddy and clicking "IM" This patch sets the focus additionally for the following circumstances: - clicking "Buddies -> New Instant Message" - clicking "IM" buddy list button committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 02 Aug 2004 03:21:32 +0000
parents 885bba4f9d3b
children 535343d6ca13
line wrap: on
line diff
--- a/src/gtkblist.c	Mon Aug 02 02:16:47 2004 +0000
+++ b/src/gtkblist.c	Mon Aug 02 03:21:32 2004 +0000
@@ -512,20 +512,7 @@
 
 static void gtk_blist_menu_im_cb(GtkWidget *w, GaimBuddy *b)
 {
-	GaimConversation *conv = gaim_conversation_new(GAIM_CONV_IM, b->account,
-			b->name);
-
-	if(conv) {
-		GaimConvWindow *win = gaim_conversation_get_window(conv);
-
-		gaim_conv_window_raise(win);
-		gaim_conv_window_switch_conversation(
-				gaim_conversation_get_window(conv),
-				gaim_conversation_get_index(conv));
-
-		if (GAIM_IS_GTK_WINDOW(win))
-			gtk_window_present(GTK_WINDOW(GAIM_GTK_WINDOW(win)->window));
-	}
+	gaim_gtkdialogs_new_im(b->account, b->name);
 }
 
 static void gtk_blist_menu_send_file_cb(GtkWidget *w, GaimBuddy *b)
@@ -585,12 +572,12 @@
 
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
-			gaim_conversation_new(GAIM_CONV_IM, ((GaimBuddy*)node)->account, ((GaimBuddy*)node)->name);
+			gaim_gtkdialogs_new_im(((GaimBuddy*)node)->account, ((GaimBuddy*)node)->name);
 			return;
 		} else if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
 			GaimBuddy *buddy =
 				gaim_contact_get_priority_buddy((GaimContact*)node);
-			gaim_conversation_new(GAIM_CONV_IM, buddy->account, buddy->name);
+			gaim_gtkdialogs_new_im(buddy->account, buddy->name);
 			return;
 		}
 	}
@@ -943,19 +930,7 @@
 		else
 			buddy = (GaimBuddy*)node;
 
-		conv = gaim_conversation_new(GAIM_CONV_IM, buddy->account, buddy->name);
-
-		if(conv) {
-			GaimConvWindow *win = gaim_conversation_get_window(conv);
-
-			gaim_conv_window_raise(win);
-			gaim_conv_window_switch_conversation(
-				gaim_conversation_get_window(conv),
-				gaim_conversation_get_index(conv));
-
-			if (GAIM_IS_GTK_WINDOW(win))
-				gtk_window_present(GTK_WINDOW(GAIM_GTK_WINDOW(win)->window));
-		}
+		gaim_gtkdialogs_new_im(buddy->account, buddy->name);
 	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		serv_join_chat(((GaimChat *)node)->account->gc, ((GaimChat *)node)->components);
 	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {