diff options
author | qarkai <qarkai@gmail.com> | 2017-03-25 21:54:42 +0300 |
---|---|---|
committer | qarkai <qarkai@gmail.com> | 2017-03-25 21:54:42 +0300 |
commit | e7c6fc7c9fcef24532b93d9571df13549714c18d (patch) | |
tree | c056bef0d1a49d228307834e9a15c7139d9b66b4 | |
parent | 2e53c1f0f03beb7304d4794d579afcb1cdc7d806 (diff) | |
download | pidgin-e7c6fc7c9fcef24532b93d9571df13549714c18d.tar.gz |
Use conventional style for empty string check
-rw-r--r-- | libpurple/protocols/jabber/disco.c | 4 | ||||
-rw-r--r-- | pidgin/gtkimhtml.c | 2 | ||||
-rw-r--r-- | pidgin/gtkprefs.c | 4 | ||||
-rw-r--r-- | pidgin/plugins/pidginrc.c | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c index cbea98787f..a5841d3a11 100644 --- a/libpurple/protocols/jabber/disco.c +++ b/libpurple/protocols/jabber/disco.c @@ -545,10 +545,10 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from, js->googletalk = TRUE; /* autodiscover stun and relays */ - if (stun_ip == NULL || stun_ip[0] == '\0') { + if (!stun_ip || !*stun_ip) { jabber_google_send_jingle_info(js); } - } else if (stun_ip == NULL || stun_ip[0] == '\0') { + } else if (!stun_ip || !*stun_ip) { js->srv_query_data = purple_srv_resolve_account( purple_connection_get_account(js->gc), "stun", "udp", diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c index 69bd14e297..777db0bef4 100644 --- a/pidgin/gtkimhtml.c +++ b/pidgin/gtkimhtml.c @@ -4793,7 +4793,7 @@ static gboolean gtk_imhtml_toggle_str_tag(GtkIMHtml *imhtml, const char *value, g_free(*edit_field); *edit_field = NULL; - if (value && value[0] != '\0') + if (value && *value) { *edit_field = g_strdup(value); diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c index f3d0b287b2..1e8dbfe18f 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 || name[0] != '\0') + if(!name || *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 || name[0] != '\0') + if(!name || *name) theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon")); g_free(name); diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c index 8b24440e1b..775a732706 100644 --- a/pidgin/plugins/pidginrc.c +++ b/pidgin/plugins/pidginrc.c @@ -113,7 +113,7 @@ make_gtkrc_string(void) if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) { const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name"); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { g_string_append_printf(style_string, "gtk-font-name = \"%s\"\n", pref); @@ -123,7 +123,7 @@ make_gtkrc_string(void) if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) { const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name"); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { g_string_append_printf(style_string, "gtk-key-theme-name = \"%s\"\n", pref); @@ -141,7 +141,7 @@ make_gtkrc_string(void) const gchar *pref; pref = purple_prefs_get_string(color_prefs[i]); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { prefbase = g_path_get_basename(color_prefs[i]); g_string_append_printf(style_string, "\n\t%s = \"%s\"", @@ -180,7 +180,7 @@ make_gtkrc_string(void) const gchar *pref; pref = purple_prefs_get_string(font_prefs[i]); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { prefbase = g_path_get_basename(font_prefs[i]); g_string_append_printf(style_string, "style \"%s_style\"\n{\n" @@ -276,7 +276,7 @@ purplerc_set_color(GtkWidget *widget, gpointer data) pref = purple_prefs_get_string(color_prefs[subscript]); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { if (gdk_color_parse(pref, &color)) { #if GTK_CHECK_VERSION(2,14,0) gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( @@ -337,7 +337,7 @@ purplerc_set_font(GtkWidget *widget, gpointer data) pref = purple_prefs_get_string(prefpath); - if (pref != NULL && pref[0] != '\0') { + if (pref && *pref) { gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref); } |