diff options
author | qarkai <qarkai@gmail.com> | 2017-03-24 02:23:46 +0300 |
---|---|---|
committer | qarkai <qarkai@gmail.com> | 2017-03-24 02:23:46 +0300 |
commit | aa415b4537814485863797aaf4cdd1c55b579ae7 (patch) | |
tree | bac9c810db754170675eb051f016228bb4fd0960 | |
parent | 6fda481b5ad738cbcd460df2025ef0a622dfb495 (diff) | |
download | pidgin-aa415b4537814485863797aaf4cdd1c55b579ae7.tar.gz |
Replace strcmp() with purple_strequal()
Didn't touch finch/libgnt files
94 files changed, 299 insertions, 295 deletions
diff --git a/finch/gntaccount.c b/finch/gntaccount.c index 97d0fd5f7c..fac1ea70ee 100644 --- a/finch/gntaccount.c +++ b/finch/gntaccount.c @@ -167,7 +167,7 @@ save_account_cb(AccountEditDialog *dialog) } else { const char *old = purple_account_get_protocol_id(account); char *oldprpl; - if (strcmp(old, purple_plugin_get_id(plugin))) { + if (!purple_strequal(old, purple_plugin_get_id(plugin))) { purple_notify_error(NULL, _("Error"), _("Account was not modified"), _("The account's protocol cannot be changed while it is connected to the server.")); return; diff --git a/finch/gntblist.c b/finch/gntblist.c index b2c62c55d8..323e9e76d0 100644 --- a/finch/gntblist.c +++ b/finch/gntblist.c @@ -1942,16 +1942,16 @@ key_pressed(GntWidget *widget, const char *text, FinchBlist *ggblist) if (gnt_tree_is_searching(GNT_TREE(ggblist->tree))) gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "end-search", NULL); remove_peripherals(ggblist); - } else if (strcmp(text, GNT_KEY_INS) == 0) { + } else if (purple_strequal(text, GNT_KEY_INS)) { PurpleBlistNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)); purple_blist_request_add_buddy(NULL, NULL, node && PURPLE_BLIST_NODE_IS_GROUP(node) ? purple_group_get_name(PURPLE_GROUP(node)) : NULL, NULL); } else if (!gnt_tree_is_searching(GNT_TREE(ggblist->tree))) { - if (strcmp(text, "t") == 0) { + if (purple_strequal(text, "t")) { finch_blist_toggle_tag_buddy(gnt_tree_get_selection_data(GNT_TREE(ggblist->tree))); gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "move-down", NULL); - } else if (strcmp(text, "a") == 0) { + } else if (purple_strequal(text, "a")) { finch_blist_place_tagged(gnt_tree_get_selection_data(GNT_TREE(ggblist->tree))); } else return FALSE; @@ -2060,13 +2060,13 @@ populate_buddylist(void) if (ggblist->manager->init) ggblist->manager->init(); - if (strcmp(purple_prefs_get_string(PREF_ROOT "/sort_type"), "text") == 0) { + if (purple_strequal(purple_prefs_get_string(PREF_ROOT "/sort_type"), "text")) { gnt_tree_set_compare_func(GNT_TREE(ggblist->tree), (GCompareFunc)blist_node_compare_text); - } else if (strcmp(purple_prefs_get_string(PREF_ROOT "/sort_type"), "status") == 0) { + } else if (purple_strequal(purple_prefs_get_string(PREF_ROOT "/sort_type"), "status")) { gnt_tree_set_compare_func(GNT_TREE(ggblist->tree), (GCompareFunc)blist_node_compare_status); - } else if (strcmp(purple_prefs_get_string(PREF_ROOT "/sort_type"), "log") == 0) { + } else if (purple_strequal(purple_prefs_get_string(PREF_ROOT "/sort_type"), "log")) { gnt_tree_set_compare_func(GNT_TREE(ggblist->tree), (GCompareFunc)blist_node_compare_log); } @@ -3240,7 +3240,7 @@ void finch_blist_install_manager(const FinchBlistManager *manager) if (!g_list_find(managers, manager)) { managers = g_list_append(managers, (gpointer)manager); reconstruct_grouping_menu(); - if (strcmp(manager->id, purple_prefs_get_string(PREF_ROOT "/grouping")) == 0) + if (purple_strequal(manager->id, purple_prefs_get_string(PREF_ROOT "/grouping"))) purple_prefs_trigger_callback(PREF_ROOT "/grouping"); } } @@ -3250,7 +3250,7 @@ void finch_blist_uninstall_manager(const FinchBlistManager *manager) if (g_list_find(managers, manager)) { managers = g_list_remove(managers, manager); reconstruct_grouping_menu(); - if (strcmp(manager->id, purple_prefs_get_string(PREF_ROOT "/grouping")) == 0) + if (purple_strequal(manager->id, purple_prefs_get_string(PREF_ROOT "/grouping"))) purple_prefs_trigger_callback(PREF_ROOT "/grouping"); } } @@ -3263,7 +3263,7 @@ FinchBlistManager * finch_blist_manager_find(const char *id) for (; iter; iter = iter->next) { FinchBlistManager *m = iter->data; - if (strcmp(id, m->id) == 0) + if (purple_strequal(id, m->id)) return m; } return NULL; diff --git a/finch/gntconv.c b/finch/gntconv.c index 04c882857a..30695fb1bc 100644 --- a/finch/gntconv.c +++ b/finch/gntconv.c @@ -1330,15 +1330,15 @@ cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char * int *msgclass = NULL; int fg, bg; - if (strcmp(args[0], "receive") == 0) + if (purple_strequal(args[0], "receive")) msgclass = &color_message_receive; - else if (strcmp(args[0], "send") == 0) + else if (purple_strequal(args[0], "send")) msgclass = &color_message_send; - else if (strcmp(args[0], "highlight") == 0) + else if (purple_strequal(args[0], "highlight")) msgclass = &color_message_highlight; - else if (strcmp(args[0], "action") == 0) + else if (purple_strequal(args[0], "action")) msgclass = &color_message_action; - else if (strcmp(args[0], "timestamp") == 0) + else if (purple_strequal(args[0], "timestamp")) msgclass = &color_timestamp; else { if (error) diff --git a/finch/gntlog.c b/finch/gntlog.c index 102bf0cfff..92a6f521b4 100644 --- a/finch/gntlog.c +++ b/finch/gntlog.c @@ -239,7 +239,7 @@ static void populate_log_tree(FinchLogViewer *lv) pmonth = purple_utf8_strftime(_("%B %Y"), log->tm ? log->tm : localtime(&log->time)); - if (strcmp(pmonth, prev_top_month) != 0) { + if (!purple_strequal(pmonth, prev_top_month)) { month = g_strdup(pmonth); /* top level */ gnt_tree_add_row_last(GNT_TREE(lv->tree), diff --git a/finch/gntplugin.c b/finch/gntplugin.c index cf863507a5..fb77f2492a 100644 --- a/finch/gntplugin.c +++ b/finch/gntplugin.c @@ -499,7 +499,7 @@ process_pref_frame(PurplePluginPrefFrame *frame) } stringlist = g_list_prepend(stringlist, value); purple_request_field_list_add_icon(field, label, NULL, value); - if (strcmp(value, current_value) == 0) + if (purple_strequal(value, current_value)) purple_request_field_list_add_selected(field, label); list = list->next->next; } diff --git a/finch/gntprefs.c b/finch/gntprefs.c index 308962d895..82ff9d58a6 100644 --- a/finch/gntprefs.c +++ b/finch/gntprefs.c @@ -68,7 +68,7 @@ void finch_prefs_update_old() purple_prefs_rename("/purple/gnt", "/finch"); if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) && - strcmp(str, "gaim") == 0) + purple_strequal(str, "gaim")) purple_prefs_set_string("/purple/away/idle_reporting", "purple"); } @@ -167,7 +167,7 @@ get_pref_field(Prefs *prefs) select = TRUE; break; case PURPLE_PREF_STRING: - if (strcmp(purple_prefs_get_string(prefs->pref), iter->data) == 0) + if (purple_strequal(purple_prefs_get_string(prefs->pref), iter->data)) select = TRUE; break; default: diff --git a/finch/gntsound.c b/finch/gntsound.c index beec42d394..047e59809b 100644 --- a/finch/gntsound.c +++ b/finch/gntsound.c @@ -1098,7 +1098,7 @@ gboolean finch_sound_is_enabled(void) if (!method) return FALSE; - if (strcmp(method, "nosound") == 0) + if (purple_strequal(method, "nosound")) return FALSE; if (purple_prefs_get_int(make_pref("/volume")) <= 0) return FALSE; diff --git a/finch/plugins/gnthistory.c b/finch/plugins/gnthistory.c index b5514f0b26..d7ac2e4e66 100644 --- a/finch/plugins/gnthistory.c +++ b/finch/plugins/gnthistory.c @@ -159,7 +159,7 @@ history_prefs_check(PurplePlugin *plugin) const char *label = _(list->data); list = g_list_delete_link(list, list); purple_request_field_list_add_icon(field, label, NULL, list->data); - if (system && strcmp(system, list->data) == 0) + if (system && purple_strequal(system, list->data)) purple_request_field_list_add_selected(field, label); list = g_list_delete_link(list, list); } diff --git a/finch/plugins/lastlog.c b/finch/plugins/lastlog.c index 7e7ef0e0c8..ebcb57d7a5 100644 --- a/finch/plugins/lastlog.c +++ b/finch/plugins/lastlog.c @@ -42,13 +42,13 @@ window_kpress_cb(GntWidget *wid, const char *key, GntTextView *view) { if (key[0] == 27) { - if (strcmp(key, GNT_KEY_DOWN) == 0) + if (purple_strequal(key, GNT_KEY_DOWN)) gnt_text_view_scroll(view, 1); - else if (strcmp(key, GNT_KEY_UP) == 0) + else if (purple_strequal(key, GNT_KEY_UP)) gnt_text_view_scroll(view, -1); - else if (strcmp(key, GNT_KEY_PGDOWN) == 0) + else if (purple_strequal(key, GNT_KEY_PGDOWN)) gnt_text_view_scroll(view, wid->priv.height - 2); - else if (strcmp(key, GNT_KEY_PGUP) == 0) + else if (purple_strequal(key, GNT_KEY_PGUP)) gnt_text_view_scroll(view, -(wid->priv.height - 2)); else return FALSE; diff --git a/libpurple/dbus-useful.c b/libpurple/dbus-useful.c index b288887b1f..4b200ef153 100644 --- a/libpurple/dbus-useful.c +++ b/libpurple/dbus-useful.c @@ -22,10 +22,10 @@ purple_accounts_find_ext(const char *name, const char *protocol_id, for (l = purple_accounts_get_all(); l != NULL; l = l->next) { PurpleAccount *account = (PurpleAccount *)l->data; - if (who && strcmp(purple_normalize(NULL, purple_account_get_username(account)), who)) + if (who && !purple_strequal(purple_normalize(NULL, purple_account_get_username(account)), who)) continue; - if (protocol_id && strcmp(account->protocol_id, protocol_id)) + if (protocol_id && !purple_strequal(account->protocol_id, protocol_id)) continue; if (account_test && !account_test(account)) diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c index 3a6ad89ad5..ae36e9efe8 100644 --- a/libpurple/dnssrv.c +++ b/libpurple/dnssrv.c @@ -671,7 +671,7 @@ res_thread(gpointer data) for (dr_tmp = dr; dr_tmp != NULL; dr_tmp = dr_tmp->pNext) { /* Discard any incorrect entries. I'm not sure if this is necessary */ - if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) { + if (dr_tmp->wType != type || !purple_strequal(dr_tmp->pName, query_data->query)) { continue; } @@ -699,7 +699,7 @@ res_thread(gpointer data) int i; /* Discard any incorrect entries. I'm not sure if this is necessary */ - if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) { + if (dr_tmp->wType != type || !purple_strequal(dr_tmp->pName, query_data->query)) { continue; } diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c index 967e40b15e..fd658ce0c1 100644 --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -909,9 +909,9 @@ get_streams(PurpleMediaBackendFs2 *self, for (; streams; streams = g_list_next(streams)) { PurpleMediaBackendFs2Stream *stream = streams->data; - if (sess_id != NULL && strcmp(stream->session->id, sess_id)) + if (sess_id != NULL && !purple_strequal(stream->session->id, sess_id)) continue; - else if (name != NULL && strcmp(stream->participant, name)) + else if (name != NULL && !purple_strequal(stream->participant, name)) continue; else ret = g_list_prepend(ret, stream); diff --git a/libpurple/plugin.c b/libpurple/plugin.c index 61bbc5d589..fc7f9fd98b 100644 --- a/libpurple/plugin.c +++ b/libpurple/plugin.c @@ -99,9 +99,9 @@ is_native(const char *filename) if (last_period == NULL) return FALSE; - return !(strcmp(last_period, ".dll") & - strcmp(last_period, ".sl") & - strcmp(last_period, ".so")); + return !(!purple_strequal(last_period, ".dll") & + !purple_strequal(last_period, ".sl") & + !purple_strequal(last_period, ".so")); } static char * diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c index 492d9dd944..cecd7b31cf 100644 --- a/libpurple/plugins/log_reader.c +++ b/libpurple/plugins/log_reader.c @@ -35,7 +35,7 @@ static int get_month(const char *month) const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL}; for (iter = 0; months[iter]; iter++) { - if (strcmp(month, months[iter]) == 0) + if (purple_strequal(month, months[iter])) break; } return iter; @@ -635,7 +635,7 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount g_return_val_if_fail(sn != NULL, NULL); g_return_val_if_fail(account != NULL, NULL); - if (strcmp(account->protocol_id, "prpl-msn")) + if (!purple_strequal(account->protocol_id, "prpl-msn")) return NULL; logdir = purple_prefs_get_string("/plugins/core/log_reader/msn/log_directory"); @@ -845,7 +845,7 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount continue; } - if (strcmp(session_id, old_session_id)) { + if (!purple_strequal(session_id, old_session_id)) { /* * The session ID differs from the last message. * Thus, this is the start of a new conversation. @@ -935,7 +935,7 @@ static char * msn_logger_read (PurpleLog *log, PurpleLogReadFlags *flags) break; } - if (strcmp(new_session_id, data->session_id)) { + if (!purple_strequal(new_session_id, data->session_id)) { /* The session ID differs from the first message. * Thus, this is the start of a new conversation. */ @@ -1789,7 +1789,7 @@ static GList *qip_logger_list(PurpleLogType type, const char *sn, PurpleAccount memset(&tm, 0, sizeof(tm)); /* QIP only supports ICQ. */ - if (strcmp(account->protocol_id, "prpl-icq")) + if (!purple_strequal(account->protocol_id, "prpl-icq")) return NULL; logdir = purple_prefs_get_string("/plugins/core/log_reader/qip/log_directory"); @@ -2261,7 +2261,7 @@ static GList *amsn_logger_list(PurpleLogType type, const char *sn, PurpleAccount return NULL; /* aMSN only works with MSN/WLM */ - if (strcmp(account->protocol_id, "prpl-msn")) + if (!purple_strequal(account->protocol_id, "prpl-msn")) return NULL; username = g_strdup(purple_normalize(account, account->username)); diff --git a/libpurple/plugins/mono/loader/mono-helper.c b/libpurple/plugins/mono/loader/mono-helper.c index 4404544409..c05ffbf806 100644 --- a/libpurple/plugins/mono/loader/mono-helper.c +++ b/libpurple/plugins/mono/loader/mono-helper.c @@ -88,7 +88,7 @@ MonoClass* ml_find_plugin_class(MonoImage *image) pklass = mono_class_get_parent(klass); if (pklass) { - if (strcmp("Plugin", mono_class_get_name(pklass)) == 0) + if (purple_strequal("Plugin", mono_class_get_name(pklass))) return klass; } } @@ -149,8 +149,8 @@ gboolean ml_is_api_dll(MonoImage *image) total = mono_image_get_table_rows (image, MONO_TABLE_TYPEDEF); for (i = 1; i <= total; ++i) { klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | i); - if (strcmp(mono_class_get_name(klass), "Debug") == 0) - if (strcmp(mono_class_get_namespace(klass), "Purple") == 0) { + if (purple_strequal(mono_class_get_name(klass), "Debug")) + if (purple_strequal(mono_class_get_namespace(klass), "Purple")) { ml_set_api_image(image); return TRUE; } diff --git a/libpurple/plugins/mono/loader/mono.c b/libpurple/plugins/mono/loader/mono.c index 1f378e0901..a44449379e 100644 --- a/libpurple/plugins/mono/loader/mono.c +++ b/libpurple/plugins/mono/loader/mono.c @@ -75,13 +75,13 @@ static gboolean probe_mono_plugin(PurplePlugin *plugin) while ((m = mono_class_get_methods(mplug->klass, &iter))) { purple_debug_info("mono", "plugin method: %s\n", mono_method_get_name(m)); - if (strcmp(mono_method_get_name(m), "Load") == 0) { + if (purple_strequal(mono_method_get_name(m), "Load")) { mplug->load = m; found_load = TRUE; - } else if (strcmp(mono_method_get_name(m), "Unload") == 0) { + } else if (purple_strequal(mono_method_get_name(m), "Unload")) { mplug->unload = m; found_unload = TRUE; - } else if (strcmp(mono_method_get_name(m), "Destroy") == 0) { + } else if (purple_strequal(mono_method_get_name(m), "Destroy")) { mplug->destroy = m; found_destroy = TRUE; } diff --git a/libpurple/plugins/one_time_password.c b/libpurple/plugins/one_time_password.c index caf29212a9..d038aeb650 100644 --- a/libpurple/plugins/one_time_password.c +++ b/libpurple/plugins/one_time_password.c @@ -94,7 +94,7 @@ plugin_unload(PurplePlugin *plugin) options = prpl_info->protocol_options; while (options != NULL) { option = (PurpleAccountOption *) options->data; - if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) { + if (purple_strequal(PREF_NAME, purple_account_option_get_setting(option))) { prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options); purple_account_option_destroy(option); break; diff --git a/libpurple/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c index 86bd0a7132..1c5410aa58 100644 --- a/libpurple/plugins/perl/perl-common.c +++ b/libpurple/plugins/perl/perl-common.c @@ -223,7 +223,7 @@ execute_perl(const char *function, int argc, char **args) /* Check for changed arguments */ for (i = 0; i < argc; i++) { - if (args[i] && strcmp(args[i], SvPVX(sv_args[i]))) { + if (args[i] && !purple_strequal(args[i], SvPVX(sv_args[i]))) { /* * Shizzel. So the perl script changed one of the parameters, * and we want this change to affect the original parameters. diff --git a/libpurple/plugins/perl/perl-handlers.c b/libpurple/plugins/perl/perl-handlers.c index 7891f43d42..1bc6528cb8 100644 --- a/libpurple/plugins/perl/perl-handlers.c +++ b/libpurple/plugins/perl/perl-handlers.c @@ -367,7 +367,7 @@ perl_signal_cb(va_list args, void *data) case PURPLE_TYPE_STRING: if (!*((char **)copy_args[i]) || !SvPVX(sv_args[i]) || - strcmp(*((char **)copy_args[i]), SvPVX(sv_args[i]))) { + !purple_strequal(*((char **)copy_args[i]), SvPVX(sv_args[i]))) { g_free(*((char **)copy_args[i])); *((char **)copy_args[i]) = g_strdup(SvPVutf8_nolen(sv_args[i])); diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c index c9fbace428..d859684779 100644 --- a/libpurple/plugins/tcl/tcl_cmds.c +++ b/libpurple/plugins/tcl/tcl_cmds.c @@ -332,7 +332,7 @@ int tcl_cmd_account(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CO Tcl_GetString(objv[3])); } else { PurpleStatusPrimitive primitive; - if (strcmp(Tcl_GetString(objv[3]), "-primitive")) { + if (!purple_strequal(Tcl_GetString(objv[3]), "-primitive")) { result = Tcl_NewStringObj("bad option \"", -1); Tcl_AppendObjToObj(result, objv[3]); Tcl_AppendToObj(result, "\": should be -primitive", -1); @@ -469,7 +469,7 @@ int tcl_cmd_buddy(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONS Tcl_NewStringObj("buddy too short", -1)); return TCL_ERROR; } - if (strcmp("buddy", Tcl_GetString(elems[0]))) { + if (!purple_strequal("buddy", Tcl_GetString(elems[0]))) { Tcl_SetObjResult(interp, Tcl_NewStringObj("invalid buddy", -1)); return TCL_ERROR; @@ -1229,7 +1229,7 @@ int tcl_cmd_presence(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *C Tcl_GetString(objv[3])))); } else { PurpleStatusPrimitive primitive; - if (strcmp(Tcl_GetString(objv[3]), "-primitive")) { + if (!purple_strequal(Tcl_GetString(objv[3]), "-primitive")) { result = Tcl_NewStringObj("bad option \"", -1); Tcl_AppendObjToObj(result, objv[3]); Tcl_AppendToObj(result, diff --git a/libpurple/plugins/tcl/tcl_ref.c b/libpurple/plugins/tcl/tcl_ref.c index e51650cd21..f8c5d52252 100644 --- a/libpurple/plugins/tcl/tcl_ref.c +++ b/libpurple/plugins/tcl/tcl_ref.c @@ -55,7 +55,7 @@ void *purple_tcl_ref_get(Tcl_Interp *interp, Tcl_Obj *obj, PurpleStringref *type if (Tcl_ConvertToType(interp, obj, &purple_tcl_ref) != TCL_OK) return NULL; } - if (strcmp(purple_stringref_value(OBJ_REF_TYPE(obj)), + if (!purple_strequal(purple_stringref_value(OBJ_REF_TYPE(obj)), purple_stringref_value(type))) { if (interp) { Tcl_Obj *error = Tcl_NewStringObj("Bad Purple reference type: expected ", -1); diff --git a/libpurple/pounce.c b/libpurple/pounce.c index 185b302dc9..be80a373bf 100644 --- a/libpurple/pounce.c +++ b/libpurple/pounce.c @@ -714,7 +714,7 @@ purple_pounce_destroy_all_by_buddy(PurpleBuddy *buddy) pouncer = purple_pounce_get_pouncer(pounce); pouncee = purple_pounce_get_pouncee(pounce); - if ( (pouncer == bacct) && (strcmp(pouncee, bname) == 0) ) + if ( (pouncer == bacct) && (purple_strequal(pouncee, bname)) ) purple_pounce_destroy(pounce); } } diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c index 3b5bdbaf28..ec0eb1d23a 100644 --- a/libpurple/protocols/bonjour/bonjour.c +++ b/libpurple/protocols/bonjour/bonjour.c @@ -606,9 +606,9 @@ _set_default_name_cb(gpointer data) { for(; tmp != NULL; tmp = tmp->next) { option = tmp->data; - if (strcmp("first", purple_account_option_get_setting(option)) == 0) + if (purple_strequal("first", purple_account_option_get_setting(option))) purple_account_option_set_default_string(option, default_firstname); - else if (strcmp("last", purple_account_option_get_setting(option)) == 0) + else if (purple_strequal("last", purple_account_option_get_setting(option))) purple_account_option_set_default_string(option, default_lastname); } diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c index 7d4b138db0..43f65a3fd2 100644 --- a/libpurple/protocols/bonjour/bonjour_ft.c +++ b/libpurple/protocols/bonjour/bonjour_ft.c @@ -721,7 +721,7 @@ xep_bytestreams_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb) if (!query) return; - if(strcmp(type, "set")) { + if(!purple_strequal(type, "set")) { purple_debug_info("bonjour", "bytestream offer Message type - Unknown-%s.\n", type); return; } diff --git a/libpurple/protocols/bonjour/buddy.c b/libpurple/protocols/bonjour/buddy.c index df7033c058..2c857e157a 100644 --- a/libpurple/protocols/bonjour/buddy.c +++ b/libpurple/protocols/bonjour/buddy.c @@ -193,7 +193,7 @@ bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy, PurpleBuddy *buddy) /* Deal with the buddy icon */ old_hash = purple_buddy_icons_get_checksum_for_user(buddy); new_hash = (bonjour_buddy->phsh && *(bonjour_buddy->phsh)) ? bonjour_buddy->phsh : NULL; - if (new_hash && (!old_hash || strcmp(old_hash, new_hash) != 0)) { + if (new_hash && (!old_hash || !purple_strequal(old_hash, new_hash))) { /* Look up the new icon data */ /* TODO: Make sure the hash assigned to the retrieved buddy icon is the same * as what we looked up. */ diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c index c50c79e9d1..5db4e7cbc9 100644 --- a/libpurple/protocols/bonjour/jabber.c +++ b/libpurple/protocols/bonjour/jabber.c @@ -1155,7 +1155,7 @@ bonjour_jabber_close_conversation(BonjourJabberConversation *bconv) tmp_next = xfers->next; /* We only need to cancel this if it hasn't actually started transferring. */ /* This will change if we ever support IBB transfers. */ - if (strcmp(xfer->who, purple_buddy_get_name(bconv->pb)) == 0 + if (purple_strequal(xfer->who, purple_buddy_get_name(bconv->pb)) && (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_NOT_STARTED || purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_UNKNOWN)) { purple_xfer_cancel_remote(xfer); diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c index c713ecd92e..109fd7312d 100644 --- a/libpurple/protocols/bonjour/mdns_avahi.c +++ b/libpurple/protocols/bonjour/mdns_avahi.c @@ -185,7 +185,7 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco purple_debug_info("bonjour", "_resolve_callback - name:%s ip:%s prev_ip:%s\n", name, ip, rd->ip); - if (rd->ip == NULL || strcmp(rd->ip, ip) != 0) { + if (rd->ip == NULL || !purple_strequal(rd->ip, ip)) { /* We store duplicates in bb->ips, so we always remove the one */ if (rd->ip != NULL) { bb->ips = g_slist_remove(bb->ips, rd->ip); diff --git a/libpurple/protocols/gg/gg-utils.c b/libpurple/protocols/gg/gg-utils.c index 96e3b295ce..8fa5f6831f 100644 --- a/libpurple/protocols/gg/gg-utils.c +++ b/libpurple/protocols/gg/gg-utils.c @@ -129,7 +129,7 @@ void ggp_status_fake_to_self(PurpleAccount *account) msg = NULL; status_id = purple_status_get_id(status); - if (strcmp(status_id, "invisible") == 0) { + if (purple_strequal(status_id, "invisible")) { status_id = "offline"; } diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c index 4931a41743..b1e153eb16 100644 --- a/libpurple/protocols/gg/gg.c +++ b/libpurple/protocols/gg/gg.c @@ -1717,7 +1717,7 @@ static void ggp_login_to(PurpleAccount *account, uint32_t server) encryption_type = purple_account_get_string(account, "encryption", "none"); purple_debug_info("gg", "Requested encryption type: %s\n", encryption_type); - if (strcmp(encryption_type, "opportunistic_tls") == 0) + if (purple_strequal(encryption_type, "opportunistic_tls")) glp->tls = 1; else glp->tls = 0; @@ -2012,19 +2012,19 @@ static int ggp_to_gg_status(PurpleStatus *status, char **msg) purple_debug_info("gg", "ggp_to_gg_status: Requested status = %s\n", status_id); - if (strcmp(status_id, "available") == 0) { + if (purple_strequal(status_id, "available")) { new_status = GG_STATUS_AVAIL; new_status_descr = GG_STATUS_AVAIL_DESCR; - } else if (strcmp(status_id, "away") == 0) { + } else if (purple_strequal(status_id, "away")) { new_status = GG_STATUS_BUSY; new_status_descr = GG_STATUS_BUSY_DESCR; - } else if (strcmp(status_id, "unavailable") == 0) { + } else if (purple_strequal(status_id, "unavailable")) { new_status = GG_STATUS_DND; new_status_descr = GG_STATUS_DND_DESCR; - } else if (strcmp(status_id, "invisible") == 0) { + } else if (purple_strequal(status_id, "invisible")) { new_status = GG_STATUS_INVISIBLE; new_status_descr = GG_STATUS_INVISIBLE_DESCR; - } else if (strcmp(status_id, "offline") == 0) { + } else if (purple_strequal(status_id, "offline")) { new_status = GG_STATUS_NOT_AVAIL; new_status_descr = GG_STATUS_NOT_AVAIL_DESCR; } else { @@ -2090,7 +2090,7 @@ static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup gg_add_notify(info->session, ggp_str_to_uin(name)); account = purple_connection_get_account(gc); - if (strcmp(purple_account_get_username(account), name) == 0) { + if (purple_strequal(purple_account_get_username(account), name)) { ggp_status_fake_to_self(account); } } diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c index af1a37620c..603f43ac27 100644 --- a/libpurple/protocols/gg/lib/events.c +++ b/libpurple/protocols/gg/lib/events.c @@ -1087,7 +1087,7 @@ static gg_action_t gg_handle_reading_hub_proxy(struct gg_session *sess, port = atoi(tmp + 1); } - if (strcmp(host, "notoperating") == 0) { + if (purple_strequal(host, "notoperating")) { gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() service unavailable\n"); e->event.failure = GG_FAILURE_UNAVAILABLE; return GG_ACTION_FAIL; diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c index fb3dd43e00..bee283310f 100644 --- a/libpurple/protocols/gg/lib/libgadu.c +++ b/libpurple/protocols/gg/lib/libgadu.c @@ -991,7 +991,7 @@ struct gg_session *gg_login(const struct gg_login_params *p) } else sess->protocol_version = p->protocol_version; - if (p->client_version && strcmp(p->client_version, "-") != 0) + if (p->client_version && !purple_strequal(p->client_version, "-")) sess->client_version = strdup(p->client_version); sess->last_sysmsg = p->last_sysmsg; sess->image_size = p->image_size; diff --git a/libpurple/protocols/gg/lib/protobuf-c.c b/libpurple/protocols/gg/lib/protobuf-c.c index 7b8d07bd44..4e16fe1c38 100644 --- a/libpurple/protocols/gg/lib/protobuf-c.c +++ b/libpurple/protocols/gg/lib/protobuf-c.c @@ -3204,7 +3204,7 @@ protobuf_c_enum_descriptor_get_value_by_name(const ProtobufCEnumDescriptor *desc } if (count == 0) return NULL; - if (strcmp(desc->values_by_name[start].name, name) == 0) + if (purple_strequal(desc->values_by_name[start].name, name)) return desc->values + desc->values_by_name[start].index; return NULL; } @@ -3243,7 +3243,7 @@ protobuf_c_message_descriptor_get_field_by_name(const ProtobufCMessageDescriptor if (count == 0) return NULL; field = desc->fields + desc->fields_sorted_by_name[start]; - if (strcmp(field->name, name) == 0) + if (purple_strequal(field->name, name)) return field; return NULL; } @@ -3282,7 +3282,7 @@ protobuf_c_service_descriptor_get_method_by_name(const ProtobufCServiceDescripto } if (count == 0) return NULL; - if (strcmp(desc->methods[desc->method_indices_by_name[start]].name, name) == 0) + if (purple_strequal(desc->methods[desc->method_indices_by_name[start]].name, name)) return desc->methods + desc->method_indices_by_name[start]; return NULL; } diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c index 9cef02082c..4a43a3a4ba 100644 --- a/libpurple/protocols/gg/lib/pubdir50.c +++ b/libpurple/protocols/gg/lib/pubdir50.c @@ -88,7 +88,7 @@ static int gg_pubdir50_add_n(gg_pubdir50_t req, int num, const char *field, cons } for (i = 0; i < req->entries_count; i++) { - if (req->entries[i].num != num || strcmp(req->entries[i].field, field)) + if (req->entries[i].num != num || !purple_strequal(req->entries[i].field, field)) continue; free(req->entries[i].value); diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c index 99c417a635..58774e36a8 100644 --- a/libpurple/protocols/irc/cmds.c +++ b/libpurple/protocols/irc/cmds.c @@ -54,7 +54,7 @@ int irc_cmd_away(struct irc_conn *irc, const char *cmd, const char *target, cons { char *buf, *message; - if (args[0] && strcmp(cmd, "back")) { + if (args[0] && !purple_strequal(cmd, "back")) { message = purple_markup_strip_html(args[0]); purple_util_chrreplace(message, '\n', ' '); buf = irc_format(irc, "v:", "AWAY", message); diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c index 4cf172d572..4913509096 100644 --- a/libpurple/protocols/irc/msgs.c +++ b/libpurple/protocols/irc/msgs.c @@ -603,7 +603,7 @@ void irc_msg_topic(struct irc_conn *irc, const char *name, const char *from, cha g_free(tmp); if (purple_strequal(name, "topic")) { const char *current_topic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(convo)); - if (!(current_topic != NULL && strcmp(tmp2, current_topic) == 0)) + if (!(current_topic != NULL && purple_strequal(tmp2, current_topic))) { char *nick_esc; nick = irc_mask_nick(from); diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c index cda6a58bee..373f003265 100644 --- a/libpurple/protocols/jabber/adhoccommands.c +++ b/libpurple/protocols/jabber/adhoccommands.c @@ -74,7 +74,7 @@ jabber_adhoc_got_buddy_list(JabberStream *js, const char *from, xmlnode *query) JabberAdHocCommands *cmd; if(item->type != XMLNODE_TYPE_TAG) continue; - if(strcmp(item->name, "item")) + if(!purple_strequal(item->name, "item")) continue; cmd = g_new0(JabberAdHocCommands, 1); @@ -257,7 +257,7 @@ jabber_adhoc_got_server_list(JabberStream *js, const char *from, xmlnode *query) JabberAdHocCommands *cmd; if(item->type != XMLNODE_TYPE_TAG) continue; - if(strcmp(item->name, "item")) + if(!purple_strequal(item->name, "item")) continue; cmd = g_new0(JabberAdHocCommands, 1); cmd->jid = g_strdup(xmlnode_get_attrib(item,"jid")); diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c index dc141bfa38..4c6266ebf5 100644 --- a/libpurple/protocols/jabber/buddy.c +++ b/libpurple/protocols/jabber/buddy.c @@ -407,7 +407,7 @@ static xmlnode *insert_tag_to_parent_tag(xmlnode *start, const char *parent_tag, const struct vcard_template *vc_tp = vcard_template_data; while(vc_tp->label != NULL) { - if(strcmp(vc_tp->tag, new_tag) == 0) { + if(purple_strequal(vc_tp->tag, new_tag)) { parent_tag = vc_tp->ptag; break; } @@ -653,7 +653,7 @@ void jabber_setup_set_info(PurplePluginAction *action) cdata = xmlnode_get_data(data_node); } - if(strcmp(vc_tp->tag, "DESC") == 0) { + if(purple_strequal(vc_tp->tag, "DESC")) { field = purple_request_field_string_new(vc_tp->tag, _(vc_tp->label), cdata, TRUE); @@ -1174,7 +1174,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from, (bintext = xmlnode_get_data(binval))) { gsize size; guchar *data; - gboolean photo = (strcmp(child->name, "PHOTO") == 0); + gboolean photo = purple_strequal(child->name, "PHOTO"); data = purple_base64_decode(bintext, &size); if (data) { @@ -2324,7 +2324,7 @@ jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr, const JabberIdentity *identity = (JabberIdentity *) iter->data; - if (strcmp(identity->category, category) == 0) { + if (purple_strequal(identity->category, category)) { return identity->type; } } diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c index 9a47633825..f213733c69 100644 --- a/libpurple/protocols/jabber/data.c +++ b/libpurple/protocols/jabber/data.c @@ -87,7 +87,7 @@ jabber_data_create_from_xml(xmlnode *tag) g_return_val_if_fail(tag != NULL, NULL); /* check if this is a "data" tag */ - if (strcmp(tag->name, "data") != 0) { + if (!purple_strequal(tag->name, "data")) { purple_debug_error("jabber", "Invalid data element\n"); return NULL; } diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c index ff224e1316..7610ac7889 100644 --- a/libpurple/protocols/jabber/disco.c +++ b/libpurple/protocols/jabber/disco.c @@ -72,7 +72,7 @@ jabber_disco_bytestream_server_cb(JabberStream *js, const char *from, const char *port = xmlnode_get_attrib(sh_node, "port"); - if (jid == NULL || strcmp(jid, from) != 0) + if (jid == NULL || !purple_strequal(jid, from)) purple_debug_error("jabber", "Invalid jid(%s) for bytestream.\n", jid ? jid : "(null)"); @@ -498,7 +498,7 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from, { xmlnode *query, *child; - if (!from || strcmp(from, js->user->domain)) { + if (!from || !purple_strequal(from, js->user->domain)) { jabber_disco_finish_server_info_result_cb(js); return; } @@ -527,9 +527,9 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from, gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS | PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES; } - if (!category || strcmp(category, "server")) + if (!category || !purple_strequal(category, "server")) continue; - if (!type || strcmp(type, "im")) + if (!type || !purple_strequal(type, "im")) continue; name = xmlnode_get_attrib(child, "name"); @@ -587,7 +587,7 @@ jabber_disco_server_items_result_cb(JabberStream *js, const char *from, { xmlnode *query, *child; - if (!from || strcmp(from, js->user->domain) != 0) + if (!from || !purple_strequal(from, js->user->domain)) return; if (type == JABBER_IQ_ERROR) diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c index 3e43a8fc51..9ce1648f0a 100644 --- a/libpurple/protocols/jabber/google/google_session.c +++ b/libpurple/protocols/jabber/google/google_session.c @@ -504,7 +504,7 @@ jabber_google_relay_response_session_handle_initiate_cb(GoogleSession *session, const char *id, *encoding_name, *clock_rate; gboolean video; if (codec_element->name && - strcmp(codec_element->name, "payload-type")) + !purple_strequal(codec_element->name, "payload-type")) continue; xmlns = xmlnode_get_namespace(codec_element); @@ -845,7 +845,7 @@ jabber_google_session_parse(JabberStream *js, const char *from, } /* If the session doesn't exist, this has to be an initiate message */ - if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate")) + if (!purple_strequal(xmlnode_get_attrib(session_node, "type"), "initiate")) return; desc_node = xmlnode_get_child(session_node, "description"); if (!desc_node) diff --git a/libpurple/protocols/jabber/ibb.c b/libpurple/protocols/jabber/ibb.c index d10b1d3f49..556a3b16b0 100644 --- a/libpurple/protocols/jabber/ibb.c +++ b/libpurple/protocols/jabber/ibb.c @@ -396,7 +396,7 @@ jabber_ibb_parse(JabberStream *js, const char *who, JabberIqType type, if (sess) { - if (strcmp(who, jabber_ibb_session_get_who(sess)) != 0) { + if (!purple_strequal(who, jabber_ibb_session_get_who(sess))) { /* the iq comes from a different JID than the remote JID of the session, ignore it */ purple_debug_error("jabber", diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index 6f6a808523..dc6fe469e2 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -474,7 +474,7 @@ void jabber_send_raw(JabberStream *js, const char *data, int len) g_return_if_fail(data != NULL); /* because printing a tab to debug every minute gets old */ - if (data && strcmp(data, "\t") != 0) { + if (data && !purple_strequal(data, "\t")) { const char *username; char *text = NULL, *last_part = NULL, *tag_start = NULL; @@ -2152,13 +2152,13 @@ const char* jabber_list_emblem(PurpleBuddy *b) jabber_resource_get_identity_category_type(jbr, "client"); if (client_type) { - if (strcmp(client_type, "phone") == 0) { + if (purple_strequal(client_type, "phone")) { return "mobile"; - } else if (strcmp(client_type, "web") == 0) { + } else if (purple_strequal(client_type, "web")) { return "external"; - } else if (strcmp(client_type, "handheld") == 0) { + } else if (purple_strequal(client_type, "handheld")) { return "hiptop"; - } else if (strcmp(client_type, "bot") == 0) { + } else if (purple_strequal(client_type, "bot")) { return "bot"; } /* the default value "pc" falls through and has no emblem */ @@ -2508,7 +2508,7 @@ static void jabber_password_change_cb(JabberStream *js, p1 = purple_request_fields_get_string(fields, "password1"); p2 = purple_request_fields_get_string(fields, "password2"); - if(strcmp(p1, p2)) { + if(!purple_strequal(p1, p2)) { purple_notify_error(js->gc, NULL, _("New passwords do not match."), NULL); return; } @@ -2930,11 +2930,11 @@ static PurpleCmdRet jabber_cmd_chat_affiliate(PurpleConversation *conv, if (!chat || !args || !args[0]) return PURPLE_CMD_RET_FAILED; - if (strcmp(args[0], "owner") != 0 && - strcmp(args[0], "admin") != 0 && - strcmp(args[0], "member") != 0 && - strcmp(args[0], "outcast") != 0 && - strcmp(args[0], "none") != 0) { + if (!purple_strequal(args[0], "owner") && + !purple_strequal(args[0], "admin") && + !purple_strequal(args[0], "member") && + !purple_strequal(args[0], "outcast") && + !purple_strequal(args[0], "none")) { *error = g_strdup_printf(_("Unknown affiliation: \"%s\""), args[0]); return PURPLE_CMD_RET_FAILED; } @@ -2966,10 +2966,10 @@ static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv, if (!chat || !args || !args[0]) return PURPLE_CMD_RET_FAILED; - if (strcmp(args[0], "moderator") != 0 && - strcmp(args[0], "participant") != 0 && - strcmp(args[0], "visitor") != 0 && - strcmp(args[0], "none") != 0) { + if (!purple_strequal(args[0], "moderator") && + !purple_strequal(args[0], "participant") && + !purple_strequal(args[0], "visitor") && + !purple_strequal(args[0], "none")) { *error = g_strdup_printf(_("Unknown role: \"%s\""), args[0]); return PURPLE_CMD_RET_FAILED; } @@ -3826,12 +3826,12 @@ jabber_do_init(void) ui_type = ui_info ? g_hash_table_lookup(ui_info, "client_type") : NULL; if (ui_type) { - if (strcmp(ui_type, "pc") == 0 || - strcmp(ui_type, "console") == 0 || - strcmp(ui_type, "phone") == 0 || - strcmp(ui_type, "handheld") == 0 || - strcmp(ui_type, "web") == 0 || - strcmp(ui_type, "bot") == 0) { + if (purple_strequal(ui_type, "pc") || + purple_strequal(ui_type, "console") || + purple_strequal(ui_type, "phone") || + purple_strequal(ui_type, "handheld") || + purple_strequal(ui_type, "web") || + purple_strequal(ui_type, "bot")) { type = ui_type; } } diff --git a/libpurple/protocols/jabber/jingle/content.c b/libpurple/protocols/jabber/jingle/content.c index f19d186cb4..da6ab89c2b 100644 --- a/libpurple/protocols/jabber/jingle/content.c +++ b/libpurple/protocols/jabber/jingle/content.c @@ -422,7 +422,7 @@ jingle_content_to_xml_internal(JingleContent *content, xmlnode *jingle, JingleAc xmlnode_set_attrib(node, "creator", creator); xmlnode_set_attrib(node, "name", name); xmlnode_set_attrib(node, "senders", senders); - if (strcmp("session", disposition)) + if (!purple_strequal("session", disposition)) xmlnode_set_attrib(node, "disposition", disposition); g_free(disposition); diff --git a/libpurple/protocols/jabber/jingle/iceudp.c b/libpurple/protocols/jabber/jingle/iceudp.c index c40c3e31cc..d1cae88db5 100644 --- a/libpurple/protocols/jabber/jingle/iceudp.c +++ b/libpurple/protocols/jabber/jingle/iceudp.c @@ -402,7 +402,7 @@ jingle_iceudp_to_xml_internal(JingleTransport *transport, xmlnode *content, Jing xmlnode_set_attrib(xmltransport, "protocol", candidate->protocol); if (candidate->reladdr != NULL && - (strcmp(candidate->ip, candidate->reladdr) || + (!purple_strequal(candidate->ip, candidate->reladdr) || (candidate->port != candidate->relport))) { gchar *relport = g_strdup_printf("%d", candidate->relport); diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c index 8a15e0cd6b..db6644d336 100644 --- a/libpurple/protocols/jabber/jingle/jingle.c +++ b/libpurple/protocols/jabber/jingle/jingle.c @@ -405,7 +405,7 @@ jingle_parse(JabberStream *js, const char *from, JabberIqType type, } if (!(session = jingle_session_find_by_sid(js, sid)) - && strcmp(action, "session-initiate")) { + && !purple_strequal(action, "session-initiate")) { purple_debug_error("jingle", "jabber_jingle_session_parse couldn't find session\n"); /* send iq error here */ return; diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c index 7d6d2b415d..52ee284f46 100644 --- a/libpurple/protocols/jabber/message.c +++ b/libpurple/protocols/jabber/message.c @@ -807,13 +807,13 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet) static const gchar * jabber_message_get_mimetype_from_ext(const gchar *ext) { - if (strcmp(ext, "png") == 0) { + if (purple_strequal(ext, "png")) { return "image/png"; - } else if (strcmp(ext, "gif") == 0) { + } else if (purple_strequal(ext, "gif")) { return "image/gif"; - } else if (strcmp(ext, "jpg") == 0) { + } else if (purple_strequal(ext, "jpg")) { return "image/jpeg"; - } else if (strcmp(ext, "tif") == 0) { + } else if (purple_strequal(ext, "tif")) { return "image/tif"; } else { return "image/x-icon"; /* or something... */ diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c index f19550cbd8..30bd0e242f 100644 --- a/libpurple/protocols/jabber/presence.c +++ b/libpurple/protocols/jabber/presence.c @@ -213,7 +213,7 @@ void jabber_presence_send(JabberStream *js, gboolean force) } #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \ - (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b))) + (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && !purple_strequal(a,b))) /* check if there are any differences to the <presence> and send them in that case */ if (force || allowBuzz != js->allowBuzz || js->old_state != state || CHANGED(js->old_msg, stripped) || js->old_priority != priority || diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c index f07eca08bd..b2bb464aa3 100644 --- a/libpurple/protocols/jabber/si.c +++ b/libpurple/protocols/jabber/si.c @@ -881,7 +881,7 @@ jabber_si_xfer_bytestreams_listen_cb(int sock, gpointer data) } /* Include the public IP (assuming that there is a port mapped somehow) */ - if (!has_public_ip && strcmp(public_ip, "0.0.0.0") != 0) { + if (!has_public_ip && !purple_strequal(public_ip, "0.0.0.0")) { streamhost_count++; streamhost = xmlnode_new_child(query, "streamhost"); xmlnode_set_attrib(streamhost, "jid", jid); @@ -1696,7 +1696,7 @@ void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type, size_t filesize = 0; if(!(profile = xmlnode_get_attrib(si, "profile")) || - strcmp(profile, NS_SI_FILE_TRANSFER)) + !purple_strequal(profile, NS_SI_FILE_TRANSFER)) return; if(!(stream_id = xmlnode_get_attrib(si, "id"))) diff --git a/libpurple/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c index 84c1687b6c..faf5a48909 100644 --- a/libpurple/protocols/jabber/xdata.c +++ b/libpurple/protocols/jabber/xdata.c @@ -64,7 +64,7 @@ static void jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestFi PurpleRequestField *field = flds->data; const char *id = purple_request_field_get_id(field); int handleindex; - if(strcmp(id, "libpurple:jabber:xdata:actions")) + if(!purple_strequal(id, "libpurple:jabber:xdata:actions")) continue; handleindex = purple_request_field_choice_get_value(field); actionhandle = g_strdup(g_list_nth_data(data->actions, handleindex)); @@ -230,7 +230,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis if(!type) type = "text-single"; - if(!var && strcmp(type, "fixed")) + if(!var && !purple_strequal(type, "fixed")) continue; if(!label) label = var; diff --git a/libpurple/protocols/novell/nmconn.c b/libpurple/protocols/novell/nmconn.c index 774d339f4e..fe01f52f48 100644 --- a/libpurple/protocols/novell/nmconn.c +++ b/libpurple/protocols/novell/nmconn.c @@ -30,6 +30,8 @@ #include <windows.h> #endif +#include "util.h" + #define NO_ESCAPE(ch) ((ch == 0x20) || (ch >= 0x30 && ch <= 0x39) || \ (ch >= 0x41 && ch <= 0x5a) || (ch >= 0x61 && ch <= 0x7a)) @@ -428,7 +430,7 @@ nm_send_request(NMConn *conn, char *cmd, NMField *fields, /* Write headers */ if (rc == NM_OK) { - if (strcmp("login", cmd) == 0) { + if (purple_strequal("login", cmd)) { bytes_to_send = g_snprintf(buffer, sizeof(buffer), "Host: %s:%d\r\n\r\n", conn->addr, conn->port); ret = nm_tcp_write(conn, buffer, bytes_to_send); @@ -524,7 +526,7 @@ nm_read_header(NMConn * conn) /* Finish reading header, in the future we might want to do more processing here */ /* TODO: handle more general redirects in the future */ - while ((rc == NM_OK) && (strcmp(buffer, "\r\n") != 0)) { + while ((rc == NM_OK) && (!purple_strequal(buffer, "\r\n"))) { rc = read_line(conn, buffer, sizeof(buffer)); } diff --git a/libpurple/protocols/novell/nmcontact.c b/libpurple/protocols/novell/nmcontact.c index 5a390ea35c..bdd691b4c3 100644 --- a/libpurple/protocols/novell/nmcontact.c +++ b/libpurple/protocols/novell/nmcontact.c @@ -23,6 +23,7 @@ #include "nmcontact.h" #include "nmfield.h" #include "nmuser.h" +#include "util.h" struct _NMContact { @@ -83,7 +84,7 @@ nm_create_contact_from_fields(NMField * fields) NMField *field; if ( fields == NULL || fields->tag == NULL || fields->ptr_value == 0 || - strcmp(fields->tag, NM_A_FA_CONTACT) ) + !purple_strequal(fields->tag, NM_A_FA_CONTACT) ) { return NULL; } diff --git a/libpurple/protocols/novell/nmrtf.c b/libpurple/protocols/novell/nmrtf.c index e0db15d420..36bc774581 100644 --- a/libpurple/protocols/novell/nmrtf.c +++ b/libpurple/protocols/novell/nmrtf.c @@ -30,6 +30,7 @@ #include <string.h> #include "nmrtf.h" #include "debug.h" +#include "util.h" /* Internal RTF parser error codes */ #define NMRTF_OK 0 /* Everything's fine! */ @@ -707,7 +708,7 @@ rtf_dispatch_control(NMRtfContext *ctx, char *keyword, int param, gboolean param int idx; for (idx = 0; idx < table_size; idx++) { - if (strcmp(keyword, rtf_symbols[idx].keyword) == 0) + if (purple_strequal(keyword, rtf_symbols[idx].keyword)) break; } diff --git a/libpurple/protocols/novell/nmuser.c b/libpurple/protocols/novell/nmuser.c index ed3dcea081..51e4edfc7e 100644 --- a/libpurple/protocols/novell/nmuser.c +++ b/libpurple/protocols/novell/nmuser.c @@ -1451,7 +1451,7 @@ nm_find_folder(NMUser * user, const char *name) for (i = 0; i < num_folders; i++) { temp = nm_folder_get_subfolder(user->root_folder, i); tname = nm_folder_get_name(temp); - if (tname && (strcmp(tname, name) == 0)) { + if (tname && purple_strequal(tname, name)) { folder = temp; break; } @@ -1570,7 +1570,7 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) cmd = nm_request_get_cmd(request); if (ret_code == NM_OK && cmd != NULL) { - if (strcmp("login", cmd) == 0) { + if (purple_strequal("login", cmd)) { user->user_record = nm_create_user_record_from_fields(fields); @@ -1580,11 +1580,11 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) nm_create_contact_list(user); done = _create_privacy_list(user, request); - } else if (strcmp("setstatus", cmd) == 0) { + } else if (purple_strequal("setstatus", cmd)) { /* Nothing to do */ - } else if (strcmp("createconf", cmd) == 0) { + } else if (purple_strequal("createconf", cmd)) { conf = (NMConference *) nm_request_get_data(request); @@ -1601,12 +1601,12 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) nm_conference_list_add(user, conf); nm_release_conference(conf); - } else if (strcmp("leaveconf", cmd) == 0) { + } else if (purple_strequal("leaveconf", cmd)) { conf = (NMConference *) nm_request_get_data(request); nm_conference_list_remove(user, conf); - } else if (strcmp("joinconf", cmd) == 0) { + } else if (purple_strequal("joinconf", cmd)) { GSList *list = NULL, *node; conf = nm_request_get_data(request); @@ -1653,7 +1653,7 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) } } - } else if (strcmp("getdetails", cmd) == 0) { + } else if (purple_strequal("getdetails", cmd)) { locate = nm_locate_field(NM_A_FA_RESULTS, fields); while (locate && locate->ptr_value != 0) { @@ -1684,11 +1684,11 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) locate = nm_locate_field(NM_A_FA_RESULTS, locate+1); } - } else if (strcmp("createfolder", cmd) == 0) { + } else if (purple_strequal("createfolder", cmd)) { _update_contact_list(user, fields); - } else if (strcmp("createcontact", cmd) == 0) { + } else if (purple_strequal("createcontact", cmd)) { _update_contact_list(user, fields); @@ -1712,15 +1712,15 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) } - } else if (strcmp("deletecontact", cmd) == 0) { + } else if (purple_strequal("deletecontact", cmd)) { _update_contact_list(user, fields); - } else if (strcmp("movecontact", cmd) == 0) { + } else if (purple_strequal("movecontact", cmd)) { _update_contact_list(user, fields); - } else if (strcmp("getstatus", cmd) == 0) { + } else if (purple_strequal("getstatus", cmd)) { locate = nm_locate_field(NM_A_SZ_STATUS, fields); if (locate) { @@ -1729,11 +1729,11 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) atoi((char *) locate->ptr_value), NULL); } - } else if (strcmp("updateitem", cmd) == 0) { + } else if (purple_strequal("updateitem", cmd)) { /* Nothing extra to do here */ - } else if (strcmp("createblock", cmd) == 0) { + } else if (purple_strequal("createblock", cmd)) { if ((locate = nm_locate_field(NM_A_BLOCKING_DENY_LIST, fields))) { if (locate->ptr_value) { user->deny_list = g_slist_append(user->deny_list, g_strdup((char *)locate->ptr_value)); @@ -1743,7 +1743,7 @@ nm_call_handler(NMUser * user, NMRequest * request, NMField * fields) user->allow_list = g_slist_append(user->allow_list, g_strdup((char *)locate->ptr_value)); } } - } else if (strcmp("updateblocks", cmd) == 0) { + } else if (purple_strequal("updateblocks", cmd)) { /* nothing to do here */ } else { @@ -1971,7 +1971,7 @@ _update_contact_list(NMUser * user, NMField * fields) return; /* Is it wrapped in a RESULTS array? */ - if (strcmp(fields->tag, NM_A_FA_RESULTS) == 0) { + if (purple_strequal(fields->tag, NM_A_FA_RESULTS)) { list = (NMField *) fields->ptr_value; } else { list = fields; diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c index c0acc5ea70..d1f3279b13 100644 --- a/libpurple/protocols/novell/novell.c +++ b/libpurple/protocols/novell/novell.c @@ -293,7 +293,7 @@ _get_details_resp_setup_buddy(NMUser * user, NMERR_T ret_code, nm_user_record_get_display_id(user_record)); alias = purple_buddy_get_alias(buddy); - if (alias == NULL || *alias == '\0' || (strcmp(alias, purple_buddy_get_name(buddy)) == 0)) { + if (alias == NULL || *alias == '\0' || purple_strequal(alias, purple_buddy_get_name(buddy))) { purple_blist_alias_buddy(buddy, nm_user_record_get_full_name(user_record)); @@ -359,7 +359,7 @@ _create_contact_resp_cb(NMUser * user, NMERR_T ret_code, if (display_id == NULL) display_id = nm_contact_get_dn(new_contact); - if (alias && strcmp(alias, display_id)) { + if (alias && !purple_strequal(alias, display_id)) { /* The user requested an alias, tell the server about it. */ rc = nm_send_rename_contact(user, new_contact, alias, @@ -1252,7 +1252,7 @@ _remove_purple_buddies(NMUser *user) continue; buddy = (PurpleBuddy *) bnode; if (purple_buddy_get_account(buddy) == user->client_data) { - if (strcmp(gname, NM_ROOT_FOLDER_NAME) == 0) + if (purple_strequal(gname, NM_ROOT_FOLDER_NAME)) gname = ""; folder = nm_find_folder(user, gname); if (folder == NULL || @@ -1480,19 +1480,19 @@ _map_property_tag(const char *tag) { if (tag == NULL) return NULL; - if (strcmp(tag, "telephoneNumber") == 0) + if (purple_strequal(tag, "telephoneNumber")) return _("Telephone Number"); - else if (strcmp(tag, "L") == 0) + else if (purple_strequal(tag, "L")) return _("Location"); - else if (strcmp(tag, "OU") == 0) + else if (purple_strequal(tag, "OU")) return _("Department"); - else if (strcmp(tag, "personalTitle") == 0) + else if (purple_strequal(tag, "personalTitle")) return _("Personal Title"); - else if (strcmp(tag, "Title") == 0) + else if (purple_strequal(tag, "Title")) return _("Job Title"); - else if (strcmp(tag, "mailstop") == 0) + else if (purple_strequal(tag, "mailstop")) return _("Mailstop"); - else if (strcmp(tag, "Internet EMail Address") == 0) + else if (purple_strequal(tag, "Internet EMail Address")) return _("Email Address"); else return tag; @@ -2564,14 +2564,14 @@ novell_add_buddy(PurpleConnection * gc, PurpleBuddy *buddy, PurpleGroup * group) */ alias = purple_buddy_get_alias(buddy); bname = purple_buddy_get_name(buddy); - if (alias && strcmp(alias, bname)) + if (alias && !purple_strequal(alias, bname)) nm_contact_set_display_name(contact, alias); purple_blist_remove_buddy(buddy); buddy = NULL; gname = purple_group_get_name(group); - if (strcmp(gname, NM_ROOT_FOLDER_NAME) == 0) { + if (purple_strequal(gname, NM_ROOT_FOLDER_NAME)) { gname = ""; } @@ -2608,7 +2608,7 @@ novell_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group user = (NMUser *) gc->proto_data; if (user && (dn = nm_lookup_dn(user, purple_buddy_get_name(buddy)))) { gname = purple_group_get_name(group); - if (strcmp(gname, NM_ROOT_FOLDER_NAME) == 0) { + if (purple_strequal(gname, NM_ROOT_FOLDER_NAME)) { gname = ""; } folder = nm_find_folder(user, gname); @@ -2690,7 +2690,7 @@ novell_alias_buddy(PurpleConnection * gc, const char *name, const char *alias) buddy = purple_find_buddy_in_group(user->client_data, name, group); balias = buddy ? purple_buddy_get_local_buddy_alias(buddy) : NULL; - if (balias && strcmp(balias, alias)) + if (balias && !purple_strequal(balias, alias)) purple_blist_alias_buddy(buddy, alias); } @@ -2725,7 +2725,7 @@ novell_group_buddy(PurpleConnection * gc, if (user && (dn = nm_lookup_dn(user, name))) { /* Find the old folder */ - if (strcmp(old_group_name, NM_ROOT_FOLDER_NAME) == 0) { + if (purple_strequal(old_group_name, NM_ROOT_FOLDER_NAME)) { old_folder = nm_get_root_folder(user); if (nm_folder_find_contact(old_folder, dn) == NULL) old_folder = nm_find_folder(user, old_group_name); @@ -2738,7 +2738,7 @@ novell_group_buddy(PurpleConnection * gc, /* Find the new folder */ new_folder = nm_find_folder(user, new_group_name); if (new_folder == NULL) { - if (strcmp(new_group_name, NM_ROOT_FOLDER_NAME) == 0) + if (purple_strequal(new_group_name, NM_ROOT_FOLDER_NAME)) new_folder = nm_get_root_folder(user); } @@ -2791,7 +2791,7 @@ novell_rename_group(PurpleConnection * gc, const char *old_name, return; } - if (strcmp(old_name, NM_ROOT_FOLDER_NAME) == 0) { + if (purple_strequal(old_name, NM_ROOT_FOLDER_NAME)) { /* Can't rename the root folder ... need to revisit this */ return; } diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c index 6ebbfec75b..714e90234f 100644 --- a/libpurple/protocols/oscar/clientlogin.c +++ b/libpurple/protocols/oscar/clientlogin.c @@ -94,7 +94,7 @@ static gchar *generate_error_message(xmlnode *resp, const char *url) /* We can get 200 OK here if the server omitted something we think it shouldn't have (see #12783). * No point in showing the "Ok" string to the user. */ - if ((status_code = xmlnode_get_data_unescaped(status_code_node)) && strcmp(status_code, "200") == 0) { + if ((status_code = xmlnode_get_data_unescaped(status_code_node)) && purple_strequal(status_code, "200")) { have_error_code = FALSE; } } @@ -258,12 +258,12 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g return FALSE; } - if (strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0) { + if (!purple_strequal(encryption_type, OSCAR_NO_ENCRYPTION)) { tls_node = xmlnode_get_child(data_node, "tlsCertName"); if (tls_node != NULL) { *tls_certname = xmlnode_get_data_unescaped(tls_node); } else { - if (strcmp(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION) == 0) { + if (purple_strequal(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION)) { purple_debug_warning("oscar", "We haven't received a tlsCertName to use. We will not do SSL to BOS.\n"); } else { purple_debug_error("oscar", "startOSCARSession was missing tlsCertName: %s\n", response); @@ -365,7 +365,7 @@ static void send_start_oscar_session(OscarData *od, const char *token, const cha od->icq ? ICQ_DEFAULT_DIST_ID : AIM_DEFAULT_DIST_ID), get_client_key(od), hosttime, - strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0 ? 1 : 0); + (!purple_strequal(encryption_type, OSCAR_NO_ENCRYPTION)) ? 1 : 0); signature = generate_signature("GET", get_start_oscar_session_url(od), query_string, session_key); url = g_strdup_printf("%s?%s&sig_sha256=%s", get_start_oscar_session_url(od), @@ -453,7 +453,7 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r } /* Make sure the status code was 200 */ - if (strcmp(tmp, "200") != 0) + if (!purple_strequal(tmp, "200")) { int status_code, status_detail_code = 0; diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index 06d8425d95..6c11b01451 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -580,7 +580,7 @@ idle_reporting_pref_cb(const char *name, PurplePrefType type, gc = data; od = purple_connection_get_protocol_data(gc); - report_idle = strcmp((const char *)value, "none") != 0; + report_idle = !purple_strequal((const char *)value, "none"); presence = aim_ssi_getpresence(od->ssi.local); if (report_idle) @@ -760,14 +760,14 @@ oscar_login(PurpleAccount *account) login_type = purple_account_get_string(account, "login_type", OSCAR_DEFAULT_LOGIN); encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION); - if (!purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) { + if (!purple_ssl_is_supported() && purple_strequal(encryption_type, OSCAR_REQUIRE_ENCRYPTION)) { purple_connection_error_reason( gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("You required encryption in your account settings, but encryption is not supported by your system.")); return; } - od->use_ssl = purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0; + od->use_ssl = purple_ssl_is_supported() && !purple_strequal(encryption_type, OSCAR_NO_ENCRYPTION); /* Connect to core Purple signals */ purple_prefs_connect_callback(gc, "/purple/away/idle_reporting", idle_reporting_pref_cb, gc); @@ -1554,7 +1554,7 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame if (b != NULL) saved_b16 = purple_buddy_icons_get_checksum_for_user(b); - if (!b16 || !saved_b16 || strcmp(b16, saved_b16)) { + if (!b16 || !saved_b16 || !purple_strequal(b16, saved_b16)) { /* Invalidate the old icon for this user */ purple_buddy_icons_set_for_user(account, info->bn, NULL, 0, NULL); @@ -2939,7 +2939,7 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr, serv_set_info(gc, purple_account_get_user_info(account)); username = purple_account_get_username(account); - if (!od->icq && strcmp(username, purple_connection_get_display_name(gc)) != 0) { + if (!od->icq && !purple_strequal(username, purple_connection_get_display_name(gc))) { /* * Format the username for AIM accounts if it's different * than what's currently set. @@ -3782,7 +3782,7 @@ void oscar_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g void oscar_move_buddy(PurpleConnection *gc, const char *name, const char *old_group, const char *new_group) { OscarData *od = purple_connection_get_protocol_data(gc); - if (od->ssi.received_data && strcmp(old_group, new_group)) { + if (od->ssi.received_data && !purple_strequal(old_group, new_group)) { purple_debug_info("oscar", "ssi: moving buddy %s from group %s to group %s\n", name, old_group, new_group); aim_ssi_movebuddy(od, old_group, new_group, name); @@ -4018,7 +4018,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame * gboolean report_idle; idle_reporting_pref = purple_prefs_get_string("/purple/away/idle_reporting"); - report_idle = strcmp(idle_reporting_pref, "none") != 0; + report_idle = !purple_strequal(idle_reporting_pref, "none"); if (report_idle) aim_ssi_setpresence(od, tmp | AIM_SSI_PRESENCE_FLAG_SHOWIDLE); diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c index 15db99d0cc..a791425055 100644 --- a/libpurple/protocols/oscar/peer.c +++ b/libpurple/protocols/oscar/peer.c @@ -810,7 +810,7 @@ peer_connection_trynext(PeerConnection *conn) peer_connection_verified_established_cb, conn); if ((conn->verifiedip == NULL) || - strcmp(conn->verifiedip, conn->clientip)) + !purple_strequal(conn->verifiedip, conn->clientip)) { conn->client_connect_data = purple_proxy_connect(NULL, account, conn->clientip, conn->port, diff --git a/libpurple/protocols/oscar/rxhandlers.c b/libpurple/protocols/oscar/rxhandlers.c index 265648cad9..f7a28f1823 100644 --- a/libpurple/protocols/oscar/rxhandlers.c +++ b/libpurple/protocols/oscar/rxhandlers.c @@ -38,7 +38,7 @@ aim_module_t *aim__findmodule(OscarData *od, const char *name) aim_module_t *cur; for (cur = (aim_module_t *)od->modlistv; cur; cur = cur->next) { - if (strcmp(name, cur->name) == 0) + if (purple_strequal(name, cur->name)) return cur; } diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c index 9d47ad3156..b7cd53b140 100644 --- a/libpurple/protocols/sametime/sametime.c +++ b/libpurple/protocols/sametime/sametime.c @@ -692,7 +692,7 @@ static void blist_export(PurpleConnection *gc, struct mwSametimeList *stlist) { /* if the group has an owner and we're not it, skip it */ owner = purple_blist_node_get_string(gn, GROUP_KEY_OWNER); - if(owner && strcmp(owner, purple_account_get_username(acct))) + if(owner && !purple_strequal(owner, purple_account_get_username(acct))) continue; /* the group's actual name may be different from the purple group's @@ -1209,7 +1209,7 @@ static void blist_sync(PurpleConnection *gc, struct mwSametimeList *stlist) { gboolean del = TRUE; owner = purple_blist_node_get_string(gn, GROUP_KEY_OWNER); - if(owner && strcmp(owner, acct_n)) { + if(owner && !purple_strequal(owner, acct_n)) { /* it's a specialty group belonging to another account with some of our members in it, so don't fully delete it */ del = FALSE; @@ -1433,7 +1433,7 @@ static void services_starting(struct mwPurplePluginData *pd) { /* if the group is ownerless, or has an owner and we're not it, skip it */ owner = purple_blist_node_get_string(l, GROUP_KEY_OWNER); - if(!owner || strcmp(owner, purple_account_get_username(acct))) + if(!owner || !purple_strequal(owner, purple_account_get_username(acct))) continue; gt = purple_blist_node_get_int(l, GROUP_KEY_TYPE); @@ -1473,7 +1473,7 @@ static void session_loginRedirect(struct mwSession *session, MW_PLUGIN_DEFAULT_HOST); if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || - !host || (! strcmp(current_host, host)) || + !host || purple_strequal(current_host, host) || (purple_proxy_connect(gc, account, host, port, connect_cb, pd) == NULL)) { /* if we're configured to force logins, or if we're being @@ -3807,16 +3807,16 @@ static char *im_mime_img_content_type(PurpleStoredImage *img) { if(! ct) { ct = "image"; - } else if(! strcmp(".png", ct)) { + } else if(purple_strequal(".png", ct)) { ct = "image/png"; - } else if(! strcmp(".jpg", ct)) { + } else if(purple_strequal(".jpg", ct)) { ct = "image/jpeg"; - } else if(! strcmp(".jpeg", ct)) { + } else if(purple_strequal(".jpeg", ct)) { ct = "image/jpeg"; - } else if(! strcmp(".gif", ct)) { + } else if(purple_strequal(".gif", ct)) { ct = "image/gif"; } else { @@ -4201,13 +4201,13 @@ static void mw_prpl_set_status(PurpleAccount *acct, PurpleStatus *status) { mwUserStatus_clone(&stat, mwSession_getUserStatus(session)); /* determine the state */ - if(! strcmp(state, MW_STATE_ACTIVE)) { + if(purple_strequal(state, MW_STATE_ACTIVE)) { stat.status = mwStatus_ACTIVE; - } else if(! strcmp(state, MW_STATE_AWAY)) { + } else if(purple_strequal(state, MW_STATE_AWAY)) { stat.status = mwStatus_AWAY; - } else if(! strcmp(state, MW_STATE_BUSY)) { + } else if(purple_strequal(state, MW_STATE_BUSY)) { stat.status = mwStatus_BUSY; } @@ -4374,7 +4374,7 @@ static void add_buddy_resolved(struct mwServiceResolve *srvc, struct mwResolveMatch *match = res->matches->data; /* only one? that might be the right one! */ - if(strcmp(res->name, match->id)) { + if(!purple_strequal(res->name, match->id)) { /* uh oh, the single result isn't identical to the search term, better safe then sorry, so let's make sure it's who the user meant to add */ @@ -4661,7 +4661,7 @@ static struct mwConference *conf_find(struct mwServiceConference *srvc, ll = mwServiceConference_getConferences(srvc); for(l = ll; l; l = l->next) { struct mwConference *c = l->data; - if(! strcmp(name, mwConference_getName(c))) { + if(purple_strequal(name, mwConference_getName(c))) { conf = c; break; } diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c index f46d4b8aeb..b76f848bcf 100644 --- a/libpurple/protocols/silc/chat.c +++ b/libpurple/protocols/silc/chat.c @@ -372,7 +372,7 @@ silcpurple_chat_chauth_ok(SilcPurpleChauth sgc, PurpleRequestFields *fields) set = 0; else if (val && !curpass) set = 1; - else if (val && curpass && strcmp(val, curpass)) + else if (val && curpass && !purple_strequal(val, curpass)) set = 1; else set = -1; diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c index d08eb8c6e0..09f0a65430 100644 --- a/libpurple/protocols/silc/ops.c +++ b/libpurple/protocols/silc/ops.c @@ -1446,7 +1446,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn, if (!convo) continue; oldnick = purple_conv_chat_get_nick(PURPLE_CONV_CHAT(convo)); - if (strcmp(oldnick, purple_normalize(purple_conversation_get_account(convo), newnick))) { + if (!purple_strequal(oldnick, purple_normalize(purple_conversation_get_account(convo), newnick))) { purple_conv_chat_rename_user(PURPLE_CONV_CHAT(convo), oldnick, newnick); purple_conv_chat_set_nick(PURPLE_CONV_CHAT(convo), newnick); diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c index 7e8d0f2501..bbd892a67a 100644 --- a/libpurple/protocols/silc/silc.c +++ b/libpurple/protocols/silc/silc.c @@ -1146,7 +1146,7 @@ silcpurple_create_keypair_cb(PurpleConnection *gc, PurpleRequestFields *fields) else pass2 = ""; - if (strcmp(pass1, pass2)) { + if (!purple_strequal(pass1, pass2)) { purple_notify_error( gc, _("Create New SILC Key Pair"), _("Passphrases do not match"), NULL); return; diff --git a/libpurple/protocols/silc10/chat.c b/libpurple/protocols/silc10/chat.c index cc6f509604..59a9ed8fbd 100644 --- a/libpurple/protocols/silc10/chat.c +++ b/libpurple/protocols/silc10/chat.c @@ -350,7 +350,7 @@ silcpurple_chat_chauth_ok(SilcPurpleChauth sgc, PurpleRequestFields *fields) set = 0; else if (val && !curpass) set = 1; - else if (val && curpass && strcmp(val, curpass)) + else if (val && curpass && !purple_strequal(val, curpass)) set = 1; else set = -1; diff --git a/libpurple/protocols/silc10/ops.c b/libpurple/protocols/silc10/ops.c index 5ac6085905..3a2578c868 100644 --- a/libpurple/protocols/silc10/ops.c +++ b/libpurple/protocols/silc10/ops.c @@ -94,7 +94,7 @@ silcpurple_mime_message(SilcClient client, SilcClientConnection conn, SilcDList parts = silc_mime_get_multiparts(mime, &mtype); /* Only "mixed" type supported */ - if (strcmp(mtype, "mixed")) + if (!purple_strequal(mtype, "mixed")) goto out; silc_dlist_start(parts); @@ -1426,7 +1426,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn, if (!convo) continue; oldnick = purple_conv_chat_get_nick(PURPLE_CONV_CHAT(convo)); - if (strcmp(oldnick, purple_normalize(purple_conversation_get_account(convo), local_entry->nickname))) { + if (!purple_strequal(oldnick, purple_normalize(purple_conversation_get_account(convo), local_entry->nickname))) { purple_conv_chat_rename_user(PURPLE_CONV_CHAT(convo), oldnick, local_entry->nickname); purple_conv_chat_set_nick(PURPLE_CONV_CHAT(convo), local_entry->nickname); diff --git a/libpurple/protocols/silc10/silc.c b/libpurple/protocols/silc10/silc.c index 340e28433b..43e7589a37 100644 --- a/libpurple/protocols/silc10/silc.c +++ b/libpurple/protocols/silc10/silc.c @@ -844,7 +844,7 @@ silcpurple_create_keypair_cb(PurpleConnection *gc, PurpleRequestFields *fields) else pass2 = ""; - if (strcmp(pass1, pass2)) { + if (!purple_strequal(pass1, pass2)) { purple_notify_error( gc, _("Create New SILC Key Pair"), _("Passphrases do not match"), NULL); return; diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c index 070dcdfeb3..2ee164656e 100644 --- a/libpurple/protocols/simple/simple.c +++ b/libpurple/protocols/simple/simple.c @@ -656,7 +656,7 @@ static void send_sip_request(PurpleConnection *gc, const gchar *method, auth = g_strdup_printf("Authorization: %s\r\n", buf); g_free(buf); purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth); - } else if(sip->proxy.type && strcmp(method, "REGISTER")) { + } else if(sip->proxy.type && !purple_strequal(method, "REGISTER")) { buf = auth_header(sip, &sip->proxy, method, url); auth = g_strdup_printf("Proxy-Authorization: %s\r\n", buf); g_free(buf); diff --git a/libpurple/protocols/zephyr/ZAsyncLocate.c b/libpurple/protocols/zephyr/ZAsyncLocate.c index 65d451a152..a8b6d2addb 100644 --- a/libpurple/protocols/zephyr/ZAsyncLocate.c +++ b/libpurple/protocols/zephyr/ZAsyncLocate.c @@ -70,7 +70,7 @@ Code_t ZParseLocations(notice,zald,nlocs,user) /* non-matching protocol version numbers means the server is probably an older version--must punt */ - if (zald && strcmp(notice->z_version, zald->version)) + if (zald && !purple_strequal(notice->z_version, zald->version)) return(ZERR_VERS); if (notice->z_kind == SERVNAK) diff --git a/libpurple/protocols/zephyr/ZLocations.c b/libpurple/protocols/zephyr/ZLocations.c index 21e7f7bed3..66703975d6 100644 --- a/libpurple/protocols/zephyr/ZLocations.c +++ b/libpurple/protocols/zephyr/ZLocations.c @@ -150,8 +150,8 @@ Code_t Z_SendLocation(class, opcode, auth, format) return (ZERR_INTERNAL); } - if (strcmp(retnotice.z_message, ZSRVACK_SENT) && - strcmp(retnotice.z_message, ZSRVACK_NOTSENT)) { + if (!purple_strequal(retnotice.z_message, ZSRVACK_SENT) && + !purple_strequal(retnotice.z_message, ZSRVACK_NOTSENT)) { ZFreeNotice(&retnotice); return (ZERR_INTERNAL); } diff --git a/libpurple/protocols/zephyr/ZRetSubs.c b/libpurple/protocols/zephyr/ZRetSubs.c index 94a3ab462e..70c69c357f 100644 --- a/libpurple/protocols/zephyr/ZRetSubs.c +++ b/libpurple/protocols/zephyr/ZRetSubs.c @@ -106,7 +106,7 @@ static Code_t Z_RetSubs(notice, nsubs, auth_routine) } /* non-matching protocol version numbers means the server is probably an older version--must punt */ - if (strcmp(notice->z_version,retnotice.z_version)) { + if (!purple_strequal(notice->z_version,retnotice.z_version)) { ZFreeNotice(&retnotice); return(ZERR_VERS); } diff --git a/libpurple/tests/test_cipher.c b/libpurple/tests/test_cipher.c index adb176dd0b..45249319e1 100644 --- a/libpurple/tests/test_cipher.c +++ b/libpurple/tests/test_cipher.c @@ -27,7 +27,7 @@ \ fail_unless(ret == TRUE, NULL); \ \ - fail_unless(strcmp((digest), cdigest) == 0, NULL); \ + fail_unless(purple_strequal((digest), cdigest), NULL); \ \ purple_cipher_context_destroy(context); \ } @@ -90,7 +90,7 @@ END_TEST \ fail_unless(ret == TRUE, NULL); \ \ - fail_unless(strcmp((digest), cdigest) == 0, NULL); \ + fail_unless(purple_strequal((digest), cdigest), NULL); \ \ purple_cipher_context_destroy(context); \ } @@ -164,7 +164,7 @@ END_TEST \ fail_unless(ret == TRUE, NULL); \ \ - fail_unless(strcmp((digest), cdigest) == 0, NULL); \ + fail_unless(purple_strequal((digest), cdigest), NULL); \ \ purple_cipher_context_destroy(context); \ } @@ -225,7 +225,7 @@ END_TEST \ fail_unless(ret == TRUE, NULL); \ \ - fail_unless(strcmp((digest), cdigest) == 0, NULL); \ + fail_unless(purple_strequal((digest), cdigest), NULL); \ \ purple_cipher_context_destroy(context); \ } @@ -495,7 +495,7 @@ END_TEST NULL); \ \ fail_unless(ret == TRUE, NULL); \ - fail_unless(strcmp((digest), cdigest) == 0, NULL); \ + fail_unless(purple_strequal((digest), cdigest), NULL); \ \ purple_cipher_context_destroy(context); \ } diff --git a/libpurple/tests/tests.h b/libpurple/tests/tests.h index 475e0355ce..815b157ba7 100644 --- a/libpurple/tests/tests.h +++ b/libpurple/tests/tests.h @@ -24,7 +24,7 @@ Suite * xmlnode_suite(void); #define assert_string_equal(expected, actual) { \ const gchar *a = actual; \ - fail_unless(strcmp(expected, a) == 0, "Expected '%s' but got '%s'", expected, a); \ + fail_unless(purple_strequal(expected, a), "Expected '%s' but got '%s'", expected, a); \ } #define assert_string_equal_free(expected, actual) { \ diff --git a/libpurple/win32/libc_interface.c b/libpurple/win32/libc_interface.c index 493dfca53f..96bea53568 100644 --- a/libpurple/win32/libc_interface.c +++ b/libpurple/win32/libc_interface.c @@ -933,7 +933,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) for (i = 0; win32_tzmap[i].wstd != NULL; i++) { - if (strcmp(tzname, win32_tzmap[i].wstd) == 0) + if (purple_strequal(tzname, win32_tzmap[i].wstd)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n", @@ -949,7 +949,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) return win32_tzmap[i].ustd; } - if (strcmp(tzname, win32_tzmap[i].wdst) == 0) + if (purple_strequal(tzname, win32_tzmap[i].wdst)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n", @@ -1023,7 +1023,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) RegCloseKey(key); break; } - if (strcmp(tzname, zonename) == 0) + if (purple_strequal(tzname, zonename)) { /* Matched zone */ g_strlcpy(localtzname, keyname, sizeof(localtzname)); @@ -1038,7 +1038,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) RegCloseKey(key); break; } - if (strcmp(tzname, zonename) == 0) + if (purple_strequal(tzname, zonename)) { /* Matched DST zone */ g_strlcpy(localtzname, keyname, sizeof(localtzname)); @@ -1056,7 +1056,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) /* Found a localized name, so scan for that one too */ for (i = 0; win32_tzmap[i].wstd != NULL; i++) { - if (strcmp(localtzname, win32_tzmap[i].wstd) == 0) + if (purple_strequal(localtzname, win32_tzmap[i].wstd)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n", @@ -1070,7 +1070,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) return win32_tzmap[i].ustd; } - if (strcmp(localtzname, win32_tzmap[i].wdst) == 0) + if (purple_strequal(localtzname, win32_tzmap[i].wdst)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n", diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c index 5f1ae87766..0681734ceb 100644 --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -823,7 +823,7 @@ add_protocol_options(AccountPrefsDialog *dialog) { case PURPLE_PREF_BOOLEAN: if (account == NULL || - strcmp(purple_account_get_protocol_id(account), + !purple_strequal(purple_account_get_protocol_id(account), dialog->protocol_id)) { bool_value = purple_account_option_get_default_bool(option); @@ -848,7 +848,7 @@ add_protocol_options(AccountPrefsDialog *dialog) case PURPLE_PREF_INT: if (account == NULL || - strcmp(purple_account_get_protocol_id(account), + !purple_strequal(purple_account_get_protocol_id(account), dialog->protocol_id)) { int_value = purple_account_option_get_default_int(option); @@ -873,7 +873,7 @@ add_protocol_options(AccountPrefsDialog *dialog) case PURPLE_PREF_STRING: if (account == NULL || - strcmp(purple_account_get_protocol_id(account), + !purple_strequal(purple_account_get_protocol_id(account), dialog->protocol_id)) { str_value = purple_account_option_get_default_string(option); @@ -909,7 +909,7 @@ add_protocol_options(AccountPrefsDialog *dialog) idx = 0; if (account == NULL || - strcmp(purple_account_get_protocol_id(account), + !purple_strequal(purple_account_get_protocol_id(account), dialog->protocol_id)) { str_value = purple_account_option_get_default_list_value(option); diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 67447a85db..125788e920 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -1115,8 +1115,8 @@ static void chat_select_account_cb(GObject *w, PurpleAccount *account, PidginChatData *data) { - if (strcmp(purple_account_get_protocol_id(data->rq_data.account), - purple_account_get_protocol_id(account)) == 0) + if (purple_strequal(purple_account_get_protocol_id(data->rq_data.account), + purple_account_get_protocol_id(account))) { data->rq_data.account = account; } @@ -3777,7 +3777,7 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full) * this alias, so there's no point in showing it in the tooltip. */ if (full && c && b->alias != NULL && b->alias[0] != '\0' && (c->alias != NULL && c->alias[0] != '\0') && - strcmp(c->alias, b->alias) != 0) + !purple_strequal(c->alias, b->alias)) { tmp = g_markup_escape_text(b->alias, -1); purple_notify_user_info_add_pair(user_info, _("Buddy Alias"), tmp); @@ -5379,7 +5379,7 @@ update_account_error_state(PurpleAccount *account, /* else, new and old are both non-NULL */ - descriptions_differ = strcmp(old->description, new->description); + descriptions_differ = !purple_strequal(old->description, new->description); desc = new->description; switch (new->type) { @@ -7652,7 +7652,7 @@ void pidgin_blist_sort_method_set(const char *id){ if(!id) id = "none"; - while (l && strcmp(((struct pidgin_blist_sort_method*)l->data)->id, id)) + while (l && !purple_strequal(((struct pidgin_blist_sort_method*)l->data)->id, id)) l = l->next; if (l) { diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index 191d331de7..f84d14caa7 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -472,7 +472,7 @@ check_for_and_do_command(PurpleConversation *conv) cmdline = cmd + strlen(prefix); - if (strcmp(cmdline, "xyzzy") == 0) { + if (purple_strequal(cmdline, "xyzzy")) { purple_conversation_write(conv, "", "Nothing happens", PURPLE_MESSAGE_NO_LOG, time(NULL)); g_free(cmd); @@ -788,7 +788,7 @@ invite_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, else return; - if (strcmp(convprotocol, purple_account_get_protocol_id(buddy->account))) + if (!purple_strequal(convprotocol, purple_account_get_protocol_id(buddy->account))) { purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, _("That buddy is not on the same protocol as this " @@ -815,7 +815,7 @@ invite_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, _("You are not currently signed on with an account that " "can invite that buddy."), NULL); } - else if (strcmp(convprotocol, purple_account_get_protocol_id(account))) + else if (!purple_strequal(convprotocol, purple_account_get_protocol_id(account))) { purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, _("That buddy is not on the same protocol as this " @@ -3858,7 +3858,7 @@ compare_buddy_presence(PurplePresence *p1, PurplePresence *p2) PurpleBuddy *b1 = purple_presence_get_buddy(p1); PurpleBuddy *b2 = purple_presence_get_buddy(p2); if (purple_buddy_get_account(b1) == purple_buddy_get_account(b2) && - strcmp(purple_buddy_get_name(b1), purple_buddy_get_name(b2)) == 0) + purple_strequal(purple_buddy_get_name(b1), purple_buddy_get_name(b2))) return FALSE; return TRUE; } @@ -4234,7 +4234,7 @@ tab_complete(PurpleConversation *conv) CHAT_USERS_ALIAS_COLUMN, &alias, -1); - if (name && alias && strcmp(name, alias)) + if (name && alias && !purple_strequal(name, alias)) tab_complete_process_item(&most_matched, entered, entered_bytes, &partial, nick_partial, &matches, alias); g_free(name); @@ -4420,7 +4420,7 @@ update_chat_alias(PurpleBuddy *buddy, PurpleConversation *conv, PurpleConnection char *alias_key = NULL; PurpleBuddy *buddy2; - if (strcmp(chat->nick, purple_normalize(conv->account, name))) { + if (!purple_strequal(chat->nick, purple_normalize(conv->account, name))) { /* This user is not me, so look into updating the alias. */ if ((buddy2 = purple_find_buddy(conv->account, name)) != NULL) { @@ -5141,8 +5141,8 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, */ if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_invite) && - strcmp(purple_account_get_protocol_id(convaccount), - purple_account_get_protocol_id(buddyaccount)) == 0) { + purple_strequal(purple_account_get_protocol_id(convaccount), + purple_account_get_protocol_id(buddyaccount))) { purple_conv_chat_invite_user(PURPLE_CONV_CHAT(conv), buddyname, NULL, TRUE); } else { /* @@ -5196,7 +5196,7 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, */ if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_invite) && - strcmp(purple_account_get_protocol_id(convaccount), protocol) == 0) { + purple_strequal(purple_account_get_protocol_id(convaccount), protocol)) { purple_conv_chat_invite_user(PURPLE_CONV_CHAT(conv), username, NULL, TRUE); } else { c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username); @@ -5482,11 +5482,11 @@ received_im_msg_cb(PurpleAccount *account, char *sender, char *message, guint timer; /* create hidden conv if hide_new pref is always */ - if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0) + if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")) hide = TRUE; /* create hidden conv if hide_new pref is away and account is away */ - if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 && + if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") && !purple_status_is_available(purple_account_get_active_status(account))) hide = TRUE; @@ -6878,7 +6878,7 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields) gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title); if (pidgin_conv_window_is_active_conversation(conv)) { const char* current_title = gtk_window_get_title(GTK_WINDOW(win->window)); - if (current_title == NULL || strcmp(current_title, title) != 0) + if (current_title == NULL || !purple_strequal(current_title, title)) gtk_window_set_title(GTK_WINDOW(win->window), title); } @@ -7471,7 +7471,7 @@ account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus, PurpleConversation *conv = NULL; PidginConversation *gtkconv; - if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")!=0) + if(!purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")) return; if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus)) @@ -7506,10 +7506,10 @@ hide_new_pref_cb(const char *name, PurplePrefType type, if(!hidden_convwin) return; - if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0) + if(purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")) return; - if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0) + if(purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")) when_away = TRUE; for (l = hidden_convwin->gtkconvs; l; ) @@ -7537,7 +7537,7 @@ conv_placement_pref_cb(const char *name, PurplePrefType type, { PidginConvPlacementFunc func; - if (strcmp(name, PIDGIN_PREFS_ROOT "/conversations/placement")) + if (!purple_strequal(name, PIDGIN_PREFS_ROOT "/conversations/placement")) return; func = pidgin_conv_placement_get_fnc(value); @@ -9154,7 +9154,7 @@ switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num, pidgin_conv_switch_active_conversation(conv); sound_method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"); - if (strcmp(sound_method, "none") != 0) + if (!purple_strequal(sound_method, "none")) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds), gtkconv->make_sound); diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c index ef11fdf36b..443e990f0a 100644 --- a/pidgin/gtkdocklet.c +++ b/pidgin/gtkdocklet.c @@ -789,7 +789,7 @@ void pidgin_docklet_embedded() { if (!visibility_manager - && strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) { + && !purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) { pidgin_blist_visibility_manager_add(); visibility_manager = TRUE; } diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c index f2f5818606..ebdea0f620 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 || strcmp(font->face, oldfont->face) != 0) && !(options & GTK_IMHTML_NO_FONTS)) + if (font->face && (!oldfont->face || !purple_strequal(font->face, oldfont->face)) && !(options & GTK_IMHTML_NO_FONTS)) gtk_imhtml_toggle_fontface(imhtml, oldfont->face); - if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0) && !(options & GTK_IMHTML_NO_COLOURS)) + if (font->fore && (!oldfont->fore || !purple_strequal(font->fore, oldfont->fore)) && !(options & GTK_IMHTML_NO_COLOURS)) gtk_imhtml_toggle_forecolor(imhtml, oldfont->fore); - if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0) && !(options & GTK_IMHTML_NO_COLOURS)) + if (font->back && (!oldfont->back || !purple_strequal(font->back, oldfont->back)) && !(options & GTK_IMHTML_NO_COLOURS)) gtk_imhtml_toggle_backcolor(imhtml, oldfont->back); } @@ -4600,13 +4600,13 @@ static void mark_set_cb(GtkTextBuffer *buffer, GtkTextIter *arg1, GtkTextMark *m GtkTextTag *tag = GTK_TEXT_TAG(l->data); if (tag->name) { - if (strcmp(tag->name, "BOLD") == 0) + if (purple_strequal(tag->name, "BOLD")) imhtml->edit.bold = TRUE; - else if (strcmp(tag->name, "ITALICS") == 0) + else if (purple_strequal(tag->name, "ITALICS")) imhtml->edit.italic = TRUE; - else if (strcmp(tag->name, "UNDERLINE") == 0) + else if (purple_strequal(tag->name, "UNDERLINE")) imhtml->edit.underline = TRUE; - else if (strcmp(tag->name, "STRIKE") == 0) + else if (purple_strequal(tag->name, "STRIKE")) imhtml->edit.strike = TRUE; else if (strncmp(tag->name, "FORECOLOR ", 10) == 0) imhtml->edit.forecolor = g_strdup(&(tag->name)[10]); @@ -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 && strcmp(value, "") != 0) + if (value && !purple_strequal(value, "")) { *edit_field = g_strdup(value); @@ -5113,13 +5113,13 @@ static const gchar *tag_to_html_start(GtkTextTag *tag) name = tag->name; g_return_val_if_fail(name != NULL, ""); - if (strcmp(name, "BOLD") == 0) { + if (purple_strequal(name, "BOLD")) { return "<b>"; - } else if (strcmp(name, "ITALICS") == 0) { + } else if (purple_strequal(name, "ITALICS")) { return "<i>"; - } else if (strcmp(name, "UNDERLINE") == 0) { + } else if (purple_strequal(name, "UNDERLINE")) { return "<u>"; - } else if (strcmp(name, "STRIKE") == 0) { + } else if (purple_strequal(name, "STRIKE")) { return "<s>"; } else if (strncmp(name, "LINK ", 5) == 0) { char *tmp = g_object_get_data(G_OBJECT(tag), "link_url"); @@ -5220,13 +5220,13 @@ static const gchar *tag_to_html_end(GtkTextTag *tag) name = tag->name; g_return_val_if_fail(name != NULL, ""); - if (strcmp(name, "BOLD") == 0) { + if (purple_strequal(name, "BOLD")) { return "</b>"; - } else if (strcmp(name, "ITALICS") == 0) { + } else if (purple_strequal(name, "ITALICS")) { return "</i>"; - } else if (strcmp(name, "UNDERLINE") == 0) { + } else if (purple_strequal(name, "UNDERLINE")) { return "</u>"; - } else if (strcmp(name, "STRIKE") == 0) { + } else if (purple_strequal(name, "STRIKE")) { return "</s>"; } else if (strncmp(name, "LINK ", 5) == 0) { return "</a>"; @@ -5583,7 +5583,7 @@ void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags) gtk_imhtml_font_set_size(imhtml, size); } - if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"), "") != 0) + if(!purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"), "")) { gdk_color_parse(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"), &fg_color); @@ -5597,7 +5597,7 @@ void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags) gtk_imhtml_toggle_forecolor(imhtml, color); if(!(flags & PURPLE_CONNECTION_NO_BGCOLOR) && - strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"), "") != 0) + !purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"), "")) { gdk_color_parse(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"), &bg_color); diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c index cf30e4462f..3e02fba2cb 100644 --- a/pidgin/gtklog.c +++ b/pidgin/gtklog.c @@ -504,7 +504,7 @@ static void populate_log_tree(PidginLogViewer *lv) month = purple_utf8_strftime(_("%B %Y"), log->tm ? log->tm : localtime(&log->time)); - if (strcmp(month, prev_top_month) != 0) + if (!purple_strequal(month, prev_top_month)) { /* top level */ gtk_tree_store_append(lv->treestore, &toplevel, NULL); diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c index baecaec4bb..9ee9e961a9 100644 --- a/pidgin/gtkpounce.c +++ b/pidgin/gtkpounce.c @@ -175,7 +175,7 @@ pounce_test_sound(GtkWidget *w, GtkWidget *entry) filename = gtk_entry_get_text(GTK_ENTRY(entry)); - if (filename != NULL && *filename != '\0' && strcmp(filename, _("(default)"))) + if (filename != NULL && *filename != '\0' && !purple_strequal(filename, _("(default)"))) purple_sound_play_file(filename, NULL); else purple_sound_play_event(PURPLE_SOUND_POUNCE_DEFAULT, NULL); diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c index 0db0ce80a1..d5368e70f7 100644 --- a/pidgin/gtkprefs.c +++ b/pidgin/gtkprefs.c @@ -1633,7 +1633,7 @@ proxy_changed_cb(const char *name, PurplePrefType type, GtkWidget *frame = data; const char *proxy = value; - if (strcmp(proxy, "none") && strcmp(proxy, "envvar")) + if (!purple_strequal(proxy, "none") && !purple_strequal(proxy, "envvar")) gtk_widget_show_all(frame); else gtk_widget_hide(frame); @@ -1916,7 +1916,7 @@ browser_changed1_cb(const char *name, PurplePrefType type, GtkWidget *hbox = data; const char *browser = value; - gtk_widget_set_sensitive(hbox, strcmp(browser, "custom")); + gtk_widget_set_sensitive(hbox, !purple_strequal(browser, "custom")); } static void @@ -2011,7 +2011,7 @@ browser_page(void) g_signal_connect(G_OBJECT(entry), "focus-out-event", G_CALLBACK(manual_browser_set), NULL); hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL); - if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) + if (!purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) gtk_widget_set_sensitive(hbox, FALSE); purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser", browser_changed2_cb, hbox); @@ -2246,7 +2246,7 @@ sound_changed2_cb(const char *name, PurplePrefType type, GtkWidget *vbox = data; const char *method = value; - gtk_widget_set_sensitive(vbox, strcmp(method, "none")); + gtk_widget_set_sensitive(vbox, !purple_strequal(method, "none")); } #endif /* !_WIN32 */ @@ -2545,7 +2545,7 @@ sound_page(void) #ifndef _WIN32 gtk_widget_set_sensitive(vbox, - strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none")); + !purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none")); purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method", sound_changed2_cb, vbox); #endif @@ -2854,7 +2854,7 @@ smiley_theme_pref_cb(const char *name, PurplePrefType type, for (themes = smiley_themes; themes; themes = themes->next) { struct smiley_theme *smile = themes->data; - if (smile->name && strcmp(themename, smile->name) == 0) { + if (smile->name && purple_strequal(themename, smile->name)) { pidgin_themes_load_smiley_theme(smile->path, TRUE); break; } @@ -2932,7 +2932,7 @@ pidgin_prefs_update_old(void) /* this string pref moved into the core, try to be friendly */ purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting"); if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) && - strcmp(str, "gaim") == 0) + purple_strequal(str, "gaim")) purple_prefs_set_string("/purple/away/idle_reporting", "purple"); /* Remove some no-longer-used prefs */ diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c index b87a394349..5058fbb540 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 && strcmp(type_hint, "account") == 0) + if (type_hint != NULL && purple_strequal(type_hint, "account")) { optmenu = GTK_WIDGET(purple_request_field_get_ui_data(fld)); if (optmenu == NULL) { diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c index d8310ade9f..adfb2938bf 100644 --- a/pidgin/gtksavedstatuses.c +++ b/pidgin/gtksavedstatuses.c @@ -723,7 +723,7 @@ status_editor_ok_cb(GtkButton *button, gpointer user_data) */ if (((button == dialog->saveanduse_button) || (button == dialog->save_button)) && (purple_savedstatus_find(title) != NULL) && - ((dialog->original_title == NULL) || (strcmp(title, dialog->original_title)))) + ((dialog->original_title == NULL) || (!purple_strequal(title, dialog->original_title)))) { purple_notify_error(status_window, NULL, _("Title already in use. You must " "choose a unique title."), NULL); @@ -761,7 +761,7 @@ status_editor_ok_cb(GtkButton *button, gpointer user_data) else { /* Modify the old status */ - if (strcmp(title, dialog->original_title)) + if (!purple_strequal(title, dialog->original_title)) purple_savedstatus_set_title(saved_status, title); purple_savedstatus_set_type(saved_status, type); } diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c index 2ea41edc14..f0093b8657 100644 --- a/pidgin/gtksmiley.c +++ b/pidgin/gtksmiley.c @@ -151,7 +151,7 @@ void pidgin_smiley_del_from_list(PurpleSmiley *smiley) for (; list; list = list->next) { gtksmiley = (GtkIMHtmlSmiley*)list->data; - if (strcmp(gtksmiley->smile, purple_smiley_get_shortcut(smiley))) + if (!purple_strequal(gtksmiley->smile, purple_smiley_get_shortcut(smiley))) continue; gtk_imhtml_smiley_destroy(gtksmiley); diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c index 135b4c8ff4..8d334da19e 100644 --- a/pidgin/gtksound.c +++ b/pidgin/gtksound.c @@ -526,7 +526,7 @@ pidgin_sound_play_file(const char *filename) return; } - if (strcmp(method, "automatic") != 0 && !sink) { + if (!purple_strequal(method, "automatic") && !sink) { purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); return; } diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c index 58da98ded5..a290c66e75 100644 --- a/pidgin/gtkstatusbox.c +++ b/pidgin/gtkstatusbox.c @@ -1030,8 +1030,8 @@ static PurpleAccount* check_active_accounts_for_identical_statuses(void) PurpleStatusType *st1 = s1->data, *st2 = s2->data; /* TODO: Are these enough to consider the statuses identical? */ if (purple_status_type_get_primitive(st1) != purple_status_type_get_primitive(st2) - || strcmp(purple_status_type_get_id(st1), purple_status_type_get_id(st2)) - || strcmp(purple_status_type_get_name(st1), purple_status_type_get_name(st2))) { + || !purple_strequal(purple_status_type_get_id(st1), purple_status_type_get_id(st2)) + || !purple_strequal(purple_status_type_get_name(st1), purple_status_type_get_name(st2))) { acct1 = NULL; break; } diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c index 3a95d563b8..8fcfc6d8cf 100644 --- a/pidgin/gtkthemes.c +++ b/pidgin/gtkthemes.c @@ -44,7 +44,7 @@ gboolean pidgin_themes_smileys_disabled() if (!current_smiley_theme) return 1; - return strcmp(current_smiley_theme->name, "none") == 0; + return purple_strequal(current_smiley_theme->name, "none"); } static void @@ -461,7 +461,7 @@ void pidgin_themes_init() for (l = smiley_themes; l; l = l->next) { struct smiley_theme *smile = l->data; - if (smile->name && strcmp(current_theme, smile->name) == 0) { + if (smile->name && purple_strequal(current_theme, smile->name)) { pidgin_themes_load_smiley_theme(smile->path, TRUE); break; } diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index 33f18562d0..5f93cc1471 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -1952,7 +1952,7 @@ add_buddyname_autocomplete_entry(GtkListStore *store, const char *buddy_alias, c /* There's no sense listing things like: 'xxx "xxx"' when the name and buddy alias match. */ - if (buddy_alias && strcmp(buddy_alias, buddyname)) { + if (buddy_alias && !purple_strequal(buddy_alias, buddyname)) { char *completion_entry = g_strdup_printf("%s \"%s\"", buddyname, buddy_alias); char *tmp2 = g_utf8_normalize(buddy_alias, -1, G_NORMALIZE_DEFAULT); @@ -1974,9 +1974,9 @@ add_buddyname_autocomplete_entry(GtkListStore *store, const char *buddy_alias, c /* There's no sense listing things like: 'xxx "xxx"' when the name and contact alias match. */ - if (contact_alias && strcmp(contact_alias, buddyname)) { + if (contact_alias && !purple_strequal(contact_alias, buddyname)) { /* We don't want duplicates when the contact and buddy alias match. */ - if (!buddy_alias || strcmp(contact_alias, buddy_alias)) { + if (!buddy_alias || !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); @@ -3471,9 +3471,9 @@ open_dialog(GtkIMHtml *imhtml, GtkIMHtmlLink *link) str = url + sizeof("open://") - 1; - if (strcmp(str, "accounts") == 0) + if (purple_strequal(str, "accounts")) pidgin_accounts_window_show(); - else if (strcmp(str, "prefs") == 0) + else if (purple_strequal(str, "prefs")) pidgin_prefs_show(); else return FALSE; diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c index 5b80972505..ff6c0d26fe 100644 --- a/pidgin/plugins/cap/cap.c +++ b/pidgin/plugins/cap/cap.c @@ -621,7 +621,7 @@ static void insert_status_change_from_purple_status(CapStatistics *statistics, P /* It would seem that some protocols receive periodic updates of the buddies status. * Check to make sure the last status is not the same as current status to prevent * to many duplicated useless database entries. */ - if(strcmp(statistics->last_status_id, purple_status_get_id(status)) == 0) + if(purple_strequal(statistics->last_status_id, purple_status_get_id(status))) return; status_id = purple_status_get_id(status); diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c index 5cb12f8e09..c0962a914d 100644 --- a/pidgin/plugins/gevolution/gevolution.c +++ b/pidgin/plugins/gevolution/gevolution.c @@ -90,7 +90,7 @@ update_ims_from_contact(EContact *contact, const char *name, PurpleAccount *account = purple_connection_get_account(gc); char *me; - if (strcmp(purple_account_get_protocol_id(account), prpl_id)) + if (!purple_strequal(purple_account_get_protocol_id(account), prpl_id)) continue; if (!purple_account_get_bool(account, "gevo-autoadd", FALSE)) diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c index 852fce0082..8f13ec8c9e 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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(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 && strcmp(pref, "")) { + if (pref != NULL && !purple_strequal(pref, "")) { gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref); } diff --git a/pidgin/plugins/raw.c b/pidgin/plugins/raw.c index e349921398..337ea44c25 100644 --- a/pidgin/plugins/raw.c +++ b/pidgin/plugins/raw.c @@ -71,7 +71,7 @@ text_sent_cb(GtkEntry *entry) purple_debug_misc("raw", "prpl_id = %s\n", prpl_id); - if (strcmp(prpl_id, "prpl-toc") == 0) { + if (purple_strequal(prpl_id, "prpl-toc")) { int *a = (int *)gc->proto_data; unsigned short seqno = htons(a[1]++ & 0xffff); unsigned short len = htons(strlen(txt) + 1); @@ -81,12 +81,12 @@ text_sent_cb(GtkEntry *entry) write(*a, txt, ntohs(len)); purple_debug(PURPLE_DEBUG_MISC, "raw", "TOC C: %s\n", txt); - } else if (strcmp(prpl_id, "prpl-irc") == 0) { + } else if (purple_strequal(prpl_id, "prpl-irc")) { write(*(int *)gc->proto_data, txt, strlen(txt)); write(*(int *)gc->proto_data, "\r\n", 2); purple_debug(PURPLE_DEBUG_MISC, "raw", "IRC C: %s\n", txt); - } else if (strcmp(prpl_id, "prpl-jabber") == 0) { + } else if (purple_strequal(prpl_id, "prpl-jabber")) { jabber_send_raw((JabberStream *)gc->proto_data, txt, -1); } else { diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c index 8d04aa3848..b4a90204fb 100644 --- a/pidgin/plugins/relnot.c +++ b/pidgin/plugins/relnot.c @@ -85,7 +85,7 @@ version_fetch_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, } } - if (strcmp(response_code, "200") != 0) { + if (!purple_strequal(response_code, "200")) { purple_debug_error("relnot", "Didn't recieve a HTTP status code of 200.\n"); return; } diff --git a/pidgin/plugins/spellchk.c b/pidgin/plugins/spellchk.c index 57bb893407..bc53f85525 100644 --- a/pidgin/plugins/spellchk.c +++ b/pidgin/plugins/spellchk.c @@ -1865,7 +1865,7 @@ static void on_edited(GtkCellRendererText *cellrenderertext, val.g_type = 0; gtk_tree_model_get_value(GTK_TREE_MODEL(model), &iter, GPOINTER_TO_INT(data), &val); - if (strcmp(arg2, g_value_get_string(&val))) { + if (!purple_strequal(arg2, g_value_get_string(&val))) { gtk_list_store_set(model, &iter, GPOINTER_TO_INT(data), arg2, -1); save_list(); } diff --git a/pidgin/plugins/xmppconsole.c b/pidgin/plugins/xmppconsole.c index 87c8c408e0..6b07821e02 100644 --- a/pidgin/plugins/xmppconsole.c +++ b/pidgin/plugins/xmppconsole.c @@ -73,8 +73,8 @@ xmlnode_to_pretty_str(xmlnode *node, int *len, int depth) if (node->xmlns) { if ((!node->parent || !node->parent->xmlns || - strcmp(node->xmlns, node->parent->xmlns)) && - strcmp(node->xmlns, "jabber:client")) + !purple_strequal(node->xmlns, node->parent->xmlns)) && + !purple_strequal(node->xmlns, "jabber:client")) { char *xmlns = g_markup_escape_text(node->xmlns, -1); g_string_append_printf(text, |