pidgin: 9d8399a6: Warnings cleanup from Lee Roach. Fixes #...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 9d8399a619ea87590395c4da30a79b82c448c7fe
Ancestor: 2e77aeeae64a3dc7d0d07ed8fb675c0d2363de55
Author: datallah at pidgin.im
Date: 2008-08-31T18:49:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9d8399a619ea87590395c4da30a79b82c448c7fe

Modified files:
        libpurple/dbus-maybe.h libpurple/plugins/log_reader.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/qq/send_file.c
        libpurple/win32/giowin32.c libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/win32dep.h

ChangeLog: 

Warnings cleanup from Lee Roach. Fixes #6242.


-------------- next part --------------
============================================================
--- libpurple/dbus-maybe.h	ba0c3eef112a5c66a83e4855c85974f03a264987
+++ libpurple/dbus-maybe.h	f210b7a2cfca56cc9fecc9a7a307ae5de47d0323
@@ -23,7 +23,10 @@
 
 #else  /* !HAVE_DBUS */
 
-#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) 
+#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
+    if (ptr) {} \
+}
+
 #define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
 #define DBUS_EXPORT
 
============================================================
--- libpurple/plugins/log_reader.c	ceb4741c6985e08a746f78e23923750dcede8939
+++ libpurple/plugins/log_reader.c	eadb58343fb6a768e8f145ede32959adb25119d6
@@ -1749,7 +1749,7 @@ static GList *qip_logger_list(PurpleLogT
 	gboolean main_cycle = TRUE;
 	char *c;
 	char *start_log;
-	char *new_line;
+	char *new_line = NULL;
 	int offset = 0;
 	GError *error;
 
============================================================
--- libpurple/protocols/null/nullprpl.c	5e93ce69228cf23f2fe29e066bad1bec261d4db7
+++ libpurple/protocols/null/nullprpl.c	af6f7ddeb702ad595dcb2f19993771f1acca6285
@@ -1125,7 +1125,8 @@ static PurplePluginProtocolInfo prpl_inf
   NULL,                                /* padding... */
   NULL,
   NULL,
-  NULL,
+	sizeof(PurplePluginProtocolInfo),    /* struct_size */
+  NULL
 };
 
 static void nullprpl_init(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/qq/send_file.c	0501115925eb21fe09a235296b4263922edd7046
+++ libpurple/protocols/qq/send_file.c	d8145843c01450a9064f4b31328ad9ca7761d1d7
@@ -122,11 +122,11 @@ static ssize_t _qq_xfer_udp_send(const g
 		sin.sin_addr.s_addr = g_htonl(info->remote_real_ip);
 	}
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "sending to channel: %d.%d.%d.%d:%d\n",
-			sin.sin_addr.s_addr & 0xff,
-			(sin.sin_addr.s_addr >> 8) & 0xff,
-			(sin.sin_addr.s_addr >> 16) & 0xff,
-			sin.sin_addr.s_addr >> 24,
-			g_ntohs(sin.sin_port)
+			(int)sin.sin_addr.s_addr & 0xff,
+			(int)(sin.sin_addr.s_addr >> 8) & 0xff,
+			(int)(sin.sin_addr.s_addr >> 16) & 0xff,
+			(int)sin.sin_addr.s_addr >> 24,
+			(int)g_ntohs(sin.sin_port)
 		  );
 	return sendto(info->sender_fd, buf, len, 0, (struct sockaddr *) &sin, sizeof(sin));
 }
============================================================
--- libpurple/win32/giowin32.c	86b6409b6946ca8f5c44259958c00102dc539926
+++ libpurple/win32/giowin32.c	eed063390671d28a0bf845d73bc03aa6d36182ba
@@ -52,6 +52,8 @@ typedef struct _GIOWin32Watch GIOWin32Wa
 
 #define BUFFER_SIZE 4096
 
+GIOChannel *wpurple_g_io_channel_win32_new_socket (int socket);
+
 typedef enum {
   G_IO_WIN32_WINDOWS_MESSAGES,	/* Windows messages */
   G_IO_WIN32_FILE_DESC,		/* Unix-like file descriptors from
============================================================
--- libpurple/win32/libc_interface.h	546d867d62a19e59d0a87231548417b512f0932f
+++ libpurple/win32/libc_interface.h	57be7dbd90fe45d62f31edf205e4bb3fa37e701f
@@ -156,9 +156,6 @@ wpurple_localtime_r( time, resultp )
 #define localtime_r( time, resultp ) \
 wpurple_localtime_r( time, resultp )
 
-/* helper for purple_utf8_strftime() by way of purple_internal_strftime() in src/util.c */
-const char *wpurple_get_timezone_abbreviation(const struct tm *tm);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
============================================================
--- libpurple/win32/libc_internal.h	eba9e2a70bc31128806afde74b592fd2a3c03afd
+++ libpurple/win32/libc_internal.h	c1e3623efc974931caeddc55c367d1353553c0c7
@@ -29,6 +29,9 @@ extern "C" {
 extern "C" {
 #endif /* __cplusplus */
 
+/* helper for purple_utf8_strftime() by way of purple_internal_strftime() in src/util.c */
+const char *wpurple_get_timezone_abbreviation(const struct tm *tm);
+
 /* sys/socket.h */
 int wpurple_socket(int domain, int style, int protocol);
 int wpurple_connect(int socket, struct sockaddr *addr, u_long length);
============================================================
--- libpurple/win32/win32dep.h	aa638d158f36c1f406fbee7825c9af0e30bb74a0
+++ libpurple/win32/win32dep.h	9ba1b08f050adbe2485bca2b040c67c48b9fd982
@@ -54,6 +54,7 @@ FARPROC wpurple_find_and_loadproc(const 
  **/
 /* Windows helper functions */
 FARPROC wpurple_find_and_loadproc(const char *dllname, const char *procedure);
+gboolean wpurple_read_reg_dword(HKEY rootkey, const char *subkey, const char *valname, LPDWORD result);
 char *wpurple_read_reg_string(HKEY rootkey, const char *subkey, const char *valname); /* needs to be g_free'd */
 gboolean wpurple_write_reg_string(HKEY rootkey, const char *subkey, const char *valname, const char *value);
 char *wpurple_escape_dirsep(const char *filename); /* needs to be g_free'd */