Mercurial > pidgin
changeset 17520:b2399804c565
merge of '394b922aa2d2c1e58a4e1a6455e1b6bd6891c9c9'
and 'e3c8bffcba0e661f54f3be0a71a868b62aeee0fb'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 06 Jun 2007 01:52:02 +0000 |
| parents | b5a8cea54876 (diff) eb018a3bfa56 (current diff) |
| children | fa1102b7a959 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Wed Jun 06 01:37:11 2007 +0000 +++ b/libpurple/conversation.c Wed Jun 06 01:52:02 2007 +0000 @@ -1810,7 +1810,7 @@ if (ops != NULL && ops->chat_remove_users != NULL) { for (l = users; l; l = l->next) { PurpleConvChatBuddy *cb = l->data; - names = g_list_append(names, cb->name); + names = g_list_prepend(names, cb->name); } ops->chat_remove_users(conv, names); g_list_free(names);
--- a/libpurple/dbus-analyze-functions.py Wed Jun 06 01:37:11 2007 +0000 +++ b/libpurple/dbus-analyze-functions.py Wed Jun 06 01:52:02 2007 +0000 @@ -165,9 +165,9 @@ self.returncode = [] def flush(self): - paramslist = ", ".join(self.paramshdr) - if (paramslist == "") : - paramslist = "void" + paramslist = ", ".join(self.paramshdr) + if (paramslist == "") : + paramslist = "void" print "%s %s(%s)" % (self.functiontype, self.function.name, paramslist), @@ -279,7 +279,7 @@ for decl in self.cdecls: print decl - print "\t%s(message_DBUS, error_DBUS, " % self.argfunc, + print "\t%s(message_DBUS, error_DBUS," % self.argfunc, for param in self.cparams: print "DBUS_TYPE_%s, &%s," % param, print "DBUS_TYPE_INVALID);" @@ -289,14 +289,14 @@ for code in self.ccode: print code - print "\treply_DBUS = dbus_message_new_method_return (message_DBUS);" + print "\treply_DBUS = dbus_message_new_method_return (message_DBUS);" - print "\tdbus_message_append_args(reply_DBUS, ", + print "\tdbus_message_append_args(reply_DBUS,", for param in self.cparamsout: if type(param) is str: - print "%s, " % param + print "%s," % param else: - print "DBUS_TYPE_%s, &%s, " % param, + print "DBUS_TYPE_%s, &%s," % param, print "DBUS_TYPE_INVALID);" for code in self.ccodeout: