changeset 8252:10a41e67a800

[gaim-migrate @ 8975] I'm tired, so I probably broke something... 1. clean up warnings trying to put chats into the blist before the blist is there to put chats in 2. clean up warnings trying to mess with the buddy pounce menu before the buddy pounce menu is there to be messed with 3. clean up warnings with reconnecting and the progress bars in the connection dialog, i think 4. re-order things so the tab doesn't go grey if it's already red. this annoyed me. committer: Tailor Script <[e-mail]>

--- a/src/gtkblist.c	Fri Feb 13 05:56:17 2004 +0000
+++ b/src/gtkblist.c	Fri Feb 13 07:48:19 2004 +0000
@@ -3065,17 +3065,17 @@
 	g_timeout_add(0, (GSourceFunc)do_selection_changed, new_selection);
 }
 
-static void insert_node(GaimBuddyList *list, GaimBlistNode *node, GtkTreeIter *iter)
+static gboolean insert_node(GaimBuddyList *list, GaimBlistNode *node, GtkTreeIter *iter)
 {
 	GtkTreeIter parent_iter, cur, *curptr = NULL;
 	struct _gaim_gtk_blist_node *gtknode = node->ui_data;
 	GtkTreePath *newpath;
 
 	if(!gtknode || !iter)
-		return;
+		return FALSE;
 
 	if(node->parent && !get_iter_from_node(node->parent, &parent_iter))
-		return;
+		return FALSE;
 
 	if(get_iter_from_node(node, &cur))
 		curptr = &cur;
@@ -3115,6 +3115,7 @@
 		}
 	}
 
+	return TRUE;
 }
 
 static void gaim_gtk_blist_update_group(GaimBuddyList *list, GaimBlistNode *node)
@@ -3134,7 +3135,8 @@
 		char *mark, *esc;
 		GtkTreeIter iter;
 
-		insert_node(list, node, &iter);
+		if(!insert_node(list, node, &iter))
+			return;
 
 		esc = g_markup_escape_text(group->name, -1);
 		if(gaim_prefs_get_bool("/gaim/gtk/blist/show_group_count")) {
@@ -3246,7 +3248,8 @@
 			 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")))) {
 		GtkTreeIter iter;
 
-		insert_node(list, node, &iter);
+		if(!insert_node(list, node, &iter))
+			return;
 
 		if(gtknode->contact_expanded) {
 			GdkPixbuf *status;
@@ -3298,7 +3301,9 @@
 			 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")))) {
 		GtkTreeIter iter;
 
-		insert_node(list, node, &iter);
+		if(!insert_node(list, node, &iter))
+			return;
+
 		buddy_node(buddy, &iter, node);
 
 	} else {
@@ -3323,7 +3328,8 @@
 		GdkPixbuf *status;
 		char *mark;
 
-		insert_node(list, node, &iter);
+		if(!insert_node(list, node, &iter))
+			return;
 
 		status = gaim_gtk_blist_get_status_icon(node,
 				(gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons") ?

--- a/src/gtkconn.c	Fri Feb 13 05:56:17 2004 +0000
+++ b/src/gtkconn.c	Fri Feb 13 07:48:19 2004 +0000
@@ -54,14 +54,13 @@
 
 static void kill_meter(struct signon_meter *meter, const char *text)
 {
-	if(!meter->progress)
+	if(gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(meter->progress)) == 1)
 		return;
 
 	gtk_widget_set_sensitive(meter->button, FALSE);
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(meter->progress), 1);
 	gtk_label_set_text(GTK_LABEL(meter->status), text);
 	meter_win->active_count--;
-	meter->progress = NULL;
 
 	if (meter_win->active_count == 0) {
 		gtk_widget_destroy(meter_win->window);

--- a/src/gtkconv.c	Fri Feb 13 05:56:17 2004 +0000
+++ b/src/gtkconv.c	Fri Feb 13 07:48:19 2004 +0000
@@ -5354,14 +5354,14 @@
 		{
 			strcpy(color, "#314E6C");
 		}
+		else if (gaim_conversation_get_unseen(conv) == GAIM_UNSEEN_TEXT)
+		{
+			strcpy(color, "#DF421E");
+		}
 		else if (gaim_conversation_get_unseen(conv) == GAIM_UNSEEN_EVENT)
 		{
 			strcpy(color, "#868272");
 		}
-		else if (gaim_conversation_get_unseen(conv) == GAIM_UNSEEN_TEXT)
-		{
-			strcpy(color, "#DF421E");
-		}
 
 		if (*color != '\0')
 		{

--- a/src/gtkpounce.c	Fri Feb 13 05:56:17 2004 +0000
+++ b/src/gtkpounce.c	Fri Feb 13 07:48:19 2004 +0000
@@ -736,6 +736,9 @@
 	GtkWidget *item;
 	GList *l;
 
+	if(!menu)
+		return;
+
 	for (l = gtk_container_get_children(GTK_CONTAINER(menu));
 		 l != NULL;
 		 l = l->next) {
@@ -743,7 +746,7 @@
 		gtk_widget_destroy(GTK_WIDGET(l->data));
 	}
 	g_list_free(l);
-	
+
 	/* "New Buddy Pounce" */
 	item = gtk_menu_item_new_with_label(_("New Buddy Pounce"));
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);