merge of '844a19c4148778a7ffb0770a9264621456d807cc'

Mon, 03 Sep 2007 05:17:32 +0000

author
Jeff Connelly <jeff2@soc.pidgin.im>
date
Mon, 03 Sep 2007 05:17:32 +0000
changeset 19736
ff4842155dd2
parent 19731
844a19c41487 (current diff)
parent 19735
deb4971dc234 (diff)
child 19737
6e363a9b0699
child 19762
de705524c134

merge of '844a19c4148778a7ffb0770a9264621456d807cc'
and 'deb4971dc2340ab985d4de7003d1d4609c595e2c'

--- 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",

mercurial