/soc/2013/ankitkv/gobjectification: 3ef1583fa805: Merged default...

Ankit Vani a at nevitus.org
Wed Feb 19 07:44:36 EST 2014


Changeset: 3ef1583fa80563233abcfb7bb8b0c6da75689532
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-19 17:48 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3ef1583fa805

Description:

Merged default branch

diffstat:

 doc/reference/libpurple/signals_blist.xml |   2 +-
 finch/gntblist.c                          |  37 +++++++++++++++++++++++++++++++
 finch/gntblist.h                          |  12 +++++++++-
 libpurple/blistnode.h                     |   7 ++++-
 4 files changed, 54 insertions(+), 4 deletions(-)

diffs (109 lines):

diff --git a/doc/reference/libpurple/signals_blist.xml b/doc/reference/libpurple/signals_blist.xml
--- a/doc/reference/libpurple/signals_blist.xml
+++ b/doc/reference/libpurple/signals_blist.xml
@@ -152,7 +152,7 @@ void                user_function       
                                                         gpointer user_data)
 </programlisting>
   <para>
-Emitted when a buddlist menu is being constructed <literal>menu</literal> is a pointer to a GList of PurpleBlistNodeAction's allowing a plugin to add menu items.
+Emitted when a buddlist menu is being constructed <literal>menu</literal> is a pointer to a GList of PurpleMenuAction's allowing a plugin to add menu items.
   </para>
 </refsect2>
 
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -3232,3 +3232,40 @@ GntTree * finch_blist_get_tree(void)
 	return ggblist ? GNT_TREE(ggblist->tree) : NULL;
 }
 
+/**************************************************************************
+ * GBoxed code
+ **************************************************************************/
+static FinchBlistManager *
+finch_blist_manager_copy(FinchBlistManager *manager)
+{
+	FinchBlistManager *manager_new;
+
+	g_return_val_if_fail(manager != NULL, NULL);
+
+	manager_new = g_new(FinchBlistManager, 1);
+	*manager_new = *manager;
+
+	return manager_new;
+}
+
+static void
+finch_blist_manager_free(FinchBlistManager *manager)
+{
+	g_return_if_fail(manager != NULL);
+
+	g_free(manager);
+}
+
+GType
+finch_blist_manager_get_type(void)
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		type = g_boxed_type_register_static("FinchBlistManager",
+				(GBoxedCopyFunc)finch_blist_manager_copy,
+				(GBoxedFreeFunc)finch_blist_manager_free);
+	}
+
+	return type;
+}
diff --git a/finch/gntblist.h b/finch/gntblist.h
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -31,6 +31,8 @@
 #include "buddylist.h"
 #include "gnttree.h"
 
+#define FINCH_TYPE_BLIST_MANAGER (finch_blist_manager_get_type())
+
 /**********************************************************************
  * GNT BuddyList API
  **********************************************************************/
@@ -65,6 +67,13 @@ struct _FinchBlistManager
 };
 
 /**
+ * finch_blist_manager_get_type:
+ *
+ * Returns: The #GType for the #FinchBlistManager boxed structure.
+ */
+GType finch_blist_manager_get_type(void);
+
+/**
  * finch_blist_get_ui_ops:
  *
  * Get the ui-functions.
@@ -177,7 +186,8 @@ void finch_blist_uninstall_manager(const
  *
  * Find a buddy list manager.
  *
- * Returns:  The manager with the requested identifier, if available. %NULL otherwise.
+ * Returns: The manager with the requested identifier, if available. %NULL
+ *          otherwise.
  */
 FinchBlistManager * finch_blist_manager_find(const char *id);
 
diff --git a/libpurple/blistnode.h b/libpurple/blistnode.h
--- a/libpurple/blistnode.h
+++ b/libpurple/blistnode.h
@@ -103,8 +103,11 @@ struct _PurpleBlistNodeClass {
  * accounts, and the number of online children.
  *
  * The two types of counting nodes are:
- * 1. Contact: Keeps track of the number of buddies under it.
- * 2. Group:   Keeps track of the number of chats and contacts under it.
+ * <orderedlist>
+ *  <listitem>Contact: Keeps track of the number of buddies under it.</listitem>
+ *  <listitem>Group: Keeps track of the number of chats and contacts under it.
+ *                                                                   </listitem>
+ * </orderedlist>
  *
  * See #PurpleContact, #PurpleGroup
  */



More information about the Commits mailing list