changeset 19571:de0ae9a3eee2

merge of '67ad9f243a5d108c552110366d15b0e921e0c681' and 'eec0eedd7a4133ae0c0a9d952b8d507369bbc36f'
author Mark Doliner <mark@kingant.net>
date Sun, 02 Sep 2007 08:00:54 +0000
parents 60fc9cadbd92 (diff) 94a2a1ccd6ec (current diff)
children cfc4e56a6a1e dd4b1dc8a0ce
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sun Sep 02 02:27:12 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Sep 02 08:00:54 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",