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

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 be50064a83e0 fcb848b2d669
children 252b96b6a32c 60f5abc6cf0c
comparison
equal deleted inserted replaced
21544:9b4d1af17ced 21560:665e04562de0
327 /* static void ggp_action_buddylist_save(PurplePluginAction *action) {{{ */ 327 /* static void ggp_action_buddylist_save(PurplePluginAction *action) {{{ */
328 static void ggp_action_buddylist_save(PurplePluginAction *action) 328 static void ggp_action_buddylist_save(PurplePluginAction *action)
329 { 329 {
330 PurpleConnection *gc = (PurpleConnection *)action->context; 330 PurpleConnection *gc = (PurpleConnection *)action->context;
331 331
332 purple_request_file_with_hint(action, _("Save buddylist..."), NULL, TRUE, 332 purple_request_file(action, _("Save buddylist..."), NULL, TRUE,
333 G_CALLBACK(ggp_callback_buddylist_save_ok), NULL, 333 G_CALLBACK(ggp_callback_buddylist_save_ok), NULL,
334 purple_connection_get_account(gc), NULL, NULL, 334 purple_connection_get_account(gc), NULL, NULL,
335 PURPLE_REQUEST_UI_HINT_BLIST, gc); 335 gc);
336 } 336 }
337 /* }}} */ 337 /* }}} */
338 338
339 /* 339 /*
340 */ 340 */
341 /* static void ggp_action_buddylist_load(PurplePluginAction *action) {{{ */ 341 /* static void ggp_action_buddylist_load(PurplePluginAction *action) {{{ */
342 static void ggp_action_buddylist_load(PurplePluginAction *action) 342 static void ggp_action_buddylist_load(PurplePluginAction *action)
343 { 343 {
344 PurpleConnection *gc = (PurpleConnection *)action->context; 344 PurpleConnection *gc = (PurpleConnection *)action->context;
345 345
346 purple_request_file_with_hint(action, "Load buddylist from file...", NULL, FALSE, 346 purple_request_file(action, "Load buddylist from file...", NULL, FALSE,
347 G_CALLBACK(ggp_callback_buddylist_load_ok), NULL, 347 G_CALLBACK(ggp_callback_buddylist_load_ok), NULL,
348 purple_connection_get_account(gc), NULL, NULL, 348 purple_connection_get_account(gc), NULL, NULL,
349 PURPLE_REQUEST_UI_HINT_BLIST, gc); 349 gc);
350 } 350 }
351 /* }}} */ 351 /* }}} */
352 352
353 /* 353 /*
354 */ 354 */
497 /* original size: 60x24 */ 497 /* original size: 60x24 */
498 field = purple_request_field_image_new("token_img", 498 field = purple_request_field_image_new("token_img",
499 _("Current token"), token->data, token->size); 499 _("Current token"), token->data, token->size);
500 purple_request_field_group_add_field(group, field); 500 purple_request_field_group_add_field(group, field);
501 501
502 purple_request_fields_with_hint(account, 502 purple_request_fields(account,
503 _("Register New Gadu-Gadu Account"), 503 _("Register New Gadu-Gadu Account"),
504 _("Register New Gadu-Gadu Account"), 504 _("Register New Gadu-Gadu Account"),
505 _("Please, fill in the following fields"), 505 _("Please, fill in the following fields"),
506 fields, 506 fields,
507 _("OK"), G_CALLBACK(ggp_callback_register_account_ok), 507 _("OK"), G_CALLBACK(ggp_callback_register_account_ok),
508 _("Cancel"), G_CALLBACK(ggp_callback_register_account_cancel), 508 _("Cancel"), G_CALLBACK(ggp_callback_register_account_cancel),
509 purple_connection_get_account(gc), NULL, NULL, 509 purple_connection_get_account(gc), NULL, NULL,
510 PURPLE_REQUEST_UI_HINT_REGISTER, gc); 510 gc);
511 } 511 }
512 /* }}} */ 512 /* }}} */
513 513
514 /* ----- PUBLIC DIRECTORY SEARCH ---------------------------------------- */ 514 /* ----- PUBLIC DIRECTORY SEARCH ---------------------------------------- */
515 515
656 656
657 field = purple_request_field_bool_new("active", 657 field = purple_request_field_bool_new("active",
658 _("Only online"), FALSE); 658 _("Only online"), FALSE);
659 purple_request_field_group_add_field(group, field); 659 purple_request_field_group_add_field(group, field);
660 660
661 purple_request_fields_with_hint(gc, 661 purple_request_fields(gc,
662 _("Find buddies"), 662 _("Find buddies"),
663 _("Find buddies"), 663 _("Find buddies"),
664 _("Please, enter your search criteria below"), 664 _("Please, enter your search criteria below"),
665 fields, 665 fields,
666 _("OK"), G_CALLBACK(ggp_callback_find_buddies), 666 _("OK"), G_CALLBACK(ggp_callback_find_buddies),
667 _("Cancel"), NULL, 667 _("Cancel"), NULL,
668 purple_connection_get_account(gc), NULL, NULL, 668 purple_connection_get_account(gc), NULL, NULL,
669 PURPLE_REQUEST_UI_HINT_BLIST, gc); 669 gc);
670 } 670 }
671 /* }}} */ 671 /* }}} */
672 672
673 /* ----- CHANGE PASSWORD ------------------------------------------------ */ 673 /* ----- CHANGE PASSWORD ------------------------------------------------ */
674 674
794 794
795 msg = g_strdup_printf("%s %d", 795 msg = g_strdup_printf("%s %d",
796 _("Please, enter your current password and your new password for UIN: "), 796 _("Please, enter your current password and your new password for UIN: "),
797 ggp_get_uin(purple_connection_get_account(gc))); 797 ggp_get_uin(purple_connection_get_account(gc)));
798 798
799 purple_request_fields_with_hint(gc, 799 purple_request_fields(gc,
800 _("Change Gadu-Gadu Password"), 800 _("Change Gadu-Gadu Password"),
801 _("Change Gadu-Gadu Password"), 801 _("Change Gadu-Gadu Password"),
802 msg, 802 msg,
803 fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok), 803 fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok),
804 _("Cancel"), NULL, 804 _("Cancel"), NULL,
805 purple_connection_get_account(gc), NULL, NULL, 805 purple_connection_get_account(gc), NULL, NULL,
806 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 806 gc);
807 807
808 g_free(msg); 808 g_free(msg);
809 } 809 }
810 /* }}} */ 810 /* }}} */
811 811
875 } 875 }
876 purple_request_field_group_add_field(group, field); 876 purple_request_field_group_add_field(group, field);
877 877
878 msg = g_strdup_printf(_("Select a chat for buddy: %s"), 878 msg = g_strdup_printf(_("Select a chat for buddy: %s"),
879 purple_buddy_get_alias(buddy)); 879 purple_buddy_get_alias(buddy));
880 purple_request_fields_with_hint(gc, 880 purple_request_fields(gc,
881 _("Add to chat..."), 881 _("Add to chat..."),
882 _("Add to chat..."), 882 _("Add to chat..."),
883 msg, 883 msg,
884 fields, 884 fields,
885 _("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok), 885 _("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok),
886 _("Cancel"), NULL, 886 _("Cancel"), NULL,
887 purple_connection_get_account(gc), NULL, NULL, 887 purple_connection_get_account(gc), NULL, NULL,
888 PURPLE_REQUEST_UI_HINT_BUDDY, gc); 888 gc);
889 g_free(msg); 889 g_free(msg);
890 } 890 }
891 /* }}} */ 891 /* }}} */
892 892
893 /* ----- BLOCK BUDDIES -------------------------------------------------- */ 893 /* ----- BLOCK BUDDIES -------------------------------------------------- */