Mercurial > pidgin.yaz
changeset 22529:d93577159f2a
printf format warning fixes.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 24 Mar 2008 16:15:39 +0000 |
| parents | 322b92e28005 |
| children | 93df1d72fd01 |
| files | libpurple/win32/win32dep.c pidgin/win32/IdleTracker/idletrack.h pidgin/win32/gtkdocklet-win32.c pidgin/win32/untar.c |
| diffstat | 4 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/win32/win32dep.c Mon Mar 24 16:11:21 2008 +0000 +++ b/libpurple/win32/win32dep.c Mon Mar 24 16:15:39 2008 +0000 @@ -125,10 +125,10 @@ /* 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 @@ 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; }
--- a/pidgin/win32/IdleTracker/idletrack.h Mon Mar 24 16:11:21 2008 +0000 +++ b/pidgin/win32/IdleTracker/idletrack.h Mon Mar 24 16:15:39 2008 +0000 @@ -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 */
--- a/pidgin/win32/gtkdocklet-win32.c Mon Mar 24 16:11:21 2008 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Mon Mar 24 16:15:39 2008 +0000 @@ -634,6 +634,9 @@ 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();
--- a/pidgin/win32/untar.c Mon Mar 24 16:11:21 2008 +0000 +++ b/pidgin/win32/untar.c Mon Mar 24 16:15:39 2008 +0000 @@ -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 @@ else { /* file header */ - + /* half-assed verification -- does it look like header? */ if ((tblk)->filename[99] != '\0' || ((tblk)->size[0] < '0' @@ -593,15 +593,15 @@ 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 @@ 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; } }