comparison libpurple/protocols/oscar/oscar.c @ 19195:1ca6c4b234ab

Warning fixes in the aftermath of resiak's authorize_cb and deny_cb type fixing.
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 12 Aug 2007 00:52:17 +0000
parents c8f9584e3221
children 47942d19f301
comparison
equal deleted inserted replaced
19194:510ed64b8c74 19195:1ca6c4b234ab
2259 purple_auth_sendrequest(gc, buddy->name); 2259 purple_auth_sendrequest(gc, buddy->name);
2260 } 2260 }
2261 2261
2262 /* When other people ask you for authorization */ 2262 /* When other people ask you for authorization */
2263 static void 2263 static void
2264 purple_auth_grant(struct name_data *data) 2264 purple_auth_grant(gpointer cbdata)
2265 { 2265 {
2266 struct name_data *data = cbdata;
2266 PurpleConnection *gc = data->gc; 2267 PurpleConnection *gc = data->gc;
2267 OscarData *od = gc->proto_data; 2268 OscarData *od = gc->proto_data;
2268 2269
2269 aim_ssi_sendauthreply(od, data->name, 0x01, NULL); 2270 aim_ssi_sendauthreply(od, data->name, 0x01, NULL);
2270 2271
2280 2281
2281 aim_ssi_sendauthreply(od, data->name, 0x00, msg ? msg : _("No reason given.")); 2282 aim_ssi_sendauthreply(od, data->name, 0x00, msg ? msg : _("No reason given."));
2282 } 2283 }
2283 2284
2284 static void 2285 static void
2285 purple_auth_dontgrant_msgprompt(struct name_data *data) 2286 purple_auth_dontgrant_msgprompt(gpointer cbdata)
2286 { 2287 {
2288 struct name_data *data = cbdata;
2287 purple_request_input(data->gc, NULL, _("Authorization Denied Message:"), 2289 purple_request_input(data->gc, NULL, _("Authorization Denied Message:"),
2288 NULL, _("No reason given."), TRUE, FALSE, NULL, 2290 NULL, _("No reason given."), TRUE, FALSE, NULL,
2289 _("_OK"), G_CALLBACK(purple_auth_dontgrant), 2291 _("_OK"), G_CALLBACK(purple_auth_dontgrant),
2290 _("_Cancel"), G_CALLBACK(oscar_free_name_data), 2292 _("_Cancel"), G_CALLBACK(oscar_free_name_data),
2291 purple_connection_get_account(data->gc), data->name, NULL, 2293 purple_connection_get_account(data->gc), data->name, NULL,
2402 data->name = sn; 2404 data->name = sn;
2403 data->nick = NULL; 2405 data->nick = NULL;
2404 2406
2405 purple_account_request_authorization(account, sn, NULL, NULL, 2407 purple_account_request_authorization(account, sn, NULL, NULL,
2406 reason, purple_find_buddy(account, sn) != NULL, 2408 reason, purple_find_buddy(account, sn) != NULL,
2407 G_CALLBACK(purple_auth_grant), 2409 purple_auth_grant,
2408 G_CALLBACK(purple_auth_dontgrant_msgprompt), data); 2410 purple_auth_dontgrant_msgprompt, data);
2409 g_free(reason); 2411 g_free(reason);
2410 } 2412 }
2411 } break; 2413 } break;
2412 2414
2413 case 0x07: { /* Someone has denied you authorization */ 2415 case 0x07: { /* Someone has denied you authorization */
5168 data->name = g_strdup(sn); 5170 data->name = g_strdup(sn);
5169 data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL); 5171 data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL);
5170 5172
5171 purple_account_request_authorization(account, sn, NULL, 5173 purple_account_request_authorization(account, sn, NULL,
5172 (buddy ? purple_buddy_get_alias_only(buddy) : NULL), 5174 (buddy ? purple_buddy_get_alias_only(buddy) : NULL),
5173 reason, buddy != NULL, G_CALLBACK(purple_auth_grant), 5175 reason, buddy != NULL, purple_auth_grant,
5174 G_CALLBACK(purple_auth_dontgrant_msgprompt), data); 5176 purple_auth_dontgrant_msgprompt, data);
5175 g_free(reason); 5177 g_free(reason);
5176 5178
5177 return 1; 5179 return 1;
5178 } 5180 }
5179 5181