changeset 28258:25ad8f6b2638

merge of 'ce714031f3cafbcbd99cc3988cbb9cacd3ada236' and 'f6ccaee21b84f421b31d614cb5c06c855ab47e0b'

--- a/INSTALL	Fri Aug 14 00:38:03 2009 +0000
+++ b/INSTALL	Fri Aug 14 00:37:34 2009 +0000
@@ -158,7 +158,7 @@
 
 	`--with-dynamic-prpls' takes a list of comma separated protocols also.  If used only those listed will be built.  If no protocols are listed with either `--with-static-prpls' or with `--with-dynamic-prpls' then Pidgin and Finch will be effectively useless.
 
-	If configure does not find python, it will build without DBUS support.  Thiswill disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
+	If configure does not find python, it will build without DBUS support.  This will disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
 
 Specifying the System Type
 ==========================

--- a/doc/core-signals.dox	Fri Aug 14 00:38:03 2009 +0000
+++ b/doc/core-signals.dox	Fri Aug 14 00:37:34 2009 +0000
@@ -2,6 +2,7 @@
 
  @signals
   @signal quitting
+  @signal uri-handler
  @endsignals
 
  @see core.h
@@ -16,5 +17,16 @@
    Emitted when libpurple is quitting.
  @endsignaldef
 
+ @signaldef uri-handler
+  @signalproto
+gboolean (*uri_handler)(const gchar *proto, const gchar *cmd, GHashTable *params);
+  @endsignalproto
+  @signaldesc
+   Emitted when handling a registered URI.
+  @param proto The protocol of the URI.
+  @param cmd The 'command' of the URI.
+  @param params Any key/value parameters from the URI.
+ @endsignaldef
+
  */
 // vim: syntax=c.doxygen tw=75 et

--- a/doc/jabber-signals.dox	Fri Aug 14 00:38:03 2009 +0000
+++ b/doc/jabber-signals.dox	Fri Aug 14 00:37:34 2009 +0000
@@ -8,6 +8,7 @@
   @signal jabber-register-namespace-watcher
   @signal jabber-unregister-namespace-watcher
   @signal jabber-sending-xmlnode
+  @signal jabber-receiving-xmlnode
  @endsignals
 
  <hr>
@@ -71,7 +72,7 @@
 
  @signaldef jabber-watched-iq
   @signalproto
-gboolean (*watched_iq)(PurpleConnection *pc, const char *type, const char *id,
+gboolean (*watched_iq)(PurpleConnection *gc, const char *type, const char *id,
                        const char *from, xmlnode *child);
   @endsignalproto
   @signaldesc
@@ -87,18 +88,6 @@
           process it. FALSE otherwise.
  @endsignaldef
 
- @signaldef jabber-sending-xmlnode
-  @signalproto
-void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
-  @endsignalproto
-  @signaldesc
-   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
-   to use this instead of prpl_info->send_raw.
-   @param gc      The connectoin on which to send the stanza.
-   @param stanza  The stanza to send. If stanza is not NULL after being sent,
-                  the emitter should free it.
- @endsignaldef
-
  @signaldef jabber-register-namespace-watcher
   @signalproto
 void (register_namespace_watcher)(const char *node, const char *namespace);
@@ -121,5 +110,29 @@
   @param namespace The IQ child namespace to no longer watch.
  @endsignaldef
 
+ @signaldef jabber-sending-xmlnode
+  @signalproto
+void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
+   to use this instead of prpl_info->send_raw.
+   @param gc      The connection on which to send the stanza.
+   @param stanza  The stanza to send. If stanza is not NULL after being sent,
+                  the emitter should free it.
+ @endsignaldef
+
+ @signaldef jabber-receiving-xmlnode
+  @signalproto
+void (receiving_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP stanza is received. Allows a plugin to process any
+   stanza.
+   @param gc     The connection on which the stanza was received.
+   @param stanza The received stanza. Set stanza to NULL (and free it) to
+                 stop processing the stanza.
+ @endsignaldef
+
 */
 // vim: syntax=c.doxygen tw=75 et