[Gaim-commits] SF.net SVN: gaim: [16331] trunk/console

[<sa...@us...>]

Revision: 16331
Author:   sadrul
Date:     2006-06-24 13:06:37 -0700 (Sat, 24 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16331&view=rev

Log Message:
-----------
Make the tooltips move to the right place when the selected item goes up/down when someone signs on/off.

Modified Paths:
--------------
    trunk/console/gntblist.c
    trunk/console/libgnt/gnttree.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-06-24 18:11:59 UTC (rev 16330)
+++ trunk/console/gntblist.c	2006-06-24 20:06:37 UTC (rev 16331)
@@ -24,6 +24,7 @@
 
 static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist);
 static void add_group(GaimGroup *group, GGBlist *ggblist);
+static void add_node(GaimBlistNode *node, GGBlist *ggblist);
 static void draw_tooltip(GGBlist *ggblist);
 
 static void
@@ -31,6 +32,15 @@
 {
 }
 
+static void add_node(GaimBlistNode *node, GGBlist *ggblist)
+{
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+		add_buddy((GaimBuddy*)node, ggblist);
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+		add_group((GaimGroup*)node, ggblist);
+	draw_tooltip(ggblist);
+}
+
 static void
 remove_tooltip(GGBlist *ggblist)
 {
@@ -56,14 +66,8 @@
 		GaimGroup *group = gaim_buddy_get_group((GaimBuddy*)node);
 		if (gaim_blist_get_group_online_count(group) == 0)
 			node_remove(list, (GaimBlistNode*)group);
-		else if (ggblist->tnode == (GaimBlistNode *)group)	/* Need to update the counts */
-			draw_tooltip(ggblist);
 	}
-
-	if (ggblist->tnode == node)
-	{
-		remove_tooltip(ggblist);
-	}
+	draw_tooltip(ggblist);
 }
 
 static void
@@ -73,7 +77,7 @@
 	{
 		GaimBuddy *buddy = (GaimBuddy*)node;
 		if (gaim_presence_is_online(gaim_buddy_get_presence(buddy)))
-			add_buddy(buddy, list->ui_data);
+			add_node((GaimBlistNode*)buddy, list->ui_data);
 		else
 			node_remove(gaim_get_blist(), node);
 	}
@@ -171,19 +175,16 @@
 		return;
 
 	group = gaim_buddy_get_group(buddy);
-	add_group(group, ggblist);
+	add_node((GaimBlistNode*)group, ggblist);
 
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
 				get_buddy_display_name(buddy), group, NULL);
-
-	if (ggblist->tnode == (GaimBlistNode*)group)
-		draw_tooltip(ggblist);
 }
 
 static void
 buddy_signed_on(GaimBuddy *buddy, GGBlist *ggblist)
 {
-	add_buddy(buddy, ggblist);
+	add_node((GaimBlistNode*)buddy, ggblist);
 }
 
 static void

Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-06-24 18:11:59 UTC (rev 16330)
+++ trunk/console/libgnt/gnttree.c	2006-06-24 20:06:37 UTC (rev 16331)
@@ -6,6 +6,7 @@
 enum
 {
 	SIG_SELECTION_CHANGED,
+	SIG_SCROLLED,
 	SIGS,
 };
 
@@ -345,6 +346,14 @@
 					 NULL, NULL,
 					 gnt_closure_marshal_VOID__POINTER_POINTER,
 					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+	signals[SIG_SCROLLED] = 
+		g_signal_new("scrolled",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 0,
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__INT,
+					 G_TYPE_NONE, 1, G_TYPE_INT);
 
 	DEBUG;
 }
@@ -445,6 +454,7 @@
 	}
 
 	redraw_tree(tree);
+	g_signal_emit(tree, signals[SIG_SCROLLED], 0, count);
 }
 
 static int


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