Mercurial > pidgin3 / changeset

--- a/libpurple/plugins/perl/Makefile.mingw	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/plugins/perl/Makefile.mingw	Mon Feb 24 21:22:04 2014 +0100
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = perl

--- a/libpurple/plugins/perl/common/Makefile.mingw	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Mon Feb 24 21:22:04 2014 +0100
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
 
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))

--- a/libpurple/protocols/gg/keymapper.c	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/protocols/gg/keymapper.c	Mon Feb 24 21:22:04 2014 +0100
@@ -78,9 +78,9 @@
 }
 
 gpointer
-ggp_keymapper_to_key(ggp_keymapper *km, uint64_t val)
+ggp_keymapper_to_key(ggp_keymapper *km, guint64 val)
 {
-	uint64_t *key;
+	guint64 *key;
 
 	g_return_val_if_fail(km != NULL, NULL);
 
@@ -88,7 +88,7 @@
 	if (key)
 		return key;
 
-	key = g_new(uint64_t, 1);
+	key = g_new(guint64, 1);
 	*key = val;
 
 	g_hash_table_insert(km->val_to_key, key, key);
@@ -96,11 +96,11 @@
 	return key;
 }
 
-uint64_t
+guint64
 ggp_keymapper_from_key(ggp_keymapper *km, gpointer key)
 {
 	g_return_val_if_fail(km != NULL, 0);
 	g_return_val_if_fail(key != NULL, 0);
 
-	return *((uint64_t*)key);
+	return *((guint64*)key);
 }

--- a/libpurple/protocols/gg/keymapper.h	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/protocols/gg/keymapper.h	Mon Feb 24 21:22:04 2014 +0100
@@ -39,10 +39,10 @@
 ggp_keymapper_free(ggp_keymapper *km);
 
 gpointer
-ggp_keymapper_to_key(ggp_keymapper *km, uint64_t val);
+ggp_keymapper_to_key(ggp_keymapper *km, guint64 val);
 
 /* The key have to be valid. */
-uint64_t
+guint64
 ggp_keymapper_from_key(ggp_keymapper *km, gpointer key);
 
 #endif /* _GGP_KEYMAPPER_H */

--- a/libpurple/protocols/mxit/markup.c	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/protocols/mxit/markup.c	Mon Feb 24 21:22:04 2014 +0100
@@ -214,7 +214,7 @@
 		return -1;
 	}
 
-	len = (uint8_t)data[1]; /* length field [1 byte] */
+	len = (guint8)data[1]; /* length field [1 byte] */
 	out_str = g_malloc(len + 1);
 	memcpy(out_str, &data[2], len); /* data field */
 	out_str[len] = '\0';

--- a/libpurple/win32/global.mak	Mon Feb 24 18:15:13 2014 +0100
+++ b/libpurple/win32/global.mak	Mon Feb 24 21:22:04 2014 +0100
@@ -19,7 +19,7 @@
 JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-glib-0.14
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.14
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.5

--- a/pidgin/libpidgin.c	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/libpidgin.c	Mon Feb 24 21:22:04 2014 +0100
@@ -736,7 +736,7 @@
 #endif
 
 #ifdef _WIN32
-	winpidgin_init(hint);
+	winpidgin_init();
 #endif
 
 	purple_core_set_ui_ops(pidgin_core_get_ui_ops());

--- a/pidgin/pidgin.c	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/pidgin.c	Mon Feb 24 21:22:04 2014 +0100
@@ -43,5 +43,9 @@
 	g_set_prgname("Pidgin");
 	g_set_application_name(PIDGIN_NAME);
 
+#ifdef _WIN32
+	winpidgin_set_exe_hinstance(hint);
+#endif
+
 	return pidgin_start(argc, argv);
 }

--- a/pidgin/plugins/Makefile.mingw	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/plugins/Makefile.mingw	Mon Feb 24 21:22:04 2014 +0100
@@ -93,7 +93,7 @@
 include $(PIDGIN_COMMON_RULES)
 
 plugins: \
-		convcolors.dll \
+		contact_priority.dll \
 		extplacement.dll \
 		gtkbuddynote.dll \
 		history.dll \

--- a/pidgin/plugins/perl/Makefile.mingw	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/plugins/perl/Makefile.mingw	Mon Feb 24 21:22:04 2014 +0100
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 ##
 ## TARGET DEFINITIONS
 ##

--- a/pidgin/plugins/perl/common/Makefile.mingw	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Mon Feb 24 21:22:04 2014 +0100
@@ -7,6 +7,9 @@
 PIDGIN_TREE_TOP := ../../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
 GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
 
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))

--- a/pidgin/win32/gtkwin32dep.c	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/win32/gtkwin32dep.c	Mon Feb 24 21:22:04 2014 +0100
@@ -74,6 +74,11 @@
 	return exe_hInstance;
 }
 
+void winpidgin_set_exe_hinstance(HINSTANCE hint)
+{
+	exe_hInstance = hint;
+}
+
 HINSTANCE winpidgin_dll_hinstance(void) {
 	return dll_hInstance;
 }
@@ -385,7 +390,7 @@
 	return FALSE;
 }
 
-void winpidgin_init(HINSTANCE hint) {
+void winpidgin_init(void) {
 	typedef void (__cdecl* LPFNSETLOGFILE)(const LPCSTR);
 	LPFNSETLOGFILE MySetLogFile;
 	gchar *exchndl_dll_path;
@@ -393,8 +398,6 @@
 	if (purple_debug_is_verbose())
 		purple_debug_misc("winpidgin", "winpidgin_init start\n");
 
-	exe_hInstance = hint;
-
 	exchndl_dll_path = g_build_filename(wpurple_install_dir(), "exchndl.dll", NULL);
 	MySetLogFile = (LPFNSETLOGFILE) wpurple_find_and_loadproc(exchndl_dll_path, "SetLogFile");
 	g_free(exchndl_dll_path);

--- a/pidgin/win32/gtkwin32dep.h	Mon Feb 24 18:15:13 2014 +0100
+++ b/pidgin/win32/gtkwin32dep.h	Mon Feb 24 21:22:04 2014 +0100
@@ -28,6 +28,7 @@
 
 HINSTANCE winpidgin_dll_hinstance(void);
 HINSTANCE winpidgin_exe_hinstance(void);
+void winpidgin_set_exe_hinstance(HINSTANCE hint);
 
 /* Utility */
 int winpidgin_gz_decompress(const char* in, const char* out);
@@ -42,7 +43,7 @@
 DWORD winpidgin_get_lastactive(void);
 
 /* init / cleanup */
-void winpidgin_init(HINSTANCE);
+void winpidgin_init(void);
 void winpidgin_post_init(void);
 void winpidgin_cleanup(void);