Compile with less warnings

This commit is contained in:
Pierre Pronchery 2010-05-18 20:15:32 +00:00
parent 5aed562176
commit 3deb996930
7 changed files with 16 additions and 24 deletions

View File

@ -253,8 +253,8 @@ Browser * browser_new(char const * directory)
gtk_window_set_icon_name(GTK_WINDOW(browser->window), ICON_NAME); gtk_window_set_icon_name(GTK_WINDOW(browser->window), ICON_NAME);
#endif #endif
gtk_window_set_title(GTK_WINDOW(browser->window), _("File browser")); gtk_window_set_title(GTK_WINDOW(browser->window), _("File browser"));
g_signal_connect(browser->window, "delete-event", G_CALLBACK(on_closex), g_signal_connect_swapped(browser->window, "delete-event", G_CALLBACK(
browser); on_closex), browser);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
/* menubar */ /* menubar */
#ifndef EMBEDDED #ifndef EMBEDDED

View File

@ -58,7 +58,7 @@ static GList * _copy_selection(Browser * browser);
/* functions */ /* functions */
/* callbacks */ /* callbacks */
/* window */ /* window */
gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data) gboolean on_closex(gpointer data)
{ {
Browser * browser = data; Browser * browser = data;
@ -73,7 +73,7 @@ gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
/* on_close */ /* on_close */
gboolean on_close(gpointer data) gboolean on_close(gpointer data)
{ {
on_closex(NULL, NULL, data); on_closex(data);
return FALSE; return FALSE;
} }
@ -146,7 +146,7 @@ void on_file_new_symlink(gpointer data)
void on_file_close(gpointer data) void on_file_close(gpointer data)
{ {
on_closex(NULL, NULL, data); on_closex(data);
} }
@ -238,8 +238,7 @@ void on_edit_unselect_all(gpointer data)
/* on_edit_preferences */ /* on_edit_preferences */
static void _preferences_set(Browser * browser); static void _preferences_set(Browser * browser);
/* callbacks */ /* callbacks */
static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event, static gboolean _preferences_on_closex(gpointer data);
gpointer data);
static void _preferences_on_cancel(gpointer data); static void _preferences_on_cancel(gpointer data);
static void _preferences_on_ok(gpointer data); static void _preferences_on_ok(gpointer data);
@ -326,8 +325,7 @@ static void _preferences_set(Browser * browser)
browser->prefs.show_hidden_files); browser->prefs.show_hidden_files);
} }
static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event, static gboolean _preferences_on_closex(gpointer data)
gpointer data)
{ {
Browser * browser = data; Browser * browser = data;

View File

@ -22,7 +22,7 @@
/* window */ /* window */
gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data); gboolean on_closex(gpointer data);
/* accelerators */ /* accelerators */
gboolean on_close(gpointer data); gboolean on_close(gpointer data);

View File

@ -89,8 +89,7 @@ typedef struct _Copy
static void _copy_refresh(Copy * copy); static void _copy_refresh(Copy * copy);
/* callbacks */ /* callbacks */
static void _copy_on_closex(GtkWidget * widget, GdkEvent * event, static void _copy_on_closex(void);
gpointer data);
static gboolean _copy_idle_first(gpointer data); static gboolean _copy_idle_first(gpointer data);
static int _copy(Prefs * prefs, unsigned int filec, char * filev[]) static int _copy(Prefs * prefs, unsigned int filec, char * filev[])
@ -234,8 +233,7 @@ static int _copy_confirm(Copy * copy, char const * dst)
return ret == GTK_RESPONSE_YES ? 1 : 0; return ret == GTK_RESPONSE_YES ? 1 : 0;
} }
static void _copy_on_closex(GtkWidget * widget, GdkEvent * event, static void _copy_on_closex(void)
gpointer data)
{ {
gtk_main_quit(); gtk_main_quit();
} }

View File

@ -63,8 +63,7 @@ typedef struct _Delete
static void _delete_refresh(Delete * delete); static void _delete_refresh(Delete * delete);
/* callbacks */ /* callbacks */
static void _delete_on_closex(GtkWidget * widget, GdkEvent * event, static void _delete_on_closex(void);
gpointer data);
static gboolean _delete_idle(gpointer data); static gboolean _delete_idle(gpointer data);
static int _delete(Prefs * prefs, unsigned int filec, char * filev[]) static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
@ -133,8 +132,7 @@ static int _delete_error(Delete * delete, char const * message, int ret)
return ret; return ret;
} }
static void _delete_on_closex(GtkWidget * widget, GdkEvent * event, static void _delete_on_closex(void)
gpointer data)
{ {
gtk_main_quit(); gtk_main_quit();
} }

View File

@ -66,8 +66,7 @@ typedef struct _Move
static void _move_refresh(Move * move); static void _move_refresh(Move * move);
/* callbacks */ /* callbacks */
static void _move_on_closex(GtkWidget * widget, GdkEvent * event, static void _move_on_closex(void);
gpointer data);
static gboolean _move_idle_first(gpointer data); static gboolean _move_idle_first(gpointer data);
static int _move(Prefs * prefs, unsigned int filec, char * filev[]) static int _move(Prefs * prefs, unsigned int filec, char * filev[])
@ -149,8 +148,7 @@ static int _move_confirm(Move * move, char const * dst)
return ret == GTK_RESPONSE_YES ? 1 : 0; return ret == GTK_RESPONSE_YES ? 1 : 0;
} }
static void _move_on_closex(GtkWidget * widget, GdkEvent * event, static void _move_on_closex(void)
gpointer data)
{ {
gtk_main_quit(); gtk_main_quit();
} }

View File

@ -82,7 +82,7 @@ static int _iconlist_list(char * theme)
/* iconlist_do */ /* iconlist_do */
static void _do_iconview(GtkWidget * iconview, char const * theme); static void _do_iconview(GtkWidget * iconview, char const * theme);
/* callbacks */ /* callbacks */
static gboolean _on_closex(GtkWidget * widget, GdkEvent * event, gpointer data); static gboolean _on_closex(GtkWidget * widget);
static void _on_theme_activate(GtkWidget * widget, gpointer data); static void _on_theme_activate(GtkWidget * widget, gpointer data);
static int _iconlist_do(void) static int _iconlist_do(void)
@ -138,7 +138,7 @@ static int _iconlist_do(void)
return 0; return 0;
} }
static gboolean _on_closex(GtkWidget * widget, GdkEvent * event, gpointer data) static gboolean _on_closex(GtkWidget * widget)
{ {
gtk_widget_hide(widget); gtk_widget_hide(widget);
gtk_main_quit(); gtk_main_quit();