Mercurial > pidgin
changeset 20348:44842d3f49ce
applied changes from 8548e491a5b470d5665cb1cf87a7b0caaa3c87a5
through f0159f8c232186c297492392cba2e3a541794457
applied changes from f0159f8c232186c297492392cba2e3a541794457
through bc9860a748e1570dd84f3743dd22c9834f2d38aa
applied changes from 25148666afa153d299e40d80150d8f634248d1f5
through 29b2fc4762e2c5d03a7100c78f2a7b49237c5e80
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 21 Oct 2007 04:47:57 +0000 |
| parents | 04fe5601fedb |
| children | 0484600ac434 |
| files | libpurple/plugins/log_reader.c libpurple/protocols/bonjour/Makefile.mingw libpurple/win32/global.mak |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/log_reader.c Sun Oct 21 04:46:33 2007 +0000 +++ b/libpurple/plugins/log_reader.c Sun Oct 21 04:47:57 2007 +0000 @@ -2701,12 +2701,16 @@ /* Calculate default aMSN log directory. */ #ifdef _WIN32 + path = NULL; folder = wpurple_get_special_folder(CSIDL_PROFILE); /* Silly aMSN, not using CSIDL_APPDATA */ - path = g_build_filename(folder, "amsn", NULL); + if (folder) { + path = g_build_filename(folder, "amsn", NULL); + g_free(folder); + } #else path = g_build_filename(purple_home_dir(), ".amsn", NULL); #endif - purple_prefs_add_string("/plugins/core/log_reader/amsn/log_directory", path); + purple_prefs_add_string("/plugins/core/log_reader/amsn/log_directory", path ? path : ""); g_free(path); }
--- a/libpurple/protocols/bonjour/Makefile.mingw Sun Oct 21 04:46:33 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.mingw Sun Oct 21 04:47:57 2007 +0000 @@ -36,7 +36,6 @@ -I$(PIDGIN_TREE_TOP) LIB_PATHS += -L$(GTK_TOP)/lib \ - -L$(BONJOUR_TOP)/lib/win32 \ -L$(LIBXML2_TOP)/lib \ -L$(PURPLE_TOP) @@ -66,6 +65,7 @@ ifeq ($(LINK_DNS_SD_DIRECTLY), 1) CFLAGS += -DLINK_DNS_SD_DIRECTLY + LIB_PATHS += -L$(BONJOUR_TOP)/lib/win32 -L$(BONJOUR_TOP)/lib LIBS += -ldnssd endif
--- a/libpurple/win32/global.mak Sun Oct 21 04:46:33 2007 +0000 +++ b/libpurple/win32/global.mak Sun Oct 21 04:47:57 2007 +0000 @@ -11,7 +11,7 @@ # Locations of our various dependencies WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3 -GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11 +GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11-daa1 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0 GTK_BIN ?= $(GTK_TOP)/bin BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK @@ -22,6 +22,7 @@ PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 +GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13 # Where we installing this stuff to? PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir