Mercurial > pidgin

comparison libpurple/protocols/yahoo/yahoo.c @ 21560:665e04562de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This merge has the effect of reverting the hinting code from trunk.
author Richard Laager <rlaager@wiktel.com>
date Sat, 17 Nov 2007 00:12:30 +0000
parents 9dbf38f270da fcb848b2d669
children 3265e4619117
comparison
equal deleted inserted replaced
21544:9b4d1af17ced 21560:665e04562de0
1025 } 1025 }
1026 1026
1027 static void 1027 static void
1028 yahoo_buddy_add_deny_reason_cb(gpointer data) { 1028 yahoo_buddy_add_deny_reason_cb(gpointer data) {
1029 struct yahoo_add_request *add_req = data; 1029 struct yahoo_add_request *add_req = data;
1030 purple_request_input_with_hint(add_req->gc, NULL, _("Authorization denied message:"), 1030 purple_request_input(add_req->gc, NULL, _("Authorization denied message:"),
1031 NULL, _("No reason given."), TRUE, FALSE, NULL, 1031 NULL, _("No reason given."), TRUE, FALSE, NULL,
1032 _("OK"), G_CALLBACK(yahoo_buddy_add_deny_cb), 1032 _("OK"), G_CALLBACK(yahoo_buddy_add_deny_cb),
1033 _("Cancel"), G_CALLBACK(yahoo_buddy_add_deny_noreason_cb), 1033 _("Cancel"), G_CALLBACK(yahoo_buddy_add_deny_noreason_cb),
1034 purple_connection_get_account(add_req->gc), add_req->who, NULL, 1034 purple_connection_get_account(add_req->gc), add_req->who, NULL,
1035 PURPLE_REQUEST_UI_HINT_BLIST, add_req); 1035 add_req);
1036 } 1036 }
1037 1037
1038 static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason) 1038 static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
1039 { 1039 {
1040 char *notify_msg; 1040 char *notify_msg;
2062 case 12: 2062 case 12:
2063 b = purple_find_buddy(gc->account, who); 2063 b = purple_find_buddy(gc->account, who);
2064 g_snprintf(buf, sizeof(buf), _("You have tried to ignore %s, but the " 2064 g_snprintf(buf, sizeof(buf), _("You have tried to ignore %s, but the "
2065 "user is on your buddy list. Clicking \"Yes\" " 2065 "user is on your buddy list. Clicking \"Yes\" "
2066 "will remove and ignore the buddy."), who); 2066 "will remove and ignore the buddy."), who);
2067 purple_request_yes_no_with_hint(gc, NULL, _("Ignore buddy?"), buf, 0, 2067 purple_request_yes_no(gc, NULL, _("Ignore buddy?"), buf, 0,
2068 gc->account, who, NULL, 2068 gc->account, who, NULL,
2069 PURPLE_REQUEST_UI_HINT_BLIST, b, 2069 b,
2070 G_CALLBACK(ignore_buddy), 2070 G_CALLBACK(ignore_buddy),
2071 G_CALLBACK(keep_buddy)); 2071 G_CALLBACK(keep_buddy));
2072 break; 2072 break;
2073 case 2: 2073 case 2:
2074 case 3: 2074 case 3:
3500 3500
3501 3501
3502 static void yahoo_show_act_id(PurplePluginAction *action) 3502 static void yahoo_show_act_id(PurplePluginAction *action)
3503 { 3503 {
3504 PurpleConnection *gc = (PurpleConnection *) action->context; 3504 PurpleConnection *gc = (PurpleConnection *) action->context;
3505 purple_request_input_with_hint(gc, NULL, _("Activate which ID?"), NULL, 3505 purple_request_input(gc, NULL, _("Activate which ID?"), NULL,
3506 purple_connection_get_display_name(gc), FALSE, FALSE, NULL, 3506 purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
3507 _("OK"), G_CALLBACK(yahoo_act_id), 3507 _("OK"), G_CALLBACK(yahoo_act_id),
3508 _("Cancel"), NULL, 3508 _("Cancel"), NULL,
3509 purple_connection_get_account(gc), NULL, NULL, 3509 purple_connection_get_account(gc), NULL, NULL,
3510 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 3510 gc);
3511 } 3511 }
3512 3512
3513 static void yahoo_show_chat_goto(PurplePluginAction *action) 3513 static void yahoo_show_chat_goto(PurplePluginAction *action)
3514 { 3514 {
3515 PurpleConnection *gc = (PurpleConnection *) action->context; 3515 PurpleConnection *gc = (PurpleConnection *) action->context;
3516 purple_request_input_with_hint(gc, NULL, _("Join who in chat?"), NULL, 3516 purple_request_input(gc, NULL, _("Join whom in chat?"), NULL,
3517 "", FALSE, FALSE, NULL, 3517 "", FALSE, FALSE, NULL,
3518 _("OK"), G_CALLBACK(yahoo_chat_goto), 3518 _("OK"), G_CALLBACK(yahoo_chat_goto),
3519 _("Cancel"), NULL, 3519 _("Cancel"), NULL,
3520 purple_connection_get_account(gc), NULL, NULL, 3520 purple_connection_get_account(gc), NULL, NULL,
3521 PURPLE_REQUEST_UI_HINT_CONV, gc); 3521 gc);
3522 } 3522 }
3523 3523
3524 static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) { 3524 static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
3525 GList *m = NULL; 3525 GList *m = NULL;
3526 PurplePluginAction *act; 3526 PurplePluginAction *act;