Mercurial > pidgin
changeset 17521:fa1102b7a959
merge of '1751d70d33d84eae410858724f155e6979b38eb0'
and 'dc75156638f936ec9f51f9fc92aa65fa8ed16f4a'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2007 02:45:31 +0000 |
| parents | 278e22624ce5 (current diff) b2399804c565 (diff) |
| children | fb096fc27b4e |
| files | |
| diffstat | 3 files changed, 21 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Wed Jun 06 02:09:38 2007 +0000 +++ b/libpurple/conversation.c Wed Jun 06 02:45:31 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 02:09:38 2007 +0000 +++ b/libpurple/dbus-analyze-functions.py Wed Jun 06 02:45:31 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:
--- a/pidgin.spec.in Wed Jun 06 02:09:38 2007 +0000 +++ b/pidgin.spec.in Wed Jun 06 02:45:31 2007 +0000 @@ -83,6 +83,7 @@ Summary: Development headers, documentation, and libraries for Pidgin Group: Applications/Internet Requires: pidgin = %{version}, libpurple-devel = %{version} +Requires: gtk2-devel Requires: pkgconfig Obsoletes: gaim-devel Provides: gaim-devel @@ -102,6 +103,12 @@ Group: Applications/Internet Requires: libpurple = %{version} Requires: pkgconfig +%if "%{_vendor}" == "suse" +# For SuSE: +%{?_with_dbus:Requires: dbus-1-devel >= 0.35} +%else +%{?_with_dbus:Requires: dbus-devel >= 0.35} +%endif %if 0%{?_with_howl:1} || 0%{?_with_avahi:1} %package -n libpurple-bonjour @@ -134,6 +141,7 @@ Summary: Headers etc. for finch stuffs Group: Applications/Internet Requires: finch = %{version}, libpurple-devel = %{version} +Requires: ncurses-devel Requires: pkgconfig %endif @@ -450,6 +458,10 @@ %endif %changelog +* Tue Jun 5 2007 Stu Tomlinson <stu@nosnilmot.com> +- Add missing Requires for gtk2-devel, dbus-devel & ncurses-devel to + appropriate -devel subpackages + * Sun May 27 2007 Stu Tomlinson <stu@nosnilmot.com> - add cyrus-sasl-plain & cyrus-sasl-md5 to Requires