1.1 --- a/Copyright.txt	Tue Aug 14 02:16:06 2012 +0200
     1.2 +++ b/Copyright.txt	Wed Aug 15 23:25:30 2012 +0200
     1.3 @@ -62,6 +62,7 @@
     1.4  Eitan Konigsburg
     1.5  Alexander Kolov
     1.6  Ian Krieg
     1.7 +Jere Krischel
     1.8  Thomas Kunze
     1.9  Gayle Laakmann
    1.10  Scott Lamb
    1.11 @@ -92,6 +93,7 @@
    1.12  Matthew Plough
    1.13  Stephen Poprocki
    1.14  Xavid Pretzer
    1.15 +Jonathan Rice
    1.16  Eric Richie
    1.17  Eion Robb
    1.18  Jesse Rusak

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/Dependencies/patches/Meanwhile-srvc_place.c.diff	Wed Aug 15 23:25:30 2012 +0200
     2.3 @@ -0,0 +1,36 @@
     2.4 +--- src/srvc_place.c	2005-11-21 10:30:46.000000000 -0800
     2.5 ++++ src/srvc_place.c	2012-08-15 09:07:37.000000000 -0700
     2.6 +@@ -165,6 +165,7 @@
     2.7 +   guint16 login_type;
     2.8 +   guint32 unknown_a;
     2.9 +   guint32 unknown_b;
    2.10 ++  char *extraname;
    2.11 + };
    2.12 + 
    2.13 + 
    2.14 +@@ -189,6 +190,7 @@
    2.15 +   mwIdBlock_clear(&p->idb);
    2.16 +   g_free(p->login_id);
    2.17 +   g_free(p->name);
    2.18 ++  g_free(p->extraname);
    2.19 +   g_free(p);
    2.20 + }
    2.21 + 
    2.22 +@@ -394,6 +396,8 @@
    2.23 +   guint16_get(b, &pm->login_type);
    2.24 +   guint32_get(b, &pm->unknown_a);
    2.25 +   guint32_get(b, &pm->unknown_b);
    2.26 ++  //TODO: Since the Notes upgrade, an extra name string is sent to recv_SECTION_LIST(). It might be sent here,
    2.27 ++  //      but since we're only parsing one user, it probably doesn't matter here.
    2.28 + 
    2.29 +   PUT_MEMBER(place, pm);
    2.30 +   if(srvc->handler && srvc->handler->peerJoined)
    2.31 +@@ -544,6 +548,7 @@
    2.32 +     guint16_get(b, &m->login_type);
    2.33 +     guint32_get(b, &m->unknown_a);
    2.34 +     guint32_get(b, &m->unknown_b);
    2.35 ++    mwString_get(b, &m->extraname); //new in Notes upgrade, the name appears again at the end now
    2.36 + 
    2.37 +     PUT_MEMBER(place, m);
    2.38 +   }
    2.39 +

     3.1 --- a/Dependencies/phases/build_dependencies.sh	Tue Aug 14 02:16:06 2012 +0200
     3.2 +++ b/Dependencies/phases/build_dependencies.sh	Wed Aug 15 23:25:30 2012 +0200
     3.3 @@ -140,6 +140,10 @@
     3.4  	
     3.5  	# The provided libtool ignores our Universal Binary-makin' flags
     3.6  	fwdpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0 || true
     3.7 +
     3.8 +	# Fixes accepting group chat invites from the standard Sametime client.
     3.9 +	# Thanks to Jere Krischel and Jonathan Rice.
    3.10 +	fwdpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0 || true
    3.11  	
    3.12  	if needsconfigure $@; then
    3.13  	(
    3.14 @@ -173,6 +177,7 @@
    3.15  	revpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0
    3.16  	revpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0
    3.17  	revpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0
    3.18 +	revpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0
    3.19  	
    3.20  	quiet popd
    3.21  }