# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1192592416 0
# Node ID 72edbc003dd5781903ac95ef8d06374424481228
# Parent  1a71a216f114f6a6df966e772353208f908e1cf9# Parent  216fdae447a9203d9f30ab72aaadee03f3cfa186
merge of '216358713db91ffb0fc0dca95ad096c85290a20f'
     and '4c5bb5c82351d344187827617108843b3825f505'

diff -r 216fdae447a9 -r 72edbc003dd5 Makefile.mingw
--- a/Makefile.mingw	Wed Oct 17 03:37:12 2007 +0000
+++ b/Makefile.mingw	Wed Oct 17 03:40:16 2007 +0000
@@ -36,6 +36,9 @@
   echo $$gtk_version \
 )
 
+STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
+
+
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
 EXTERNAL_DLLS = \
@@ -71,24 +74,28 @@
 	$(MAKE) -C share -f $(MINGW_MAKEFILE) install
 
 create_release_install_dir: install
-	rm -rf $(PIDGIN_INSTALL_DIR).release
-	cp -R $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
-	find $(PIDGIN_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
+	rm -rf $(STRIPPED_RELEASE_DIR)
+	cp -R $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+	find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
 	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_debug: install
 	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
-installers: installer installer_nogtk installer_debug
+installer_zip: create_release_install_dir
+	rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
+	zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
+
+installers: installer installer_nogtk installer_debug installer_zip
 
 Doxyfile.mingw: Doxyfile.in
 	sed -e "s/@PACKAGE@/pidgin/" -e "s/@VERSION@/$(PIDGIN_VERSION)/" -e "s/@top_srcdir@/$(PIDGIN_TREE_TOP)/g" -e "s/@enable_dot@/NO/" Doxyfile.in > Doxyfile.mingw
diff -r 216fdae447a9 -r 72edbc003dd5 libpurple/dbus-server.c
--- a/libpurple/dbus-server.c	Wed Oct 17 03:37:12 2007 +0000
+++ b/libpurple/dbus-server.c	Wed Oct 17 03:40:16 2007 +0000
@@ -697,12 +697,12 @@
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint);
 			break;
 		case PURPLE_TYPE_INT64:
-			xint = my_arg(gint64);
-			dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &xint);
+			xint64 = my_arg(gint64);
+			dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &xint64);
 			break;
 		case PURPLE_TYPE_UINT64:
-			xuint = my_arg(guint64);
-			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &xuint);
+			xuint64 = my_arg(guint64);
+			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &xuint64);
 			break;
 		case PURPLE_TYPE_BOOLEAN:
 			xboolean = my_arg(gboolean);
diff -r 216fdae447a9 -r 72edbc003dd5 libpurple/proxy.c
--- a/libpurple/proxy.c	Wed Oct 17 03:37:12 2007 +0000
+++ b/libpurple/proxy.c	Wed Oct 17 03:40:16 2007 +0000
@@ -690,11 +690,12 @@
 				gchar *tmp = ntlm;
 				guint8 *nonce;
 				gchar *domain = (gchar*)purple_proxy_info_get_username(connect_data->gpi);
-				gchar *username;
+				gchar *username = NULL;
 				gchar *request;
 				gchar *response;
 
-				username = strchr(domain, '\\');
+				if (domain != NULL)
+					username = strchr(domain, '\\');
 				if (username == NULL)
 				{
 					purple_proxy_connect_data_disconnect_formatted(connect_data,
@@ -738,9 +739,11 @@
 			} else if((ntlm = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: NTLM"))) { /* Empty message */
 				gchar request[2048];
 				gchar *domain = (gchar*) purple_proxy_info_get_username(connect_data->gpi);
-				gchar *username;
+				gchar *username = NULL;
 				int request_len;
-				username = strchr(domain, '\\');
+
+				if (domain != NULL)
+					username = strchr(domain, '\\');
 				if (username == NULL)
 				{
 					purple_proxy_connect_data_disconnect_formatted(connect_data,