[Gaim-commits] CVS: gaim/src gtkblist.c,1.215,1.216 gtkprefs.c,1.233,1.234 prefs.c,1.439,1.440

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11924/src

Modified Files:
	gtkblist.c gtkprefs.c prefs.c 
Log Message:
Gone to watch Vertigo with my gal


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -p -r1.215 -r1.216
--- gtkblist.c	13 Dec 2004 01:49:55 -0000	1.215
+++ gtkblist.c	13 Dec 2004 02:02:05 -0000	1.216
@@ -1002,17 +1002,17 @@ gaim_gtk_blist_expand_contact_cb(GtkWidg
 	for(bnode = node->child; bnode; bnode = bnode->next) {
 		gaim_gtk_blist_update(NULL, bnode);
 	}
-	
+
 	/* This ensures that the bottom buddy is visible, i.e. not scrolled off the alignment */
 	get_iter_from_node(node, &parent);
-	gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(gtkblist->treemodel), &iter, &parent, 
+	gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(gtkblist->treemodel), &iter, &parent,
 			  gtk_tree_model_iter_n_children(GTK_TREE_MODEL(gtkblist->treemodel), &parent) -1);
 	path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
 	/* Let the treeview draw so it knows where to scroll */
 	while (gtk_events_pending())
 		gtk_main_iteration();
-	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW(gtkblist->treeview), path, NULL, FALSE, 0, 0); 
-	
+	gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW(gtkblist->treeview), path, NULL, FALSE, 0, 0);
+
 
 	gaim_gtk_blist_update(NULL, node);
 	gtk_tree_path_free(path);
@@ -3021,6 +3021,8 @@ update_menu_bar(GaimGtkBuddyList *gtkbli
 
 	sensitive = (gaim_connections_get_all() != NULL);
 
+	gtk_widget_set_sensitive(gtkblist->treeview, sensitive);
+
 	for (i = 0; i < SIZEOF_REQUIRE_CONNECTION; i++)
 	{
 		widget = gtk_item_factory_get_widget(gtkblist->ift, require_connection[i]);
@@ -3173,9 +3175,6 @@ static void gaim_gtk_blist_show(GaimBudd
 	protomenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Account Actions"));
 	pluginmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Plugin Actions"));
 
-	update_menu_bar(gtkblist);
-	gaim_gtk_blist_update_plugin_actions();
-
 	/****************************** GtkTreeView **********************************/
 	sw = gtk_scrolled_window_new(NULL,NULL);
 	gtk_widget_show(sw);
@@ -3280,6 +3279,10 @@ static void gaim_gtk_blist_show(GaimBudd
 	if(!strcmp(gaim_prefs_get_string("/gaim/gtk/sound/method"), "none"))
 		gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE); 
 
+	/* Update some dynamic things */
+	update_menu_bar(gtkblist);
+	gaim_gtk_blist_update_plugin_actions();
+
 	/* OK... let's show this bad boy. */
 	if (gaim_prefs_get_bool("/gaim/gtk/blist/list_visible") || docklet_count == 0) {
 		gaim_gtk_blist_refresh(list);
@@ -3289,7 +3292,7 @@ static void gaim_gtk_blist_show(GaimBudd
 
 	/* start the refresh timer */
 	gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)gaim_gtk_blist_refresh_timer, list);
-	
+
 	handle = gaim_gtk_blist_get_handle();
 
 	/* things that affect how buddies are displayed */

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -p -r1.233 -r1.234
--- gtkprefs.c	13 Dec 2004 01:24:19 -0000	1.233
+++ gtkprefs.c	13 Dec 2004 02:02:05 -0000	1.234
@@ -2369,6 +2369,8 @@ void gaim_gtk_prefs_update_old() {
 	gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies");
 	gaim_prefs_remove("/gaim/gtk/blist/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
+	gaim_prefs_remove("/gaim/gtk/blist/show_idle_time");
+	gaim_prefs_remove("/gaim/gtk/blist/show_warning_level");
 	gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts");
 	gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
 	gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links");

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -d -p -r1.439 -r1.440
--- prefs.c	13 Dec 2004 00:52:07 -0000	1.439
+++ prefs.c	13 Dec 2004 02:02:05 -0000	1.440
@@ -1025,11 +1025,11 @@ void gaim_prefs_update_old() {
 	gaim_prefs_remove("/core/away/auto_response/in_active_conv");
 	gaim_prefs_remove("/core/away/auto_response/sec_before_resend");
 	gaim_prefs_remove("/core/away/auto_response");
+	gaim_prefs_remove("/core/buddies/use_server_alias");
 	gaim_prefs_remove("/core/conversations/away_back_on_send");
 	gaim_prefs_remove("/core/conversations/send_urls_as_links");
 	gaim_prefs_remove("/core/conversations/im/show_login");
 	gaim_prefs_remove("/core/conversations/chat/show_join");
 	gaim_prefs_remove("/core/conversations/chat/show_leave");
 	gaim_prefs_remove("/core/conversations/combine_chat_im");
-	gaim_prefs_remove("/core/buddies/use_server_alias");
 }