Mercurial > pidgin
changeset 18674:7c8321023ae5
merge of '3dd9d75f17fcb12e23540b249c7b0503fccdb94c'
and 'c667f9f68b4d867cdd5bdda3a3f8d8e0ef04b84d'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 28 Jul 2007 05:08:42 +0000 |
| parents | 1e2e5beb4692 (diff) 30b6f8bc47cf (current diff) |
| children | cb91bb07eeff |
| files | |
| diffstat | 4 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Sat Jul 28 05:08:08 2007 +0000 +++ b/AUTHORS Sat Jul 28 05:08:42 2007 +0000 @@ -19,6 +19,7 @@ Daniel 'datallah' Atallah - Developer Ethan 'Paco-Paco' Blanton - Developer Thomas Butter - Developer +Ka-Hing Cheung - Developer Sadrul Habib Chowdhury - Developer Mark 'KingAnt' Doliner - Developer Christian 'ChipX86' Hammond - Developer & Webmaster @@ -38,7 +39,6 @@ Crazy Patch Writers: ------------------- John 'rekkanoryo' Bailey -Ka-Hing 'javabsp' Cheung Felipe 'shx' Contreras Decklin Foster Casey Harkins
--- a/doc/pidgin.1.in Sat Jul 28 05:08:08 2007 +0000 +++ b/doc/pidgin.1.in Sat Jul 28 05:08:42 2007 +0000 @@ -539,6 +539,8 @@ .br Thomas Butter (developer) .br + Ka-Hing Cheung (developer) +.br Sadrul Habib Chowdhury (developer) .br Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR> @@ -575,8 +577,6 @@ John 'rekkanoryo' Bailey .br -Ka-Hing 'javabsp' Cheung -.br Felipe 'shx' Contreras .br Decklin Foster
--- a/libpurple/protocols/jabber/presence.c Sat Jul 28 05:08:08 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Sat Jul 28 05:08:42 2007 +0000 @@ -372,6 +372,12 @@ _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); } + } else if(code && !strcmp(code, "210")) { + /* server rewrote room-nick */ + if((chat = jabber_chat_find(js, jid->node, jid->domain))) { + g_free(chat->handle); + chat->handle = g_strdup(jid->resource); + } } } if((z = xmlnode_get_child(y, "item"))) {
--- a/pidgin/gtkdialogs.c Sat Jul 28 05:08:08 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Jul 28 05:08:42 2007 +0000 @@ -72,6 +72,7 @@ {"Daniel 'datallah' Atallah", N_("developer"), NULL}, {"Ethan 'Paco-Paco' Blanton", N_("developer"), NULL}, {"Thomas Butter", N_("developer"), NULL}, + {"Ka-Hing Cheung", N_("developer"), NULL}, {"Sadrul Habib Chowdhury", N_("developer"), NULL}, {"Mark 'KingAnt' Doliner", N_("developer"), NULL}, {"Christian 'ChipX86' Hammond", N_("developer & webmaster"), NULL}, @@ -94,7 +95,6 @@ /* Order: Alphabetical by Last Name */ static struct developer patch_writers[] = { {"John 'rekkanoryo' Bailey", NULL, NULL}, - {"Ka-Hing 'javabsp' Cheung", NULL, NULL}, {"Felipe 'shx' Contreras", NULL, NULL}, {"Decklin Foster", NULL, NULL}, {"Peter 'Bleeter' Lawler", NULL, NULL},