im.pidgin.pidgin, im.pidgin.pidgin.next.minor: 73f9fc06f86b6dfcd381f23f36e4d51fa2b01b37

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 73f9fc06f86b6dfcd381f23f36e4d51fa2b01b37
Ancestor: 9c910ea3009780694450a04dc7a9227f6f8ca1eb
Author: sadrul at pidgin.im
Date: 2007-11-26T08:12:40
Branch: im.pidgin.pidgin
Branch: im.pidgin.pidgin.next.minor

Modified files:
        pidgin/gtkdialogs.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

The smiley dialog is transient for the toolbar's parent window, and the about dialog is transient for the buddylist, when available.

-------------- next part --------------
============================================================
--- pidgin/gtkdialogs.c	c723c07d79cc0367e253ef9c12ad19f2cb2513fd
+++ pidgin/gtkdialogs.c	eaa5a1b2375170bec21ab4669aff259496fe4ef3
@@ -349,6 +349,7 @@ void pidgin_dialogs_about()
 	AtkObject *obj;
 	char* filename, *tmp;
 	GdkPixbuf *pixbuf;
+	PidginBuddyList *buddylist;
 
 	if (about != NULL) {
 		gtk_window_present(GTK_WINDOW(about));
@@ -724,6 +725,11 @@ if (purple_plugins_find_with_id("core-tc
 	gtk_widget_grab_default(button);
 
 	/* Let's give'em something to talk about -- woah woah woah */
+	buddylist = pidgin_blist_get_default_gtk_blist();
+	if (buddylist)
+		gtk_window_set_transient_for(GTK_WINDOW(about),
+				GTK_WINDOW(buddylist->window));
+
 	gtk_widget_show_all(about);
 	gtk_window_present(GTK_WINDOW(about));
 }
============================================================
--- pidgin/gtkimhtmltoolbar.c	04cdba5dec1fcd22b433199e5abd40e47f4fe81a
+++ pidgin/gtkimhtmltoolbar.c	ff0d6bf65ee79f103866aac40d8e0d07b6adb07e
@@ -777,6 +777,8 @@ insert_smiley_cb(GtkWidget *smiley, GtkI
 	/* show everything */
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!"));
 	gtk_widget_show_all(dialog);
+	gtk_window_set_transient_for(GTK_WINDOW(dialog),
+			GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar))));
 #ifdef _WIN32
 	winpidgin_ensure_onscreen(dialog);
 #endif