Changeset b79308b for protocols/oscar/oscar.c

Timestamp:

2008-04-14T13:10:53Z (17 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/oscar/oscar.c (modified) (5 diffs)

protocols/oscar/oscar.c

@@ -1084 +1084 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_accept_chat(void *data);
+void oscar_reject_chat(void *data);
         
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
@@ -1119 +1119 @@
 }
 
-static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authgrant(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1134 +1135 @@
 }
 
-static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authdeny(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, *message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -2588 +2590 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_accept_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
@@ -2595 +2599 @@
 }
 
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_reject_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         g_free(inv->name);
         g_free(inv);