Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkblist.c

pidgin/gtkblist.c

branch
string-comparison-r2
changeset 38258
9a6551eba09c
parent 38256
035f00c4fd87
child 38259
c593fc9f5438
equal deleted inserted replaced
38257:1a294a6d2a57 38258:9a6551eba09c
2078 pidgin_blist_sound_method_pref_cb(const char *name, PurplePrefType type, 2078 pidgin_blist_sound_method_pref_cb(const char *name, PurplePrefType type,
2079 gconstpointer value, gpointer data) 2079 gconstpointer value, gpointer data)
2080 { 2080 {
2081 gboolean sensitive = TRUE; 2081 gboolean sensitive = TRUE;
2082 2082
2083 if(!strcmp(value, "none")) 2083 if(purple_strequal(value, "none"))
2084 sensitive = FALSE; 2084 sensitive = FALSE;
2085 2085
2086 gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), sensitive); 2086 gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), sensitive);
2087 } 2087 }
2088 2088
2100 for (l = purple_connections_get_all(); l != NULL; l = l->next) 2100 for (l = purple_connections_get_all(); l != NULL; l = l->next)
2101 { 2101 {
2102 gc = (PurpleConnection *)l->data; 2102 gc = (PurpleConnection *)l->data;
2103 account = purple_connection_get_account(gc); 2103 account = purple_connection_get_account(gc);
2104 2104
2105 if (!strcmp(purple_account_get_protocol_id(account), prpl_id)) 2105 if (purple_strequal(purple_account_get_protocol_id(account), prpl_id))
2106 break; 2106 break;
2107 2107
2108 account = NULL; 2108 account = NULL;
2109 } 2109 }
2110 2110
2164 2164
2165 if (*s == '\r') *s++ = '\0'; 2165 if (*s == '\r') *s++ = '\0';
2166 if (*s == '\n') *s++ = '\0'; 2166 if (*s == '\n') *s++ = '\0';
2167 2167
2168 /* We only want to worry about a few fields here. */ 2168 /* We only want to worry about a few fields here. */
2169 if (!strcmp(field, "FN")) 2169 if (purple_strequal(field, "FN"))
2170 alias = g_strdup(value); 2170 alias = g_strdup(value);
2171 else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") || 2171 else if (purple_strequal(field, "X-AIM") || purple_strequal(field, "X-ICQ") ||
2172 !strcmp(field, "X-JABBER")) 2172 purple_strequal(field, "X-JABBER"))
2173 { 2173 {
2174 char **values = g_strsplit(value, ":", 0); 2174 char **values = g_strsplit(value, ":", 0);
2175 char **im; 2175 char **im;
2176 2176
2177 for (im = values; *im != NULL; im++) 2177 for (im = values; *im != NULL; im++)
2178 { 2178 {
2179 if (!strcmp(field, "X-AIM")) 2179 if (purple_strequal(field, "X-AIM"))
2180 aims = g_list_append(aims, g_strdup(*im)); 2180 aims = g_list_append(aims, g_strdup(*im));
2181 else if (!strcmp(field, "X-ICQ")) 2181 else if (purple_strequal(field, "X-ICQ"))
2182 icqs = g_list_append(icqs, g_strdup(*im)); 2182 icqs = g_list_append(icqs, g_strdup(*im));
2183 else if (!strcmp(field, "X-JABBER")) 2183 else if (purple_strequal(field, "X-JABBER"))
2184 jabbers = g_list_append(jabbers, g_strdup(*im)); 2184 jabbers = g_list_append(jabbers, g_strdup(*im));
2185 } 2185 }
2186 2186
2187 g_strfreev(values); 2187 g_strfreev(values);
2188 } 2188 }
3321 3321
3322 static char *get_mood_icon_path(const char *mood) 3322 static char *get_mood_icon_path(const char *mood)
3323 { 3323 {
3324 char *path; 3324 char *path;
3325 3325
3326 if (!strcmp(mood, "busy")) { 3326 if (purple_strequal(mood, "busy")) {
3327 path = g_build_filename(DATADIR, "pixmaps", "pidgin", 3327 path = g_build_filename(DATADIR, "pixmaps", "pidgin",
3328 "status", "16", "busy.png", NULL); 3328 "status", "16", "busy.png", NULL);
3329 } else if (!strcmp(mood, "hiptop")) { 3329 } else if (purple_strequal(mood, "hiptop")) {
3330 path = g_build_filename(DATADIR, "pixmaps", "pidgin", 3330 path = g_build_filename(DATADIR, "pixmaps", "pidgin",
3331 "emblems", "16", "hiptop.png", NULL); 3331 "emblems", "16", "hiptop.png", NULL);
3332 } else { 3332 } else {
3333 char *filename = g_strdup_printf("%s.png", mood); 3333 char *filename = g_strdup_printf("%s.png", mood);
3334 path = g_build_filename(DATADIR, "pixmaps", "pidgin", 3334 path = g_build_filename(DATADIR, "pixmaps", "pidgin",
3550 path = get_mood_icon_path(mood->mood); 3550 path = get_mood_icon_path(mood->mood);
3551 purple_request_field_list_add_icon(f, _(mood->description), 3551 purple_request_field_list_add_icon(f, _(mood->description),
3552 path, (gpointer)mood->mood); 3552 path, (gpointer)mood->mood);
3553 g_free(path); 3553 g_free(path);
3554 3554
3555 if (current_mood && !strcmp(current_mood, mood->mood)) 3555 if (current_mood && purple_strequal(current_mood, mood->mood))
3556 purple_request_field_list_add_selected(f, _(mood->description)); 3556 purple_request_field_list_add_selected(f, _(mood->description));
3557 } 3557 }
3558 purple_request_field_group_add_field(g, f); 3558 purple_request_field_group_add_field(g, f);
3559 3559
3560 purple_request_fields_add_group(fields, g); 3560 purple_request_fields_add_group(fields, g);
4850 } 4850 }
4851 4851
4852 static void _prefs_change_sort_method(const char *pref_name, PurplePrefType type, 4852 static void _prefs_change_sort_method(const char *pref_name, PurplePrefType type,
4853 gconstpointer val, gpointer data) 4853 gconstpointer val, gpointer data)
4854 { 4854 {
4855 if(!strcmp(pref_name, PIDGIN_PREFS_ROOT "/blist/sort_type")) 4855 if(purple_strequal(pref_name, PIDGIN_PREFS_ROOT "/blist/sort_type"))
4856 pidgin_blist_sort_method_set(val); 4856 pidgin_blist_sort_method_set(val);
4857 } 4857 }
4858 4858
4859 static gboolean pidgin_blist_select_notebook_page_cb(gpointer user_data) 4859 static gboolean pidgin_blist_select_notebook_page_cb(gpointer user_data)
4860 { 4860 {
5953 /* Enable CTRL+F searching */ 5953 /* Enable CTRL+F searching */
5954 gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN); 5954 gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN);
5955 gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview), 5955 gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview),
5956 pidgin_blist_search_equal_func, NULL, NULL); 5956 pidgin_blist_search_equal_func, NULL, NULL);
5957 5957
5958 gtk_box_pack_start(GTK_BOX(gtkblist->vbox), 5958 gtk_box_pack_start(GTK_BOX(gtkblist->vbox),
5959 pidgin_make_scrollable(gtkblist->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, -1), 5959 pidgin_make_scrollable(gtkblist->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, -1),
5960 TRUE, TRUE, 0); 5960 TRUE, TRUE, 0);
5961 5961
5962 sep = gtk_hseparator_new(); 5962 sep = gtk_hseparator_new();
5963 gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0); 5963 gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0);
5964 5964
6004 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time")); 6004 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time"));
6005 6005
6006 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Protocol Icons"))), 6006 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Protocol Icons"))),
6007 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")); 6007 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"));
6008 6008
6009 if(!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none")) 6009 if(purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
6010 gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE); 6010 gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE);
6011 6011
6012 /* Update some dynamic things */ 6012 /* Update some dynamic things */
6013 update_menu_bar(gtkblist); 6013 update_menu_bar(gtkblist);
6014 pidgin_blist_update_plugin_actions(); 6014 pidgin_blist_update_plugin_actions();
7632 7632
7633 g_return_if_fail(id != NULL); 7633 g_return_if_fail(id != NULL);
7634 7634
7635 while(l) { 7635 while(l) {
7636 struct pidgin_blist_sort_method *method = l->data; 7636 struct pidgin_blist_sort_method *method = l->data;
7637 if(!strcmp(method->id, id)) { 7637 if(purple_strequal(method->id, id)) {
7638 pidgin_blist_sort_methods = g_list_delete_link(pidgin_blist_sort_methods, l); 7638 pidgin_blist_sort_methods = g_list_delete_link(pidgin_blist_sort_methods, l);
7639 g_free(method->id); 7639 g_free(method->id);
7640 g_free(method->name); 7640 g_free(method->name);
7641 g_free(method); 7641 g_free(method);
7642 break; 7642 break;
7659 current_sort_method = l->data; 7659 current_sort_method = l->data;
7660 } else if (!current_sort_method) { 7660 } else if (!current_sort_method) {
7661 pidgin_blist_sort_method_set("none"); 7661 pidgin_blist_sort_method_set("none");
7662 return; 7662 return;
7663 } 7663 }
7664 if (!strcmp(id, "none")) { 7664 if (purple_strequal(id, "none")) {
7665 redo_buddy_list(purple_get_blist(), TRUE, FALSE); 7665 redo_buddy_list(purple_get_blist(), TRUE, FALSE);
7666 } else { 7666 } else {
7667 redo_buddy_list(purple_get_blist(), FALSE, FALSE); 7667 redo_buddy_list(purple_get_blist(), FALSE, FALSE);
7668 } 7668 }
7669 } 7669 }

Mercurial Repository: pidgin3

mercurial