changeset 16656:9b41a619d2f7

merge of '18c3386b9cf3eedcd0c991b730da936b7c6446a8' and 'f54fc4b885f42db3416534314f5a305ac7a07b8e'

--- a/Makefile.am	Sun Apr 29 18:03:32 2007 +0000
+++ b/Makefile.am	Sun Apr 29 18:04:58 2007 +0000
@@ -26,7 +26,7 @@
 	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

--- a/libpurple/protocols/jabber/auth.c	Sun Apr 29 18:03:32 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sun Apr 29 18:04:58 2007 +0000
@@ -819,7 +819,7 @@
 		} 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);

--- a/pidgin.spec.in	Sun Apr 29 18:03:32 2007 +0000
+++ b/pidgin.spec.in	Sun Apr 29 18:04:58 2007 +0000
@@ -333,13 +333,12 @@
 %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 @@
 %doc ChangeLog.API
 %doc HACKING
 %doc PLUGIN_HOWTO
-%doc PROGRAMMING_NOTES
 
 %dir %{_includedir}/libpurple
 %{_includedir}/libpurple/*.h
@@ -395,22 +393,22 @@
 %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}

--- a/pidgin/gtkstatusbox.c	Sun Apr 29 18:03:32 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Apr 29 18:04:58 2007 +0000
@@ -1447,10 +1447,10 @@
 					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));
 				}
 			}
 		}