diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-04-29 18:04:58 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-04-29 18:04:58 +0000 |
| commit | 1510cee184d037933c365e7483b79681a9d37817 (patch) | |
| tree | e78ea6b50eea59f40ecd061c27bbfeaef3ecff9a | |
| parent | 77b11430441c451de60f3eb3953cb993b1491e89 (diff) | |
| parent | d227202d68ac6ce4654f9d0c7190cee6bf75ca44 (diff) | |
| download | pidgin-1510cee184d037933c365e7483b79681a9d37817.tar.gz | |
merge of '87ec9cf46620bd65528a1f8b3f6447bf3c0862a1'
and 'b54dafede4bd406413f6d954dd9715e26658a7c7'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/auth.c | 2 | ||||
| -rw-r--r-- | pidgin.spec.in | 12 | ||||
| -rw-r--r-- | pidgin/gtkstatusbox.c | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index fce3db9a19..a85a1c1d42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ dist-hook: pidgin.spec cp pidgin.spec $(distdir) rm $(distdir)/config.h -distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/GtkUI.pm +distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm # cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common appsdir = $(datadir)/applications diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c index 2c8e93c2ae..1d00d0d9eb 100644 --- a/libpurple/protocols/jabber/auth.c +++ b/libpurple/protocols/jabber/auth.c @@ -819,7 +819,7 @@ jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet) } else { response = xmlnode_new("response"); xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl"); - if (c_out) { + if (clen > 0) { enc_out = purple_base64_encode((unsigned char*)c_out, clen); xmlnode_insert_data(response, enc_out, -1); g_free(enc_out); diff --git a/pidgin.spec.in b/pidgin.spec.in index 5b46234626..2aee4b4888 100644 --- a/pidgin.spec.in +++ b/pidgin.spec.in @@ -333,13 +333,12 @@ fi %doc %{_mandir}/man3*/* %dir %{_libdir}/pidgin -%dir %{perl_vendorarch}/Purple %attr(755, root, root) %{perl_vendorarch}/Pidgin.pm %attr(755, root, root) %{perl_vendorarch}/auto/Pidgin %{_bindir}/pidgin %{_datadir}/pixmaps/pidgin -%{_datadir}/icons/hicolor/*/apps/pidgin.png +%{_datadir}/icons/hicolor/*/apps/pidgin.* %dir %{_datadir}/sounds/pidgin %{_datadir}/sounds/pidgin/* %{_datadir}/applications/* @@ -379,7 +378,6 @@ fi %doc ChangeLog.API %doc HACKING %doc PLUGIN_HOWTO -%doc PROGRAMMING_NOTES %dir %{_includedir}/libpurple %{_includedir}/libpurple/*.h @@ -395,22 +393,22 @@ fi %files -n libpurple-bonjour %defattr(-, root, root) -%{_libdir}/libpurple/libbonjour.* +%{_libdir}/purple-2/libbonjour.* %endif %if 0%{?_with_meanwhile:1} %files -n libpurple-meanwhile %defattr(-, root, root) -%{_libdir}/libpurple/libsametime.* +%{_libdir}/purple-2/libsametime.* %endif %if 0%{?_with_mono:1} %files libpurple-mono %defattr(-, root, root) -%{_libdir}/libpurple/mono.so -%{_libdir}/libpurple/*.dll +%{_libdir}/purple-2/mono.so +%{_libdir}/purple-2/*.dll %endif %if 0%{!?_without_text:1} diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c index 00854d80e6..22951bdff5 100644 --- a/pidgin/gtkstatusbox.c +++ b/pidgin/gtkstatusbox.c @@ -1447,10 +1447,10 @@ buddy_icon_set_cb(const char *filename, PidginStatusBox *box) size_t len = 0; if (filename) data = pidgin_convert_buddy_icon(plug, filename, &len); - img = purple_buddy_icons_set_account_icon(box->account, data, len); - purple_account_set_buddy_icon_path(box->account, filename); + img = purple_buddy_icons_set_account_icon(account, data, len); + purple_account_set_buddy_icon_path(account, filename); - purple_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL)); + purple_account_set_bool(account, "use-global-buddyicon", (filename != NULL)); } } } |