/pidgin/main: ec281a1e2e5a: Clean merge.
Mark Doliner
mark at kingant.net
Thu Feb 20 02:16:21 EST 2014
Changeset: ec281a1e2e5a7ed2bca0a1fb5070e25f8f40c169
Author: Mark Doliner <mark at kingant.net>
Date: 2014-02-19 23:16 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/ec281a1e2e5a
Description:
Clean merge.
diffstat:
COPYRIGHT | 3 +-
doc/reference/finch/Makefile.am | 9 +++++-
doc/reference/libpurple/Makefile.am | 20 ++++++++++++++--
doc/reference/libpurple/signals_blist.xml | 2 +-
doc/reference/pidgin/Makefile.am | 20 +++++++++++++---
finch/gntblist.c | 37 +++++++++++++++++++++++++++++++
finch/gntblist.h | 12 +++++++++-
libpurple/blistnode.h | 7 ++++-
libpurple/plugin.h | 8 +-----
9 files changed, 98 insertions(+), 20 deletions(-)
diffs (253 lines):
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyrig
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 @@ Martijn van Beers
Gideon van Melle
Arjan van de Ven
Philip Van Hoof
+Ankit Vani
Kristof Vansant
James Vega
David Vermeille
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -94,14 +94,19 @@ GTKDOC_CFLAGS = \
-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
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -131,11 +131,25 @@ GTKDOC_CFLAGS = \
$(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
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/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -96,7 +96,6 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
$(GLIB_CFLAGS) \
- $(GPLUGIN_CFLAGS) \
$(GCR_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GSTVIDEO_CFLAGS) \
@@ -107,11 +106,24 @@ GTKDOC_CFLAGS = \
$(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
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -3201,3 +3201,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
*/
diff --git a/libpurple/plugin.h b/libpurple/plugin.h
--- a/libpurple/plugin.h
+++ b/libpurple/plugin.h
@@ -218,8 +218,8 @@ struct _PurplePluginUiInfo {
/**
* 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 @@ struct _PurplePluginAction {
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;
};
More information about the Commits
mailing list