/soc/2013/ankitkv/gobjectification: 7ee6ea4e0d1b: Merged soc.201...

[Ankit Vani]

Changeset: 7ee6ea4e0d1b1aa8ad88a728113e0a4241fb7c20
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-22 15:54 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/7ee6ea4e0d1b

Description:

Merged soc.2013.gobjectification branch

diffstat:

 doc/SIGNAL-HOWTO.dox   |  16 ++++++++--------
 doc/jabber-signals.dox |  12 ++++++------
 doc/ui-ops.dox         |   2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (113 lines):

diff --git a/doc/SIGNAL-HOWTO.dox b/doc/SIGNAL-HOWTO.dox
--- a/doc/SIGNAL-HOWTO.dox
+++ b/doc/SIGNAL-HOWTO.dox
@@ -25,9 +25,9 @@
 	purple_signal_register( purple_plugins_get_handle(), /* Instance */
 				"plugin-load",               /* Signal name */
 				purple_marshal_VOID__POINTER,/* Marshal function */
-				NULL,                        /* Callback return value type */
+				G_TYPE_NONE,                 /* Callback return type */
 				1,                           /* Number of callback arguments (not including void *data) */
-				purple_value_new(PURPLE_TYPE_SUBTYPE,PURPLE_SUBTYPE_PLUGIN) /* Type of first callback argument */
+				PURPLE_TYPE_PLUGIN           /* Type of first callback argument */
 				);
   @endcode
 
@@ -62,8 +62,8 @@
   The @c void @c *data argument at the end of each callback function
   provides the data argument given to purple_signal_connect() .
 
-  @subsubsection cb_ret_type Callback return value type
-  In our case, this is NULL, meaning "returns void".
+  @subsubsection cb_ret_type Callback return type
+  In our case, this is G_TYPE_NONE, meaning "returns void".
   @todo This could be described better.
 
   @subsubsection num_args Number of arguments
@@ -71,10 +71,10 @@
   will take.
 
   @subsubsection type_arg Type of argument
-  @c purple_value_new(PURPLE_TYPE_SUBTYPE,PURPLE_SUBTYPE_PLUGIN) specifies that
-  the first argument given to the callback will be a @c PurplePlugin* . You
-  will need as many "type of argument" arguments to purple_signal_register() as
-  you specified in "Number of arguments" above.
+  @c PURPLE_TYPE_PLUGIN specifies that the first argument given to the callback
+  will be a @c PurplePlugin* . You will need as many "type of argument"
+  arguments to purple_signal_register() as you specified in
+  "Number of arguments" above.
 
   @todo Describe this more.
 
diff --git a/doc/jabber-signals.dox b/doc/jabber-signals.dox
--- a/doc/jabber-signals.dox
+++ b/doc/jabber-signals.dox
@@ -16,7 +16,7 @@
  @signaldef jabber-receiving-iq
   @signalproto
 gboolean (*iq_received)(PurpleConnection *gc, const char *type, const char *id,
-                     const char *from, xmlnode *iq);
+                     const char *from, PurpleXmlNode *iq);
   @endsignalproto
   @signaldesc
    Emitted when an XMPP IQ stanza is received. Allows a plugin to process IQ
@@ -35,7 +35,7 @@ gboolean (*iq_received)(PurpleConnection
   @signalproto
 gboolean (*message_received)(PurpleConnection *gc, const char *type,
                               const char *id, const char *from, const char *to,
-                              xmlnode *message);
+                              PurpleXmlNode *message);
   @endsignalproto
   @signaldesc
    Emitted when an XMPP message stanza is received. Allows a plugin to
@@ -55,7 +55,7 @@ gboolean (*message_received)(PurpleConne
  @signaldef jabber-receiving-presence
   @signalproto
 gboolean (*presence_received)(PurpleConnection *gc, const char *type,
-                               const char *from, xmlnode *presence);
+                               const char *from, PurpleXmlNode *presence);
   @endsignalproto
   @signaldesc
    Emitted when an XMPP presence stanza is received. Allows a plugin to process
@@ -73,7 +73,7 @@ gboolean (*presence_received)(PurpleConn
  @signaldef jabber-watched-iq
   @signalproto
 gboolean (*watched_iq)(PurpleConnection *gc, const char *type, const char *id,
-                       const char *from, xmlnode *child);
+                       const char *from, PurpleXmlNode *child);
   @endsignalproto
   @signaldesc
    Emitted when an IQ with a watched (child, namespace) pair is received.  See
@@ -112,7 +112,7 @@ void (unregister_namespace_watcher)(cons
 
  @signaldef jabber-sending-xmlnode
   @signalproto
-void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+void (sending_xmlnode)(PurpleConnection *gc, PurpleXmlNode **stanza);
   @endsignalproto
   @signaldesc
    Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
@@ -124,7 +124,7 @@ void (sending_xmlnode)(PurpleConnection 
 
  @signaldef jabber-receiving-xmlnode
   @signalproto
-void (receiving_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+void (receiving_xmlnode)(PurpleConnection *gc, PurpleXmlNode **stanza);
   @endsignalproto
   @signaldesc
    Emitted when an XMPP stanza is received. Allows a plugin to process any
diff --git a/doc/ui-ops.dox b/doc/ui-ops.dox
--- a/doc/ui-ops.dox
+++ b/doc/ui-ops.dox
@@ -13,10 +13,10 @@
    - #PurpleEventLoopUiOps (without this, nothing will work and you will cry)
    - #PurpleIdleUiOps
    - #PurpleNotifyUiOps
-   - #PurplePrivacyUiOps
    - #PurpleRequestUiOps
    - #PurpleRoomlistUiOps
    - #PurpleSoundUiOps
+   - #PurpleSrvTxtQueryUiOps
    - #PurpleWhiteboardUiOps
    - #PurpleXferUiOps