Changeset b79308b for protocols/msn/msn_util.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• protocols/msn/msn_util.c (modified) (2 diffs)

protocols/msn/msn_util.c

@@ -90 +90 @@
 };
 
-static void msn_buddy_ask_yes( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_yes( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
@@ -102 +104 @@
 }
 
-static void msn_buddy_ask_no( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_no( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );