[gaim-migrate @ 14419]

Thu, 17 Nov 2005 00:11:53 +0000

author
Etan Reisner <deryni@pidgin.im>
date
Thu, 17 Nov 2005 00:11:53 +0000
changeset 12119
2c6a406ec4c8
parent 12118
a8ce129ff7bf
child 12120
46f477246316

[gaim-migrate @ 14419]
Let's try this modification to charkins latest visibility_manager change.

I moved the restore_position and show_all calls into the blist_show function,
since I really don't think we need to be showing and then iconifying the
blist everytime we set_visible gets called without a visibility manager.

I removed the gaim_blist_show call from connection.c that was causing the
blist window to be re-shown when an account connected. I think this was either
a remnant of the blist raise on events pref or a remnant from when we had a
Login screen. I don't think we need it anymore, someone let me know if this
breaks things. I also removed what I believe was the visibility_manager check
that was added to work around the annoyance this was causing.

src/connection.c file | annotate | diff | comparison | revisions
src/gtkblist.c file | annotate | diff | comparison | revisions
--- a/src/connection.c	Wed Nov 16 22:38:57 2005 +0000
+++ b/src/connection.c	Thu Nov 17 00:11:53 2005 +0000
@@ -289,7 +289,6 @@
 		if (ops != NULL && ops->connected != NULL)
 			ops->connected(gc);
 
-		gaim_blist_show();
 		gaim_blist_add_account(account);
 
 		/*
--- a/src/gtkblist.c	Wed Nov 16 22:38:57 2005 +0000
+++ b/src/gtkblist.c	Thu Nov 17 00:11:53 2005 +0000
@@ -3344,8 +3344,7 @@
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD }};
 	if (gtkblist && gtkblist->window) {
-		if(!GTK_WIDGET_VISIBLE(gtkblist->window))
-			gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
+		gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
 		return;
 	}
 
@@ -3532,6 +3531,8 @@
 
 	/* OK... let's show this bad boy. */
 	gaim_gtk_blist_refresh(list);
+	gaim_gtk_blist_restore_position();
+	gtk_widget_show_all(GTK_WIDGET(gtkblist->window));
 	gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
 
 	/* start the refresh timer */
@@ -4071,8 +4072,6 @@
 			gaim_signal_emit(gaim_gtk_blist_get_handle(), "gtkblist-hiding", gtkblist);
 			gtk_widget_hide(gtkblist->window);
 		} else {
-			gaim_gtk_blist_restore_position();
-			gtk_widget_show_all(GTK_WIDGET(gtkblist->window));
 			gtk_window_iconify(GTK_WINDOW(gtkblist->window));
 		}
 	}

mercurial