Changeset c4a1036 for protocols/jabber/jabber_util.c

Timestamp:

2008-06-09T01:52:28Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

12ebe74

Parents:

e46e077 (diff), 783e9b7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge integration branch.

File:

• protocols/jabber/jabber_util.c (modified) (2 diffs)

protocols/jabber/jabber_util.c

@@ -246 +246 @@
 };
 
-static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_yes( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
@@ -257 +259 @@
 }
 
-static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_no( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );