pidgin: 6e3b6592: printf format warning fixes.

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 6e3b6592a3770172bbebf52f33d96ce077298d07
Ancestor: c3252113cd55d8a16b458b2c5b495428dd75fc90
Author: datallah at pidgin.im
Date: 2008-03-24T16:15:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6e3b6592a3770172bbebf52f33d96ce077298d07

Modified files:
        libpurple/win32/win32dep.c
        pidgin/win32/IdleTracker/idletrack.h
        pidgin/win32/gtkdocklet-win32.c pidgin/win32/untar.c

ChangeLog: 

printf format warning fixes.

-------------- next part --------------
============================================================
--- libpurple/win32/win32dep.c	075f84a024e48f9f30ad18baaa14eb5d45a0417e
+++ libpurple/win32/win32dep.c	9c65d295df837dbcb73c1ea5cd131d855ee82a0d
@@ -125,10 +125,10 @@ FARPROC wpurple_find_and_loadproc(const 
 /* Determine Purple Paths during Runtime */
 
 /* Get paths to special Windows folders. */
-char *wpurple_get_special_folder(int folder_type) {
+gchar *wpurple_get_special_folder(int folder_type) {
 	static LPFNSHGETFOLDERPATHA MySHGetFolderPathA = NULL;
 	static LPFNSHGETFOLDERPATHW MySHGetFolderPathW = NULL;
-	char *retval = NULL;
+	gchar *retval = NULL;
 
 	if (!MySHGetFolderPathW) {
 		MySHGetFolderPathW = (LPFNSHGETFOLDERPATHW)
@@ -464,7 +464,7 @@ gboolean wpurple_check_for_proxy_changes
 
 	ZeroMemory(&ie_proxy_config, sizeof(ie_proxy_config));
 	if (!MyWinHttpGetIEProxyConfig(&ie_proxy_config)) {
-		purple_debug_error("wpurple", "Error reading Windows Proxy Settings(%u).\n", GetLastError());
+		purple_debug_error("wpurple", "Error reading Windows Proxy Settings(%lu).\n", GetLastError());
 		return FALSE;
 	}
 
============================================================
--- pidgin/win32/IdleTracker/idletrack.h	7bbb188821f61438ffb9bf98eea84ef41ec15c5a
+++ pidgin/win32/IdleTracker/idletrack.h	6c9c11c984d44c93d92d639937ff3e8f31f33ae0
@@ -3,6 +3,14 @@
  */
 #include <windows.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 DWORD winpidgin_get_lastactive(void);
 BOOL winpidgin_set_idlehooks(void);
 void winpidgin_remove_idlehooks(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
============================================================
--- pidgin/win32/gtkdocklet-win32.c	8b3bf5723d39c1cf69f9557a44f7a0745d05634f
+++ pidgin/win32/gtkdocklet-win32.c	509bab4d7ca3f737da9a78580efd6306d28c9f03
@@ -634,6 +634,9 @@ static void winpidgin_tray_destroy() {
 static void winpidgin_tray_destroy() {
 	int cached_cnt = sizeof(cached_icons) / sizeof(HICON);
 	systray_remove_nid();
+
+	purple_signals_disconnect_by_handle(pidgin_docklet_get_handle());
+
 	DestroyWindow(systray_hwnd);
 	pidgin_docklet_remove();
 
============================================================
--- pidgin/win32/untar.c	e1d7c61e8c1ef2c9b5f9f91cbe5de8c4d558e283
+++ pidgin/win32/untar.c	d36e09048246db8c98324a65dde831273c12bed1
@@ -92,7 +92,7 @@
 #define untar_error( error, args... )      purple_debug(PURPLE_DEBUG_ERROR, "untar", error, ## args )
 #define untar_warning( warning, args... )  purple_debug(PURPLE_DEBUG_WARNING, "untar", warning, ## args )
 #define untar_verbose( args... )           purple_debug(PURPLE_DEBUG_INFO, "untar", ## args )
- 
+
 #define WSIZE	32768	/* size of decompression buffer */
 #define TSIZE	512	/* size of a "tape" block */
 #define CR	13	/* carriage-return character */
@@ -376,7 +376,7 @@ static int untar_block(Uchar_t *blk) {
 	else
 	{
 		/* file header */
-	
+
 		/* half-assed verification -- does it look like header? */
 		if ((tblk)->filename[99] != '\0'
 		 || ((tblk)->size[0] < '0'
@@ -593,15 +593,15 @@ int untar(const char *filename, const ch
 		untar_error("Error opening: %s\n", filename);
 		return 0;
 	}
-	
+
 	/* Set current directory */
 	if(!GetCurrentDirectory(_MAX_PATH, curdir)) {
-		untar_error("Could not get current directory (error %d).\n", GetLastError());
+		untar_error("Could not get current directory (error %lu).\n", GetLastError());
 		fclose(infp);
 		return 0;
 	}
 	if(!SetCurrentDirectory(destdir)) {
-		untar_error("Could not set current directory to (error %d): %s\n", GetLastError(), destdir);
+		untar_error("Could not set current directory to (error %lu): %s\n", GetLastError(), destdir);
 		fclose(infp);
 		return 0;
 	} else {
@@ -620,7 +620,7 @@ int untar(const char *filename, const ch
 			outfp = NULL;
 		}
 		if(!SetCurrentDirectory(curdir)) {
-			untar_error("Could not set current dir back to original (error %d).\n", GetLastError());
+			untar_error("Could not set current dir back to original (error %lu).\n", GetLastError());
 			ret=0;
 		}
 	}