diff options
Diffstat (limited to 'pidgin')
| -rw-r--r-- | pidgin/gtkconv.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkimhtml.c | 6 | ||||
| -rw-r--r-- | pidgin/gtkprefs.c | 6 | ||||
| -rw-r--r-- | pidgin/gtkrequest.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkutils.c | 2 | ||||
| -rw-r--r-- | pidgin/plugins/cap/cap.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index f84d14caa7..fa2db3f3c3 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -3540,7 +3540,7 @@ setup_menubar(PidginWindow *win) gtk_item_factory_get_widget(win->menu.item_factory, N_("/Options/Enable Sounds")); method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"); - if (method != NULL && purple_strequal(method, "none")) + if (purple_strequal(method, "none")) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds), FALSE); diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c index ebdea0f620..2680ee2b25 100644 --- a/pidgin/gtkimhtml.c +++ b/pidgin/gtkimhtml.c @@ -3309,13 +3309,13 @@ void gtk_imhtml_insert_html_at_iter(GtkIMHtml *imhtml, if (((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold)) && !(options & GTK_IMHTML_NO_FORMATTING)) gtk_imhtml_toggle_bold(imhtml); - if (font->face && (!oldfont->face || !purple_strequal(font->face, oldfont->face)) && !(options & GTK_IMHTML_NO_FONTS)) + if (font->face && !purple_strequal(font->face, oldfont->face) && !(options & GTK_IMHTML_NO_FONTS)) gtk_imhtml_toggle_fontface(imhtml, oldfont->face); - if (font->fore && (!oldfont->fore || !purple_strequal(font->fore, oldfont->fore)) && !(options & GTK_IMHTML_NO_COLOURS)) + if (font->fore && !purple_strequal(font->fore, oldfont->fore) && !(options & GTK_IMHTML_NO_COLOURS)) gtk_imhtml_toggle_forecolor(imhtml, oldfont->fore); - if (font->back && (!oldfont->back || !purple_strequal(font->back, oldfont->back)) && !(options & GTK_IMHTML_NO_COLOURS)) + if (font->back && !purple_strequal(font->back, oldfont->back) && !(options & GTK_IMHTML_NO_COLOURS)) gtk_imhtml_toggle_backcolor(imhtml, oldfont->back); } diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c index d5368e70f7..ef0c14bd73 100644 --- a/pidgin/gtkprefs.c +++ b/pidgin/gtkprefs.c @@ -1016,7 +1016,7 @@ prefs_set_blist_theme_cb(GtkComboBox *combo_box, gpointer user_data) gtk_tree_model_get(GTK_TREE_MODEL(prefs_blist_themes), &iter, 2, &name, -1); - if(!name || !purple_strequal(name, "")) + if(!purple_strequal(name, "")) theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(name, "blist")); g_free(name); @@ -1037,7 +1037,7 @@ prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data) gtk_tree_model_get(GTK_TREE_MODEL(prefs_status_icon_themes), &iter, 2, &name, -1); - if(!name || !purple_strequal(name, "")) + if(!purple_strequal(name, "")) theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon")); g_free(name); @@ -1894,7 +1894,7 @@ get_available_browsers(void) browser_setting = NULL; /* If xdg-open is valid, prefer it over gnome-open and skip forward */ if(purple_strequal(possible_browsers[i].command, "xdg-open")) { - if (browser_setting && purple_strequal("gnome-open", browser_setting)) { + if (purple_strequal("gnome-open", browser_setting)) { purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", possible_browsers[i].command); browser_setting = NULL; } diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c index 5058fbb540..f9d93c44e7 100644 --- a/pidgin/gtkrequest.c +++ b/pidgin/gtkrequest.c @@ -809,7 +809,7 @@ setup_entry_field(GtkWidget *entry, PurpleRequestField *field) purple_request_field_is_visible(fld)) { const char *type_hint = purple_request_field_get_type_hint(fld); - if (type_hint != NULL && purple_strequal(type_hint, "account")) + if (purple_strequal(type_hint, "account")) { optmenu = GTK_WIDGET(purple_request_field_get_ui_data(fld)); if (optmenu == NULL) { diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index 5f93cc1471..8ae28e15b8 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -1976,7 +1976,7 @@ add_buddyname_autocomplete_entry(GtkListStore *store, const char *buddy_alias, c when the name and contact alias match. */ if (contact_alias && !purple_strequal(contact_alias, buddyname)) { /* We don't want duplicates when the contact and buddy alias match. */ - if (!buddy_alias || !purple_strequal(contact_alias, buddy_alias)) { + if (!purple_strequal(contact_alias, buddy_alias)) { char *completion_entry = g_strdup_printf("%s \"%s\"", buddyname, contact_alias); char *tmp2 = g_utf8_normalize(contact_alias, -1, G_NORMALIZE_DEFAULT); diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c index ff6c0d26fe..7e3f7a4ddc 100644 --- a/pidgin/plugins/cap/cap.c +++ b/pidgin/plugins/cap/cap.c @@ -96,7 +96,7 @@ static double generate_prediction_for(PurpleBuddy *buddy) { sta_id = purple_status_get_id(get_status_for(buddy)); - if(sta_id && purple_strequal(sta_id, "offline")) { + if(purple_strequal(sta_id, "offline")) { /* This is kind of stupid, change it. */ if(prediction == 1.0f) prediction = 0.0f; |