Mercurial > pidgin3 / changeset

--- a/libpurple/blistnode.c	Sun Jul 07 02:26:57 2013 +0530
+++ b/libpurple/blistnode.c	Sun Jul 07 04:11:26 2013 +0530
@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "blistnode.h"
+#include "blistnodetypes.h"
+#include "internal.h"
 
 #define PURPLE_BLIST_NODE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNodePrivate))
@@ -48,6 +49,20 @@
 /* Buddy list node API                                                    */
 /**************************************************************************/
 
+static PurpleBListNode *get_next_node(PurpleBListNode *node, gboolean godeep)
+{
+	if (node == NULL)
+		return NULL;
+
+	if (godeep && node->child)
+		return node->child;
+
+	if (node->next)
+		return node->next;
+
+	return get_next_node(node->parent, FALSE);
+}
+
 PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline)
 {
 	PurpleBListNode *ret = node;
@@ -244,7 +259,7 @@
 
 	value = g_new0(GValue, 1);
 	g_value_init(value, G_TYPE_STRING);
-	g_value_set_int(value, data);
+	g_value_set_string(value, data);
 
 	g_hash_table_replace(priv->settings, g_strdup(key), value);
 
@@ -294,9 +309,9 @@
 	g_free(value);
 }
 
-/**************************************************************************/
-/* GObject code
-/**************************************************************************/
+/**************************************************************************
+ * GObject code
+ **************************************************************************/
 
 /* GObject Property names */
 #define PROP_DONT_SAVE_S  "dont-save"
@@ -349,7 +364,7 @@
 static void
 purple_blist_node_finalize(GObject *object)
 {
-	PurpleBListNode *priv = PURPLE_BLIST_NODE_GET_PRIVATE(object);
+	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(object);
 
 	g_hash_table_destroy(priv->settings);
 

--- a/libpurple/buddylist.c	Sun Jul 07 02:26:57 2013 +0530
+++ b/libpurple/buddylist.c	Sun Jul 07 04:11:26 2013 +0530
@@ -767,20 +767,6 @@
 		ops->set_visible(purplebuddylist, show);
 }
 
-static PurpleBListNode *get_next_node(PurpleBListNode *node, gboolean godeep)
-{
-	if (node == NULL)
-		return NULL;
-
-	if (godeep && node->child)
-		return node->child;
-
-	if (node->next)
-		return node->next;
-
-	return get_next_node(node->parent, FALSE);
-}
-
 void
 purple_blist_update_buddy_status(PurpleBuddy *buddy, PurpleStatus *old_status)
 {