im.pidgin.pidgin: 4df361b4c7c545ea522212487ebfd8e4bda0345f

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 4df361b4c7c545ea522212487ebfd8e4bda0345f
Ancestor: 70b395d226d80e7490383a8d0f7e77438cace2ab
Author: rlaager at pidgin.im
Date: 2008-01-05T18:01:12
Branch: im.pidgin.pidgin

Modified files:
        finch/libgnt/gntmain.c libpurple/cipher.c
        libpurple/dnsquery.c libpurple/idle.c
        libpurple/protocols/bonjour/parser.c pidgin/gtkblist.c
        pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c
        pidgin/plugins/xmppconsole.c

ChangeLog: 

Squash some compiler warnings, some from my -Wstrict-prototypes fixing.

-------------- next part --------------
============================================================
--- finch/libgnt/gntmain.c	b9cb66146c14cfcf1ac8e09c37f5b79a0b378024
+++ finch/libgnt/gntmain.c	458de173984ff771ca86afc56b8a6da0230cbe82
@@ -412,7 +412,7 @@ sighandler(int sig)
 #ifdef SIGWINCH
 	case SIGWINCH:
 		erase();
-		g_idle_add(refresh_screen, NULL);
+		g_idle_add((GSourceFunc)refresh_screen, NULL);
 		if (org_winch_handler)
 			org_winch_handler(sig);
 		signal(SIGWINCH, sighandler);
============================================================
--- libpurple/cipher.c	9d5a15477031ac2b2f5d7e0b6e2ada5424fc8672
+++ libpurple/cipher.c	036f4dcc08b7253c49bf2025cd0c75f0ad0c03cc
@@ -775,7 +775,7 @@ hmac_set_key(PurpleCipherContext *contex
 static void
 hmac_set_key(PurpleCipherContext *context, const guchar * key)
 {
-	hmac_set_key_with_len(context, key, strlen(key));
+	hmac_set_key_with_len(context, key, strlen((char *)key));
 }
 
 static size_t 
============================================================
--- libpurple/dnsquery.c	0ea1d6c4fd851e8fe95a35467dad74126cfe0ffb
+++ libpurple/dnsquery.c	8dca34c4a17bd257b2d24fa0913cff5a0bb30b28
@@ -142,7 +142,7 @@ G_GNUC_NORETURN static void
  */
 #ifdef HAVE_SIGNAL_H
 G_GNUC_NORETURN static void
-trap_gdb_bug(void)
+trap_gdb_bug(int sig)
 {
 	const char *message =
 		"Purple's DNS child got a SIGTRAP signal.\n"
============================================================
--- libpurple/idle.c	ff292c22bedd9309cf58f174a479ad847d4b1db3
+++ libpurple/idle.c	07c57548bfc1576f2649de7ea070e9ee1b566f05
@@ -215,7 +215,7 @@ check_idleness(void)
 /*
  * Check idle and set the timer to fire at the next idle-worth event 
  */
-static gint
+static gboolean
 check_idleness_timer(void)
 {
 	check_idleness();
@@ -225,7 +225,7 @@ check_idleness_timer(void)
 	{
 		/* +1 for the boundary,
 		 * +1 more for g_timeout_add_seconds rounding. */
-		idle_timer = purple_timeout_add_seconds(time_until_next_idle_event + 2, check_idleness_timer, NULL);
+		idle_timer = purple_timeout_add_seconds(time_until_next_idle_event + 2, (GSourceFunc)check_idleness_timer, NULL);
 	}
 	return FALSE;
 }
@@ -307,7 +307,7 @@ static gboolean _do_purple_idle_touch_cb
 	int idle_poll_minutes = purple_prefs_get_int("/purple/away/mins_before_away");
 
 	 /* +1 more for g_timeout_add_seconds rounding. */
-	idle_timer = purple_timeout_add_seconds((idle_poll_minutes * 60) + 2, check_idleness_timer, NULL);
+	idle_timer = purple_timeout_add_seconds((idle_poll_minutes * 60) + 2, (GSourceFunc)check_idleness_timer, NULL);
 
 	purple_idle_touch();
 
============================================================
--- libpurple/protocols/bonjour/parser.c	8cfdd1476a111e874992eec25ecff3a75ea3a7ca
+++ libpurple/protocols/bonjour/parser.c	b964a0d43937b3156db2e38ef686d39a29bf4c6b
@@ -39,7 +39,7 @@ parse_from_attrib_and_find_buddy(Bonjour
 	for(i=0; i < nb_attributes * 5; i+=5) {
 		if(!xmlStrcmp(attributes[i], (xmlChar*) "from")) {
 			int len = attributes[i+4] - attributes[i+3];
-			bconv->buddy_name = g_strndup(attributes[i+3], len);
+			bconv->buddy_name = g_strndup((char *)attributes[i+3], len);
 			bonjour_jabber_conv_match_by_name(bconv);
 
 			return (bconv->pb != NULL);
============================================================
--- pidgin/gtkblist.c	85eeacfbb939c246dc173e19b36a2938ec615d3e
+++ pidgin/gtkblist.c	4efd3bfcfc2c23cc2e7428820c7d91e911714e76
@@ -4183,7 +4183,8 @@ void pidgin_blist_setup_sort_methods()
 	pidgin_blist_sort_method_set(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type"));
 }
 
-static void _prefs_change_redo_list(void)
+static void _prefs_change_redo_list(const char *name, PurplePrefType type,
+                                    gconstpointer val, gpointer data)
 {
 	GtkTreeSelection *sel;
 	GtkTreeIter iter;
============================================================
--- pidgin/gtkdocklet-x11.c	14cdda36a2c9dd6f1fd2bb200d84d3bf7cfa5cf1
+++ pidgin/gtkdocklet-x11.c	315c2acc53e008778d6d2c171e53bb03c1cc4440
@@ -48,7 +48,7 @@ static gboolean
 static void docklet_x11_create(gboolean);
 
 static gboolean
-docklet_x11_recreate_cb(void)
+docklet_x11_recreate_cb(gpointer data)
 {
 	docklet_x11_create(TRUE);
 
@@ -230,7 +230,7 @@ static gboolean
 }
 
 static gboolean
-docklet_x11_embed_timeout_cb(void)
+docklet_x11_embed_timeout_cb(gpointer data)
 {
 	/* The docklet was not embedded within the timeout.
 	 * Remove it as a visibility manager, but leave the plugin
============================================================
--- pidgin/gtkdocklet.c	6399ebfbb27560d05db15d4885fca187001a0238
+++ pidgin/gtkdocklet.c	82e87fdb2ff470cebc11fde5092c84805ea2e975
@@ -62,7 +62,7 @@ static gboolean
  * docklet status and utility functions
  **************************************************************************/
 static gboolean
-docklet_blink_icon(void)
+docklet_blink_icon(gpointer data)
 {
 	static gboolean blinked = FALSE;
 	gboolean ret = FALSE; /* by default, don't keep blinking */
============================================================
--- pidgin/plugins/xmppconsole.c	f54fcf4f1510c802bdb3609dd505d3a0fe00a022
+++ pidgin/plugins/xmppconsole.c	03f246100970fcc416cc6e069c445cbeb869339c
@@ -727,7 +727,7 @@ static void 
 }
 
 static void 
-create_console(void) 
+create_console(PurplePluginAction *action) 
 {
 	GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
 	GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);