/pidgin/main: d8df27a1ebdc: Merge release-2.x.y

Tomasz Wasilczyk <[email protected]>
Newsgroups gmane.comp.gnome.gaim.cvs
Message-ID <[email protected]>
Changeset: d8df27a1ebdc4d15b8021a534da6bde7c2d5cd19
Author:	 Tomasz Wasilczyk <[email protected]>
Date:	 2014-05-07 13:21 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/d8df27a1ebdc

Description:

Merge release-2.x.y

diffstat:

 libpurple/protocols/jabber/roster.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

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
@@ -114,7 +114,7 @@ static void add_purple_buddy_to_groups(J
 
 	if(!groups) {
 		if(!buddies) {
-			groups = g_slist_append(groups, JABBER_ROSTER_DEFAULT_GROUP);
+			groups = g_slist_append(groups, g_strdup(JABBER_ROSTER_DEFAULT_GROUP));
 		} else {
 			/* TODO: What should we do here? Removing the local buddies
 			 * is wrong, but so is letting the group state get out of sync with
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.