changeset 21075:c14002f7f5ef

merge of '6ac3a8102758d7f3ccaf714b4252c81832e6bcb7' and '71e9513a1f0282f4d7261c0be8bbecb27be04f9a'
author Gabriel Schulhof <nix@go-nix.ca>
date Mon, 08 Oct 2007 15:36:31 +0000
parents f47ae01d0def (diff) 5908daa7dfe3 (current diff)
children b84655373d7b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdebug.c	Sat Oct 06 22:27:01 2007 +0000
+++ b/pidgin/gtkdebug.c	Mon Oct 08 15:36:31 2007 +0000
@@ -689,7 +689,7 @@
 	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
 
 	PIDGIN_DIALOG(win->window);
-	if (blist)
+	if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL)
 		if (blist->window)
 			gtk_window_set_transient_for(GTK_WINDOW(win->window), GTK_WINDOW(blist->window));
 	purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",