Mercurial > pidgin
changeset 22011:76e0463db3aa
Squash some compiler warnings, some from my -Wstrict-prototypes fixing.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 05 Jan 2008 18:01:12 +0000 |
| parents | 7e5ecf03b69d |
| children | 0503cd74cb56 |
| 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 |
| diffstat | 9 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntmain.c Sat Jan 05 17:14:32 2008 +0000 +++ b/finch/libgnt/gntmain.c Sat Jan 05 18:01:12 2008 +0000 @@ -412,7 +412,7 @@ #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);
--- a/libpurple/cipher.c Sat Jan 05 17:14:32 2008 +0000 +++ b/libpurple/cipher.c Sat Jan 05 18:01:12 2008 +0000 @@ -775,7 +775,7 @@ 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
--- a/libpurple/dnsquery.c Sat Jan 05 17:14:32 2008 +0000 +++ b/libpurple/dnsquery.c Sat Jan 05 18:01:12 2008 +0000 @@ -142,7 +142,7 @@ */ #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"
--- a/libpurple/idle.c Sat Jan 05 17:14:32 2008 +0000 +++ b/libpurple/idle.c Sat Jan 05 18:01:12 2008 +0000 @@ -215,7 +215,7 @@ /* * 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 @@ { /* +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 @@ 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();
--- a/libpurple/protocols/bonjour/parser.c Sat Jan 05 17:14:32 2008 +0000 +++ b/libpurple/protocols/bonjour/parser.c Sat Jan 05 18:01:12 2008 +0000 @@ -39,7 +39,7 @@ 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);
--- a/pidgin/gtkblist.c Sat Jan 05 17:14:32 2008 +0000 +++ b/pidgin/gtkblist.c Sat Jan 05 18:01:12 2008 +0000 @@ -4183,7 +4183,8 @@ 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;
--- a/pidgin/gtkdocklet-x11.c Sat Jan 05 17:14:32 2008 +0000 +++ b/pidgin/gtkdocklet-x11.c Sat Jan 05 18:01:12 2008 +0000 @@ -48,7 +48,7 @@ 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 -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
--- a/pidgin/gtkdocklet.c Sat Jan 05 17:14:32 2008 +0000 +++ b/pidgin/gtkdocklet.c Sat Jan 05 18:01:12 2008 +0000 @@ -62,7 +62,7 @@ * 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 */
--- a/pidgin/plugins/xmppconsole.c Sat Jan 05 17:14:32 2008 +0000 +++ b/pidgin/plugins/xmppconsole.c Sat Jan 05 18:01:12 2008 +0000 @@ -727,7 +727,7 @@ } static void -create_console(void) +create_console(PurplePluginAction *action) { GtkWidget *vbox = gtk_vbox_new(FALSE, 6); GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);