Changes in protocols/oscar/oscar.c [9143aeb:f774e01]

File:

• protocols/oscar/oscar.c (modified) (5 diffs)

protocols/oscar/oscar.c

@@ -1084 +1084 @@
 }
 
-void oscar_accept_chat(void *data);
-void oscar_reject_chat(void *data);
+void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
         
 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(void *data_) {
-        struct icq_auth *data = data_;
+static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
         char *uin, message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1135 +1134 @@
 }
 
-static void gaim_icq_authdeny(void *data_) {
-        struct icq_auth *data = data_;
+static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
         char *uin, *message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -2590 +2588 @@
 }
 
-void oscar_accept_chat(void *data)
+void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
 {
-        struct aim_chat_invitation * inv = data;
-        
         oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
@@ -2599 +2595 @@
 }
 
-void oscar_reject_chat(void *data)
+void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
 {
-        struct aim_chat_invitation * inv = data;
-        
         g_free(inv->name);
         g_free(inv);