Mercurial > pidgin.yaz
changeset 21590:25a522f544f9
merge of '5a8a1c7157bbb174029ef625cbf079604f7ad7fa'
and 'ee665e939ab5c8c3da1f8f62d844250bb01a84bf'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Mon, 19 Nov 2007 08:07:09 +0000 |
| parents | af5de2b08fe0 (current diff) fd87b254d3f3 (diff) |
| children | b1f36f7652c2 |
| files | |
| diffstat | 6 files changed, 23 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Mon Nov 19 07:56:50 2007 +0000 +++ b/Makefile.mingw Mon Nov 19 08:07:09 2007 +0000 @@ -97,15 +97,15 @@ installer: create_release_install_dir $(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 ./ + mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./ installer_nogtk: create_release_install_dir $(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 ./ + mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-no-gtk.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 ./ + mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-debug.exe ./ installer_zip: create_release_install_dir rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip @@ -124,10 +124,11 @@ $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean - rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin*.exe + rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip rm -rf doc/html Doxyfile.mingw uninstall: - rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release + rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR) + rm -f ./VERSION include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/Makefile.mingw Mon Nov 19 07:56:50 2007 +0000 +++ b/libpurple/Makefile.mingw Mon Nov 19 08:07:09 2007 +0000 @@ -128,7 +128,7 @@ ## CLEAN RULES ## clean: - rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) + rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
--- a/libpurple/ft.c Mon Nov 19 07:56:50 2007 +0000 +++ b/libpurple/ft.c Mon Nov 19 08:07:09 2007 +0000 @@ -998,6 +998,11 @@ { PurpleXfer *xfer = (PurpleXfer *)data; + if (source < 0) { + purple_xfer_cancel_local(xfer); + return; + } + xfer->fd = source; begin_transfer(xfer, PURPLE_INPUT_READ);
--- a/libpurple/protocols/irc/dcc_send.c Mon Nov 19 07:56:50 2007 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Mon Nov 19 08:07:09 2007 +0000 @@ -40,9 +40,7 @@ { struct irc_xfer_rx_data *xd = xfer->data; - if (xd->ip != NULL) - g_free(xd->ip); - + g_free(xd->ip); g_free(xd); } @@ -123,8 +121,8 @@ } else { xd->ip = g_strdup(token[i]); } - purple_debug(PURPLE_DEBUG_INFO, "irc", "Receiving file from %s\n", - xd->ip); + purple_debug(PURPLE_DEBUG_INFO, "irc", "Receiving file (%s) from %s\n", + filename->str, xd->ip); purple_xfer_set_size(xfer, token[i+2] ? atoi(token[i+2]) : 0); purple_xfer_set_init_fnc(xfer, irc_dccsend_recv_init); @@ -166,8 +164,7 @@ if (xd->fd != -1) close(xd->fd); - if (xd->rxqueue) - g_free(xd->rxqueue); + g_free(xd->rxqueue); g_free(xd); }
--- a/pidgin/Makefile.mingw Mon Nov 19 07:56:50 2007 +0000 +++ b/pidgin/Makefile.mingw Mon Nov 19 08:07:09 2007 +0000 @@ -170,6 +170,7 @@ clean: $(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean + $(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC) rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a $(PIDGIN_TARGET).def rm -f $(EXE_TARGET).exe
--- a/pidgin/pixmaps/Makefile.mingw Mon Nov 19 07:56:50 2007 +0000 +++ b/pidgin/pixmaps/Makefile.mingw Mon Nov 19 08:07:09 2007 +0000 @@ -34,3 +34,9 @@ cp $(pidgindistpix_DATA) $(pidgindistpixdir); \ fi; +clean: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\ + done; \ + fi;