# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1091990367 0
# Node ID 8be2c406a1f1642c131085040ddcc1f2e85fce56
# Parent  4faa27ea2151ab0a2f680a12237477e6cebe6451
[gaim-migrate @ 10589]
"Raise window on events" is no longer "Raise window and steal focus
on events"

committer: Tailor Script <tailor@pidgin.im>

diff -r 4faa27ea2151 -r 8be2c406a1f1 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Sun Aug 08 17:57:04 2004 +0000
+++ b/plugins/ChangeLog.API	Sun Aug 08 18:39:27 2004 +0000
@@ -4,10 +4,11 @@
 	Gaim API:
 	* Removed multi.h
 	* Renamed ui.h to gtkdialogs.h
+	* Renamed show_info_dialog to gaim_gtkdialogs_info
+	* Renamed show_log_dialog to gaim_gtkdialogs_log
 	* Renamed show_warn_dialog to gaim_gtkdialogs_warn
 	* Renamed show_im_dialog to gaim_gtkdialogs_im
-	* Renamed show_info_dialog to gaim_gtkdialogs_info
-	* Renamed show_log_dialog to gaim_gtkdialogs_log
+	* Renamed gaim_gtkdialogs_new_im to gaim_gtkdialogs_im_with_user
 
 version 0.81 (08/05/2004):
 	Commands API:
diff -r 4faa27ea2151 -r 8be2c406a1f1 src/gtkblist.c
--- a/src/gtkblist.c	Sun Aug 08 17:57:04 2004 +0000
+++ b/src/gtkblist.c	Sun Aug 08 18:39:27 2004 +0000
@@ -511,7 +511,7 @@
 
 static void gtk_blist_menu_im_cb(GtkWidget *w, GaimBuddy *b)
 {
-	gaim_gtkdialogs_new_im(b->account, b->name);
+	gaim_gtkdialogs_im_with_user(b->account, b->name);
 }
 
 static void gtk_blist_menu_send_file_cb(GtkWidget *w, GaimBuddy *b)
@@ -571,12 +571,12 @@
 
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
-			gaim_gtkdialogs_new_im(((GaimBuddy*)node)->account, ((GaimBuddy*)node)->name);
+			gaim_gtkdialogs_im_with_user(((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_gtkdialogs_new_im(buddy->account, buddy->name);
+			gaim_gtkdialogs_im_with_user(buddy->account, buddy->name);
 			return;
 		}
 	}
@@ -928,7 +928,7 @@
 		else
 			buddy = (GaimBuddy*)node;
 
-		gaim_gtkdialogs_new_im(buddy->account, buddy->name);
+		gaim_gtkdialogs_im_with_user(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)) {
diff -r 4faa27ea2151 -r 8be2c406a1f1 src/gtkconv.c
--- a/src/gtkconv.c	Sun Aug 08 17:57:04 2004 +0000
+++ b/src/gtkconv.c	Sun Aug 08 18:39:27 2004 +0000
@@ -4540,7 +4540,9 @@
 {
 	GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
 
-	gtk_window_present(GTK_WINDOW(gtkwin->window));
+	gtk_widget_show(gtkwin->window);
+	gtk_window_deiconify(GTK_WINDOW(gtkwin->window));
+	gdk_window_raise(gtkwin->window->window);
 }
 
 static void
diff -r 4faa27ea2151 -r 8be2c406a1f1 src/gtkdialogs.c
--- a/src/gtkdialogs.c	Sun Aug 08 17:57:04 2004 +0000
+++ b/src/gtkdialogs.c	Sun Aug 08 18:39:27 2004 +0000
@@ -411,10 +411,11 @@
 }
 
 void
-gaim_gtkdialogs_new_im(GaimAccount *account, const char *username)
+gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username)
 {
 	GaimConversation *conv;
 	GaimConvWindow *win;
+	GaimGtkWindow *gtkwin;
 
 	conv = gaim_find_conversation_with_account(username, account);
 
@@ -422,8 +423,9 @@
 		conv = gaim_conversation_new(GAIM_CONV_IM, account, username);
 
 	win = gaim_conversation_get_window(conv);
+	gtkwin = GAIM_GTK_WINDOW(win);
 
-	gaim_conv_window_raise(win);
+	gtk_window_present(GTK_WINDOW(gtkwin->window));
 	gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv));
 }
 
@@ -436,7 +438,7 @@
 	account  = gaim_request_fields_get_account(fields, "account");
 	username = gaim_request_fields_get_string(fields,  "screenname");
 
-	gaim_gtkdialogs_new_im(account, username);
+	gaim_gtkdialogs_im_with_user(account, username);
 }
 
 void
diff -r 4faa27ea2151 -r 8be2c406a1f1 src/gtkdialogs.h
--- a/src/gtkdialogs.h	Sun Aug 08 17:57:04 2004 +0000
+++ b/src/gtkdialogs.h	Sun Aug 08 18:39:27 2004 +0000
@@ -34,7 +34,7 @@
 void gaim_gtkdialogs_im();
 void gaim_gtkdialogs_info();
 void gaim_gtkdialogs_log();
-void gaim_gtkdialogs_new_im(GaimAccount *, const char *);
+void gaim_gtkdialogs_im_with_user(GaimAccount *, const char *);
 void gaim_gtkdialogs_warn(GaimConnection *, const char *);
 
 void alias_dialog_bud(GaimBuddy *);