diff options
author | qarkai <qarkai@gmail.com> | 2017-03-23 19:37:57 +0300 |
---|---|---|
committer | qarkai <qarkai@gmail.com> | 2017-03-23 19:37:57 +0300 |
commit | eb9258461c3b1b4a28cd10a9ccf541231d0b4d09 (patch) | |
tree | 9db6d2d00b77e981a2605f38bb2f0abff9f08ffe | |
parent | f6efa8ac1d9fd9517a35bdf365d5a249932436d4 (diff) | |
download | pidgin-eb9258461c3b1b4a28cd10a9ccf541231d0b4d09.tar.gz |
Replace g_strcmp0() with purple_strequal()
-rw-r--r-- | libpurple/account.c | 4 | ||||
-rw-r--r-- | libpurple/blist.c | 2 | ||||
-rw-r--r-- | libpurple/mediamanager.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/bonjour/jabber.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/jabber/roster.c | 6 | ||||
-rw-r--r-- | libpurple/prpl.c | 4 | ||||
-rw-r--r-- | pidgin/gtkutils.c | 2 | ||||
-rw-r--r-- | pidgin/plugins/vvconfig.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/libpurple/account.c b/libpurple/account.c index 197ec5b5f1..55962cb7f4 100644 --- a/libpurple/account.c +++ b/libpurple/account.c @@ -909,9 +909,9 @@ parse_account(xmlnode *node) if (keyring_id == NULL || keyring_id[0] == '\0') is_plaintext = TRUE; - else if (g_strcmp0(keyring_id, "keyring-internal") != 0) + else if (!purple_strequal(keyring_id, "keyring-internal")) is_plaintext = FALSE; - else if (mode == NULL || mode[0] == '\0' || g_strcmp0(mode, "cleartext") == 0) + else if (mode == NULL || mode[0] == '\0' || purple_strequal(mode, "cleartext")) is_plaintext = TRUE; else is_plaintext = FALSE; diff --git a/libpurple/blist.c b/libpurple/blist.c index 2f0e4cba08..0604ed518d 100644 --- a/libpurple/blist.c +++ b/libpurple/blist.c @@ -279,7 +279,7 @@ group_to_xmlnode(PurpleBlistNode *gnode) group = (PurpleGroup *)gnode; node = xmlnode_new("group"); - if (g_strcmp0(group->name, _("Buddies")) != 0) + if (!purple_strequal(group->name, _("Buddies"))) xmlnode_set_attrib(node, "name", group->name); /* Write settings */ diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c index 3a17a323ac..9ff6704498 100644 --- a/libpurple/mediamanager.c +++ b/libpurple/mediamanager.c @@ -627,9 +627,9 @@ get_app_data_info_and_lock (PurpleMediaManager *manager, PurpleMediaAppDataInfo *info = i->data; if (info->media == media && - g_strcmp0 (info->session_id, session_id) == 0 && + purple_strequal (info->session_id, session_id) && (participant == NULL || - g_strcmp0 (info->participant, participant) == 0)) { + purple_strequal (info->participant, participant))) { return info; } } diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c index 8f0b7f2533..c50c79e9d1 100644 --- a/libpurple/protocols/bonjour/jabber.c +++ b/libpurple/protocols/bonjour/jabber.c @@ -373,9 +373,9 @@ void bonjour_jabber_process_packet(PurpleBuddy *pb, xmlnode *packet) { g_return_if_fail(packet != NULL); g_return_if_fail(pb != NULL); - if (g_strcmp0(packet->name, "message") == 0) + if (purple_strequal(packet->name, "message")) _jabber_parse_and_write_message_to_ui(packet, pb); - else if (g_strcmp0(packet->name, "iq") == 0) + else if (purple_strequal(packet->name, "iq")) xep_iq_parse(packet, pb); else { purple_debug_warning("bonjour", "Unknown packet: %s\n", diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c index 57d316b92a..ff8d76723d 100644 --- a/libpurple/protocols/jabber/roster.c +++ b/libpurple/protocols/jabber/roster.c @@ -139,7 +139,7 @@ static void add_purple_buddy_to_groups(JabberStream *js, const char *jid, */ l = g_slist_find_custom(groups, purple_group_get_name(g), (GCompareFunc)purple_utf8_strcasecmp); - if (!l && g_strcmp0(purple_group_get_name(g), _("Buddies")) == 0) { + if (!l && purple_strequal(purple_group_get_name(g), _("Buddies"))) { l = g_slist_find_custom(groups, JABBER_ROSTER_DEFAULT_GROUP, (GCompareFunc)purple_utf8_strcasecmp); } @@ -260,7 +260,7 @@ void jabber_roster_parse(JabberStream *js, const char *from, char *group_name = xmlnode_get_data(group); if (group_name == NULL || *group_name == '\0' || - g_strcmp0(group_name, _("Buddies")) == 0) + purple_strequal(group_name, _("Buddies"))) { /* Changing this string? Look in add_purple_buddy_to_groups */ group_name = g_strdup(JABBER_ROSTER_DEFAULT_GROUP); @@ -530,7 +530,7 @@ jabber_roster_group_get_global_name(PurpleGroup *group) if (name == NULL) name = JABBER_ROSTER_DEFAULT_GROUP; - else if (g_strcmp0(name, _("Buddies")) == 0) + else if (purple_strequal(name, _("Buddies"))) name = JABBER_ROSTER_DEFAULT_GROUP; /* XXX: in 3.0.0 we have localized default name here too */ diff --git a/libpurple/prpl.c b/libpurple/prpl.c index 800a0685dc..5dc589afa2 100644 --- a/libpurple/prpl.c +++ b/libpurple/prpl.c @@ -633,8 +633,8 @@ purple_find_prpl(const char *id) * prpl-xmpp isn't used yet (it's prpl-jabber), * but may be used in the future. */ - if (g_strcmp0(id, "prpl-xmpp") == 0 || - g_strcmp0(id, "prpl-gtalk") == 0) + if (purple_strequal(id, "prpl-xmpp") || + purple_strequal(id, "prpl-gtalk")) { id = "prpl-jabber"; } diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index a1f1dac29f..18cf6b4fb1 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -712,7 +712,7 @@ create_protocols_menu(const char *default_proto_id) g_object_unref(pixbuf); /* libpurple3 compatibility */ - if (g_strcmp0(default_proto_id, "prpl-gtalk") == 0) + if (purple_strequal(default_proto_id, "prpl-gtalk")) aop_menu->default_item = i; gtalk_name = NULL; diff --git a/pidgin/plugins/vvconfig.c b/pidgin/plugins/vvconfig.c index 55dc7896bd..d20e3cf2ee 100644 --- a/pidgin/plugins/vvconfig.c +++ b/pidgin/plugins/vvconfig.c @@ -409,7 +409,7 @@ create_video_sink(PurpleMedia *media, if (device[0] != '\0') g_object_set(G_OBJECT(ret), "device", device, NULL); - if (g_strcmp0(plugin, "autovideosink") == 0) { + if (purple_strequal(plugin, "autovideosink")) { g_signal_connect(ret, "child-added", G_CALLBACK(autovideosink_child_added_cb), NULL); } else { |