comparison pidgin/gtkaccount.c @ 18080:bb2e5f6ff2b4

propagate from branch 'im.pidgin.pidgin' (head 5fdf4fa0a7dcefa78c9ec2e7c25b151f1e3acf18) to branch 'im.pidgin.pidgin.2.1.0' (head 1d53de833ec35c1899f24b60e7d79db753917c15)
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 10 Jun 2007 01:46:31 +0000
parents c885a9ccd301 d5fa6c45045e
children 07f8ed677678
comparison
equal deleted inserted replaced
18079:c885a9ccd301 18080:bb2e5f6ff2b4
459 459
460 for (l = user_splits; l != NULL; l = l->next) { 460 for (l = user_splits; l != NULL; l = l->next) {
461 PurpleAccountUserSplit *split = l->data; 461 PurpleAccountUserSplit *split = l->data;
462 char *buf; 462 char *buf;
463 463
464 buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split)); 464 buf = g_strdup_printf("_%s:", purple_account_user_split_get_text(split));
465 465
466 entry = gtk_entry_new(); 466 entry = gtk_entry_new();
467 467
468 add_pref_box(dialog, vbox, buf, entry); 468 add_pref_box(dialog, vbox, buf, entry);
469 469
526 dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"), 526 dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"),
527 dialog->password_entry); 527 dialog->password_entry);
528 528
529 /* Alias */ 529 /* Alias */
530 dialog->alias_entry = gtk_entry_new(); 530 dialog->alias_entry = gtk_entry_new();
531 add_pref_box(dialog, vbox, _("Local _alias:"), dialog->alias_entry); 531 add_pref_box(dialog, vbox, _("_Local alias:"), dialog->alias_entry);
532 532
533 /* Remember Password */ 533 /* Remember Password */
534 dialog->remember_pass_check = 534 dialog->remember_pass_check =
535 gtk_check_button_new_with_mnemonic(_("Remember pass_word")); 535 gtk_check_button_new_with_mnemonic(_("Remember pass_word"));
536 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check), 536 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check),
703 GtkTreeIter iter; 703 GtkTreeIter iter;
704 GtkCellRenderer *renderer; 704 GtkCellRenderer *renderer;
705 PurpleKeyValuePair *kvp; 705 PurpleKeyValuePair *kvp;
706 GList *l; 706 GList *l;
707 char buf[1024]; 707 char buf[1024];
708 char *title; 708 char *title, *tmp;
709 const char *str_value; 709 const char *str_value, *protocol;
710 gboolean bool_value; 710 gboolean bool_value;
711 711
712 if (dialog->protocol_frame != NULL) { 712 if (dialog->protocol_frame != NULL) {
713 gtk_widget_destroy(dialog->protocol_frame); 713 gtk_widget_destroy(dialog->protocol_frame);
714 dialog->protocol_frame = NULL; 714 dialog->protocol_frame = NULL;
760 bool_value = purple_account_get_bool(account, 760 bool_value = purple_account_get_bool(account,
761 purple_account_option_get_setting(option), 761 purple_account_option_get_setting(option),
762 purple_account_option_get_default_bool(option)); 762 purple_account_option_get_default_bool(option));
763 } 763 }
764 764
765 check = gtk_check_button_new_with_label( 765 tmp = g_strconcat("_", purple_account_option_get_text(option), NULL);
766 purple_account_option_get_text(option)); 766 check = gtk_check_button_new_with_mnemonic(tmp);
767 g_free(tmp);
767 768
768 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), 769 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
769 bool_value); 770 bool_value);
770 771
771 gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0); 772 gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0);
793 g_snprintf(buf, sizeof(buf), "%d", int_value); 794 g_snprintf(buf, sizeof(buf), "%d", int_value);
794 795
795 entry = gtk_entry_new(); 796 entry = gtk_entry_new();
796 gtk_entry_set_text(GTK_ENTRY(entry), buf); 797 gtk_entry_set_text(GTK_ENTRY(entry), buf);
797 798
798 title = g_strdup_printf("%s:", 799 title = g_strdup_printf("_%s:",
799 purple_account_option_get_text(option)); 800 purple_account_option_get_text(option));
800 801
801 add_pref_box(dialog, vbox, title, entry); 802 add_pref_box(dialog, vbox, title, entry);
802 803
803 g_free(title); 804 g_free(title);
833 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); 834 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
834 item = gtk_menu_get_active(GTK_MENU(menu)); 835 item = gtk_menu_get_active(GTK_MENU(menu));
835 if (str_value == NULL && g_object_get_data(G_OBJECT(item), "fake") && 836 if (str_value == NULL && g_object_get_data(G_OBJECT(item), "fake") &&
836 !strcmp(_("Connect server"), purple_account_option_get_text(option))) 837 !strcmp(_("Connect server"), purple_account_option_get_text(option)))
837 str_value = "talk.google.com"; 838 str_value = "talk.google.com";
838 839
839 if (str_value != NULL) 840 if (str_value != NULL)
840 gtk_entry_set_text(GTK_ENTRY(entry), str_value); 841 gtk_entry_set_text(GTK_ENTRY(entry), str_value);
841 842
842 title = g_strdup_printf("%s:", 843 title = g_strdup_printf("_%s:",
843 purple_account_option_get_text(option)); 844 purple_account_option_get_text(option));
844 845
845 add_pref_box(dialog, vbox, title, entry); 846 add_pref_box(dialog, vbox, title, entry);
846 847
847 g_free(title); 848 g_free(title);
898 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, 899 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer,
899 TRUE); 900 TRUE);
900 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), 901 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo),
901 renderer, "text", 0, NULL); 902 renderer, "text", 0, NULL);
902 903
903 title = g_strdup_printf("%s:", 904 title = g_strdup_printf("_%s:",
904 purple_account_option_get_text(option)); 905 purple_account_option_get_text(option));
905 906
906 add_pref_box(dialog, vbox, title, combo); 907 add_pref_box(dialog, vbox, title, combo);
907 908
908 g_free(title); 909 g_free(title);