comparison libpurple/protocols/silc10/ops.c @ 21570:dccfd999ffe7

merge of '76c07fcb434a2a7aa289734bb221c171a376d73b' and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 17 Nov 2007 17:27:48 +0000
parents a20ef7180680
children 4446de418df1
comparison
equal deleted inserted replaced
21325:d7a43e142c6e 21570:dccfd999ffe7
1289 silc_free(pk); 1289 silc_free(pk);
1290 } 1290 }
1291 1291
1292 #if 0 /* XXX for now, let's not show attrs here */ 1292 #if 0 /* XXX for now, let's not show attrs here */
1293 if (client_entry->attrs) 1293 if (client_entry->attrs)
1294 purple_request_action_with_hint(gc, _("User Information"), 1294 purple_request_action(gc, _("User Information"),
1295 _("User Information"), 1295 _("User Information"),
1296 buf, 1, PURPLE_REQUEST_UI_HINT_BLIST, client_entry, 2, 1296 buf, 1, client_entry, 2,
1297 _("OK"), G_CALLBACK(silcpurple_whois_more), 1297 _("OK"), G_CALLBACK(silcpurple_whois_more),
1298 _("_More..."), G_CALLBACK(silcpurple_whois_more), gc->account, NULL, NULL); 1298 _("_More..."), G_CALLBACK(silcpurple_whois_more), gc->account, NULL, NULL);
1299 else 1299 else
1300 #endif 1300 #endif
1301 purple_notify_userinfo(gc, client_entry->nickname, user_info, NULL, NULL); 1301 purple_notify_userinfo(gc, client_entry->nickname, user_info, NULL, NULL);
1896 1896
1897 if (!internal) 1897 if (!internal)
1898 return; 1898 return;
1899 internal->completion = completion; 1899 internal->completion = completion;
1900 internal->context = context; 1900 internal->context = context;
1901 purple_request_input_with_hint(gc, _("Passphrase"), NULL, 1901 purple_request_input(gc, _("Passphrase"), NULL,
1902 _("Passphrase required"), NULL, FALSE, TRUE, NULL, 1902 _("Passphrase required"), NULL, FALSE, TRUE, NULL,
1903 _("OK"), G_CALLBACK(silc_ask_passphrase_cb), 1903 _("OK"), G_CALLBACK(silc_ask_passphrase_cb),
1904 _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb), 1904 _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb),
1905 purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal); 1905 purple_connection_get_account(gc), NULL, NULL, internal);
1906 } 1906 }
1907 1907
1908 1908
1909 /* Notifies application that failure packet was received. This is called 1909 /* Notifies application that failure packet was received. This is called
1910 if there is some protocol active in the client. The `protocol' is the 1910 if there is some protocol active in the client. The `protocol' is the