changeset 19593:dd4b1dc8a0ce

merge of '037dd557f9293f0488bb536ed85c24acddad6553' and '384f42f64ff505bcf56a860f6b79a6bf44cc1304'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Mon, 03 Sep 2007 05:17:32 +0000
parents d6802883e96e (current diff) de0ae9a3eee2 (diff)
children 30625863ae2b 0a170af12723
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Mon Sep 03 05:16:36 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Sep 03 05:17:32 2007 +0000
@@ -2622,6 +2622,7 @@
 	struct _pidgin_blist_node *gtknode;
 	GdkRectangle mon_size;
 	int sig;
+	const char *name;
 	
 	if (node == NULL)
 		return;
@@ -2679,8 +2680,9 @@
 
 	gtknode = node->ui_data;
 
+	name = gtk_window_get_title(GTK_WINDOW(gtk_widget_get_toplevel(widget)));
 	gtk_widget_set_app_paintable(gtkblist->tipwindow, TRUE);
-	gtk_window_set_title(GTK_WINDOW(gtkblist->tipwindow), _("Buddy List"));
+	gtk_window_set_title(GTK_WINDOW(gtkblist->tipwindow), name ? name : _("Buddy List"));
 	gtk_window_set_resizable(GTK_WINDOW(gtkblist->tipwindow), FALSE);
 	gtk_widget_set_name(gtkblist->tipwindow, "gtk-tooltips");
 	g_signal_connect(G_OBJECT(gtkblist->tipwindow), "expose_event",