adium 4999:6157383640c2: Added a patch for meanwhile fixing grou...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/6157383640c2
revision:	4999:6157383640c2
branch:		adium-1.5.4
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Aug 15 23:25:30 2012 +0200

Added a patch for meanwhile fixing group chat invites from the official Sametime client.

Fixes #16114.

diffs (81 lines):

diff -r 973612acf8df -r 6157383640c2 Copyright.txt
--- a/Copyright.txt	Tue Aug 14 02:16:06 2012 +0200
+++ b/Copyright.txt	Wed Aug 15 23:25:30 2012 +0200
@@ -62,6 +62,7 @@
 Eitan Konigsburg
 Alexander Kolov
 Ian Krieg
+Jere Krischel
 Thomas Kunze
 Gayle Laakmann
 Scott Lamb
@@ -92,6 +93,7 @@
 Matthew Plough
 Stephen Poprocki
 Xavid Pretzer
+Jonathan Rice
 Eric Richie
 Eion Robb
 Jesse Rusak
diff -r 973612acf8df -r 6157383640c2 Dependencies/patches/Meanwhile-srvc_place.c.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-srvc_place.c.diff	Wed Aug 15 23:25:30 2012 +0200
@@ -0,0 +1,36 @@
+--- src/srvc_place.c	2005-11-21 10:30:46.000000000 -0800
++++ src/srvc_place.c	2012-08-15 09:07:37.000000000 -0700
+@@ -165,6 +165,7 @@
+   guint16 login_type;
+   guint32 unknown_a;
+   guint32 unknown_b;
++  char *extraname;
+ };
+ 
+ 
+@@ -189,6 +190,7 @@
+   mwIdBlock_clear(&p->idb);
+   g_free(p->login_id);
+   g_free(p->name);
++  g_free(p->extraname);
+   g_free(p);
+ }
+ 
+@@ -394,6 +396,8 @@
+   guint16_get(b, &pm->login_type);
+   guint32_get(b, &pm->unknown_a);
+   guint32_get(b, &pm->unknown_b);
++  //TODO: Since the Notes upgrade, an extra name string is sent to recv_SECTION_LIST(). It might be sent here,
++  //      but since we're only parsing one user, it probably doesn't matter here.
+ 
+   PUT_MEMBER(place, pm);
+   if(srvc->handler && srvc->handler->peerJoined)
+@@ -544,6 +548,7 @@
+     guint16_get(b, &m->login_type);
+     guint32_get(b, &m->unknown_a);
+     guint32_get(b, &m->unknown_b);
++    mwString_get(b, &m->extraname); //new in Notes upgrade, the name appears again at the end now
+ 
+     PUT_MEMBER(place, m);
+   }
+
diff -r 973612acf8df -r 6157383640c2 Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh	Tue Aug 14 02:16:06 2012 +0200
+++ b/Dependencies/phases/build_dependencies.sh	Wed Aug 15 23:25:30 2012 +0200
@@ -140,6 +140,10 @@
 	
 	# The provided libtool ignores our Universal Binary-makin' flags
 	fwdpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0 || true
+
+	# Fixes accepting group chat invites from the standard Sametime client.
+	# Thanks to Jere Krischel and Jonathan Rice.
+	fwdpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0 || true
 	
 	if needsconfigure $@; then
 	(
@@ -173,6 +177,7 @@
 	revpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0
 	revpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0
 	revpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0
+	revpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0
 	
 	quiet popd
 }