view libpurple/protocols/oscar/Makefile.am @ 31588:06ed9020b784

jabber: Treat empty <group/> elements as "Buddies", not "" This ultimately led to duplicates in the list, because we had one entry in the GSList as "", and one as NULL, both of which are invalid group names, which resulted in the core blithely replacing them with "Buddies" and generating duplicates. I've tested with and without, and can reproduce the issues without the change. Log: <item subscription='both' name='person' jid='person@example.com'><group></group><group></group></item> (19:32:23) jabber: jabber_roster_parse(): Removing person@example.com from group 'Buddies' on the local list (19:32:23) GLib: g_string_append: assertion `val != NULL' failed (19:32:23) jabber: jabber_roster_parse(): Adding person@example.com to groups: , (19:32:23) g_log: purple_find_group: assertion `(name != NULL) && (*name != '\0')' failed (19:32:23) g_log: purple_group_new: assertion `name != NULL' failed (19:32:23) g_log: purple_blist_add_group: assertion `group != NULL' failed (19:32:23) g_log: purple_find_group: assertion `(name != NULL) && (*name != '\0')' failed (19:32:23) g_log: purple_group_new: assertion `*name != '\0'' failed (19:32:23) g_log: purple_blist_add_group: assertion `group != NULL' failed Since I had to look it up, purple_blist_add_buddy replaces (group == NULL) with "Buddies".
author Paul Aurich <paul@darkrain42.org>
date Wed, 11 May 2011 01:58:03 +0000
parents 809dac0c47ce
children
line wrap: on
line source

EXTRA_DIST = \
	COPYING \
	AUTHORS \
	Makefile.mingw

pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)

OSCARSOURCES = \
	authorization.c     \
	bstream.c           \
	clientlogin.c       \
	encoding.c          \
	encoding.h          \
	family_admin.c      \
	family_alert.c      \
	family_auth.c       \
	family_bart.c       \
	family_bos.c        \
	family_buddy.c      \
	family_chat.c       \
	family_chatnav.c    \
	family_icq.c        \
	family_icbm.c       \
	family_locate.c     \
	family_oservice.c   \
	family_popup.c      \
	family_feedbag.c    \
	family_stats.c      \
	family_userlookup.c \
	flap_connection.c   \
	misc.c         \
	msgcookie.c         \
	odc.c               \
	oft.c               \
	oscar.c             \
	oscar.h             \
	oscarcommon.h       \
	oscar_data.c        \
	peer.c              \
	peer.h              \
	peer_proxy.c        \
	rxhandlers.c        \
	snac.c              \
	snactypes.h         \
	tlv.c               \
	userinfo.c          \
	util.c              \
	visibility.c	    \
	visibility.h

AM_CFLAGS = $(st)

libaim_la_LDFLAGS = -module -avoid-version
libicq_la_LDFLAGS = -module -avoid-version
if STATIC_OSCAR

st = -DPURPLE_STATIC_PRPL
noinst_LTLIBRARIES  = liboscar.la
liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
liboscar_la_CFLAGS  = $(AM_CFLAGS)

else

st =
pkg_LTLIBRARIES     = liboscar.la libaim.la libicq.la
liboscar_la_SOURCES = $(OSCARSOURCES)
liboscar_la_LIBADD  = $(GLIB_LIBS)

libaim_la_SOURCES   = libaim.c
libaim_la_LIBADD    = liboscar.la

libicq_la_SOURCES   = libicq.c
libicq_la_LIBADD    = liboscar.la

endif

AM_CPPFLAGS = \
	-I$(top_srcdir)/libpurple \
	-I$(top_builddir)/libpurple \
	$(GLIB_CFLAGS) \
	$(DEBUG_CFLAGS)