/pidgin/main: cfb128a77e5d: Merge release-2.x.y
Tomasz Wasilczyk
twasilczyk at pidgin.im
Sun May 11 16:24:47 EDT 2014
Changeset: cfb128a77e5d8b7e72bf77032c38956a39ab4757
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-05-11 22:24 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/cfb128a77e5d
Description:
Merge release-2.x.y
diffstat:
libpurple/internal.h | 17 -----------------
libpurple/protocols/jabber/roster.c | 9 +--------
po/POTFILES.in | 1 +
3 files changed, 2 insertions(+), 25 deletions(-)
diffs (64 lines):
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -149,23 +149,6 @@
[(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \
(void)dummy; }
-
-#ifdef __clang__
-
-#define PURPLE_BEGIN_IGNORE_CAST_ALIGN \
- _Pragma ("clang diagnostic push") \
- _Pragma ("clang diagnostic ignored \"-Wcast-align\"")
-
-#define PURPLE_END_IGNORE_CAST_ALIGN \
- _Pragma ("clang diagnostic pop")
-
-#else
-
-#define PURPLE_BEGIN_IGNORE_CAST_ALIGN
-#define PURPLE_END_IGNORE_CAST_ALIGN
-
-#endif /* __clang__ */
-
#include <glib-object.h>
typedef union
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -461,8 +461,6 @@ void jabber_roster_group_change(PurpleCo
{
GSList *buddies, *groups = NULL;
PurpleBuddy *b;
- PurpleGroup *g;
- const char *gname;
if(!old_group || !new_group || !strcmp(old_group, new_group))
return;
@@ -470,12 +468,7 @@ void jabber_roster_group_change(PurpleCo
buddies = purple_blist_find_buddies(purple_connection_get_account(gc), name);
while(buddies) {
b = buddies->data;
- g = purple_buddy_get_group(b);
- gname = jabber_roster_group_get_global_name(g);
- if(!strcmp(gname, old_group))
- groups = g_slist_append(groups, (char*)new_group); /* ick */
- else
- groups = g_slist_append(groups, (char*)gname);
+ groups = g_slist_append(groups, (char*)new_group);
buddies = g_slist_remove(buddies, b);
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,6 +114,7 @@ libpurple/protocols/jabber/auth_scram.c
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/chat.c
+libpurple/protocols/jabber/facebook_roster.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jutil.c
libpurple/protocols/jabber/libfacebook.c
More information about the Commits
mailing list