[Gaim-commits] SF.net SVN: gaim: [16818] trunk/src/gtkblist.c

[<sea...@us...>]

Revision: 16818
Author:   seanegan
Date:     2006-08-17 14:16:50 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16818&view=rev

Log Message:
-----------
Remove a g_main_iteration, replace with an idle handler.
Fixes the thread freeze on expanding contacts

Modified Paths:
--------------
    trunk/src/gtkblist.c
Modified: trunk/src/gtkblist.c
===================================================================
--- trunk/src/gtkblist.c	2006-08-17 15:46:58 UTC (rev 16817)
+++ trunk/src/gtkblist.c	2006-08-17 21:16:50 UTC (rev 16818)
@@ -867,6 +867,24 @@
 	}
 }
 
+struct _expand {
+	GtkTreeView *treeview;
+	GtkTreePath *path;
+	GaimBlistNode *node;
+};
+
+static gboolean 
+scroll_to_expanded_cell(struct _expand *ex)
+{
+	gtk_tree_view_scroll_to_cell(ex->treeview, ex->path, NULL, FALSE, 0, 0);
+	gaim_gtk_blist_update_contact(NULL, ex->node);
+
+	gtk_tree_path_free(ex->path);
+	g_free(ex);
+	
+	return FALSE;
+}
+
 static void
 gaim_gtk_blist_expand_contact_cb(GtkWidget *w, GaimBlistNode *node)
 {
@@ -875,6 +893,8 @@
 	GaimBlistNode *bnode;
 	GtkTreePath *path;
 
+	struct _expand *ex = g_new0(struct _expand, 1);
+	
 	if(!GAIM_BLIST_NODE_IS_CONTACT(node))
 		return;
 
@@ -891,13 +911,12 @@
 	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);
-
-	gaim_gtk_blist_update_contact(NULL, node->child);
-	gtk_tree_path_free(path);
+	ex->treeview = GTK_TREE_VIEW(gtkblist->treeview);
+	ex->path = path;
+	ex->node = node->child;
+	g_idle_add(scroll_to_expanded_cell, ex);
 }
 
 static void
@@ -3933,6 +3952,8 @@
                         G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER);
 
 	gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(gtkblist->treeview), TRUE);
+
 	gtk_widget_show(gtkblist->treeview);
 	gtk_widget_set_name(gtkblist->treeview, "gaim_gtkblist_treeview");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.