pidgin/gtkaccount.c

branch
string-comparison-r2
changeset 38259
c593fc9f5438
parent 38258
9a6551eba09c
child 38358
30ba44276e74
child 40755
fb2056ce3c58
equal deleted inserted replaced
38258:9a6551eba09c 38259:c593fc9f5438
821 821
822 switch (opt_entry->type) 822 switch (opt_entry->type)
823 { 823 {
824 case PURPLE_PREF_BOOLEAN: 824 case PURPLE_PREF_BOOLEAN:
825 if (account == NULL || 825 if (account == NULL ||
826 strcmp(purple_account_get_protocol_id(account), 826 !purple_strequal(purple_account_get_protocol_id(account),
827 dialog->protocol_id)) 827 dialog->protocol_id))
828 { 828 {
829 bool_value = purple_account_option_get_default_bool(option); 829 bool_value = purple_account_option_get_default_bool(option);
830 } 830 }
831 else 831 else
846 gtk_widget_show(check); 846 gtk_widget_show(check);
847 break; 847 break;
848 848
849 case PURPLE_PREF_INT: 849 case PURPLE_PREF_INT:
850 if (account == NULL || 850 if (account == NULL ||
851 strcmp(purple_account_get_protocol_id(account), 851 !purple_strequal(purple_account_get_protocol_id(account),
852 dialog->protocol_id)) 852 dialog->protocol_id))
853 { 853 {
854 int_value = purple_account_option_get_default_int(option); 854 int_value = purple_account_option_get_default_int(option);
855 } 855 }
856 else 856 else
871 g_free(title); 871 g_free(title);
872 break; 872 break;
873 873
874 case PURPLE_PREF_STRING: 874 case PURPLE_PREF_STRING:
875 if (account == NULL || 875 if (account == NULL ||
876 strcmp(purple_account_get_protocol_id(account), 876 !purple_strequal(purple_account_get_protocol_id(account),
877 dialog->protocol_id)) 877 dialog->protocol_id))
878 { 878 {
879 str_value = purple_account_option_get_default_string(option); 879 str_value = purple_account_option_get_default_string(option);
880 } 880 }
881 else 881 else
907 case PURPLE_PREF_STRING_LIST: 907 case PURPLE_PREF_STRING_LIST:
908 i = 0; 908 i = 0;
909 idx = 0; 909 idx = 0;
910 910
911 if (account == NULL || 911 if (account == NULL ||
912 strcmp(purple_account_get_protocol_id(account), 912 !purple_strequal(purple_account_get_protocol_id(account),
913 dialog->protocol_id)) 913 dialog->protocol_id))
914 { 914 {
915 str_value = purple_account_option_get_default_list_value(option); 915 str_value = purple_account_option_get_default_list_value(option);
916 } 916 }
917 else 917 else

mercurial