Mercurial > pidgin.yaz
changeset 25049:99e4b9d4ebc6
merge of '373dcef37042813bc15485de75725e625a149bf6'
and '7e9f703c79d2df50e7d864dd84bb88ef8c1b60ec'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 03 Feb 2009 02:43:45 +0000 |
| parents | 2520d5fe48a3 (diff) e316de5f75a3 (current diff) |
| children | b5c82724598c |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dbus-analyze-functions.py Tue Feb 03 02:42:54 2009 +0000 +++ b/libpurple/dbus-analyze-functions.py Tue Feb 03 02:43:45 2009 +0000 @@ -497,7 +497,7 @@ # This is a total hack, but self.call is set up before the parameters # are processed, so we can't tell it to pass a parameter by reference. self.call = "%s(%s)" % (self.function.name, - ", ".join(param.name if param.name != "len" else "&len" for param in self.params)) + ", ".join([(param.name, "&len")[param.name == "len"] for param in self.params])) self.cdecls.append("\tgconstpointer %s;" % name) self.ccode.append("\t%s = %s;" % (name, self.call))
--- a/libpurple/protocols/oscar/oscar.h Tue Feb 03 02:42:54 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.h Tue Feb 03 02:43:45 2009 +0000 @@ -286,6 +286,15 @@ "us", "en", \ } +#define CLIENTINFO_ICQBASIC_14_34_3096 { \ + "ICQBasic", \ + 0x010a, \ + 0x0014, 0x0034, \ + 0x0000, 0x0c18, \ + 0x0000043d, \ + "us", "en", \ +} + #define CLIENTINFO_NETSCAPE_7_0_1 { \ "Netscape 2000 an approved user of AOL Instant Messenger (SM)", \ 0x1d0d, \ @@ -312,14 +321,14 @@ #define CLIENTINFO_PURPLE_ICQ { \ "Purple/" VERSION, \ 0x010a, \ - 0x0006, 0x0000, \ - 0x0000, 0x17ab, \ - 0x00007535, \ + 0x0014, 0x0034, \ + 0x0000, 0x0c18, \ + 0x0000043d, \ "us", "en", \ } #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036 -#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3000 +#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096 typedef enum {