changeset
Clean merge.
Wed, 19 Feb 2014 23:16:15 -0800
- author
- Mark Doliner <mark@kingant.net>
- date
- Wed, 19 Feb 2014 23:16:15 -0800
- changeset 35593
- ec281a1e2e5a
- parent 35592
- a8782ded6acc (current diff)
- parent 35591
- d9428ff72069 (diff)
- child 35594
- f1831b0421b2
Clean merge.
--- a/COPYRIGHT Wed Feb 19 23:15:52 2014 -0800 +++ b/COPYRIGHT Wed Feb 19 23:16:15 2014 -0800 @@ -15,7 +15,7 @@ piece of code, then that code should be traced through our version control system to see from where it came and who has modified it. -Copyright (C) 1998-2013 by the following: +Copyright (C) 1998-2014 by the following: Mark Saleem Abdulrasool @@ -572,6 +572,7 @@ Gideon van Melle Arjan van de Ven Philip Van Hoof +Ankit Vani Kristof Vansant James Vega David Vermeille
--- a/doc/reference/finch/Makefile.am Wed Feb 19 23:15:52 2014 -0800 +++ b/doc/reference/finch/Makefile.am Wed Feb 19 23:16:15 2014 -0800 @@ -94,14 +94,19 @@ -I$(top_srcdir)/finch/libgnt \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(GPLUGIN_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(GNT_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/finch/libfinch.la + $(top_builddir)/finch/libfinch.la \ + $(DBUS_LIBS) \ + $(INTLLIBS) \ + $(GLIB_LIBS) \ + $(LIBXML_LIBS) \ + $(GNT_LIBS) \ + $(GSTREAMER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make
--- a/doc/reference/libpurple/Makefile.am Wed Feb 19 23:15:52 2014 -0800 +++ b/doc/reference/libpurple/Makefile.am Wed Feb 19 23:16:15 2014 -0800 @@ -131,11 +131,25 @@ $(NETWORKMANAGER_CFLAGS) \ $(JSON_CFLAGS) \ $(GNUTLS_CFLAGS) \ - $(NSS_CFLAGS) \ - $(ZLIB_CFLAGS) + $(NSS_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libpurple/libpurple.la + $(top_builddir)/libpurple/libpurple.la \ + $(STATIC_LINK_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) \ + $(LIBXML_LIBS) \ + $(NETWORKMANAGER_LIBS) \ + $(INTLLIBS) \ + $(FARSTREAM_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTVIDEO_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(IDN_LIBS) \ + $(JSON_LIBS) \ + $(GNUTLS_LIBS) \ + $(NSS_LIBS) \ + -lm # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make
--- a/doc/reference/libpurple/signals_blist.xml Wed Feb 19 23:15:52 2014 -0800 +++ b/doc/reference/libpurple/signals_blist.xml Wed Feb 19 23:16:15 2014 -0800 @@ -152,7 +152,7 @@ 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>
--- a/doc/reference/pidgin/Makefile.am Wed Feb 19 23:15:52 2014 -0800 +++ b/doc/reference/pidgin/Makefile.am Wed Feb 19 23:16:15 2014 -0800 @@ -96,7 +96,6 @@ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/pidgin \ $(GLIB_CFLAGS) \ - $(GPLUGIN_CFLAGS) \ $(GCR_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(GSTVIDEO_CFLAGS) \ @@ -107,11 +106,24 @@ $(DBUS_CFLAGS) \ $(GTKSPELL_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(WEBKIT_CFLAGS) \ - $(INTGG_CFLAGS) + $(WEBKIT_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/pidgin/libpidgin.la + $(top_builddir)/pidgin/libpidgin.la \ + $(GLIB_LIBS) \ + $(GCR_LIBS) \ + $(DBUS_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTVIDEO_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(XSS_LIBS) \ + $(SM_LIBS) \ + $(INTLLIBS) \ + $(GTKSPELL_LIBS) \ + $(LIBXML_LIBS) \ + $(WEBKIT_LIBS) \ + $(GTK_LIBS) \ + $(X11_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make
--- a/finch/gntblist.c Wed Feb 19 23:15:52 2014 -0800 +++ b/finch/gntblist.c Wed Feb 19 23:16:15 2014 -0800 @@ -3201,3 +3201,40 @@ 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; +}
--- a/finch/gntblist.h Wed Feb 19 23:15:52 2014 -0800 +++ b/finch/gntblist.h Wed Feb 19 23:16:15 2014 -0800 @@ -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 @@ }; /** + * 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 @@ * * 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);
--- a/libpurple/blistnode.h Wed Feb 19 23:15:52 2014 -0800 +++ b/libpurple/blistnode.h Wed Feb 19 23:16:15 2014 -0800 @@ -103,8 +103,11 @@ * 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 */
--- a/libpurple/plugin.h Wed Feb 19 23:15:52 2014 -0800 +++ b/libpurple/plugin.h Wed Feb 19 23:16:15 2014 -0800 @@ -218,8 +218,8 @@ /** * PurplePluginAction: - * @plugin: set to the owning plugin - * @context: NULL for plugin actions menu, set to the PurpleConnection for + * @plugin: Set to the owning plugin + * @context: %NULL for plugin actions menu, set to the #PurpleConnection for * account actions menu * * The structure used in the actions member of PurplePluginInfo @@ -228,13 +228,9 @@ char *label; void (*callback)(PurplePluginAction *); - /** set to the owning plugin */ PurplePlugin *plugin; - /** NULL for plugin actions menu, set to the PurpleConnection for - account actions menu */ gpointer context; - gpointer user_data; };
