diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-08-23 19:29:08 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-08-23 19:29:08 +0000 |
| commit | 66d340863f85d976285b0c88cd1e1a0e597fe1db (patch) | |
| tree | 3920890a2b7ff94181a74f45bb98623ca47622e7 /gtk/prefs_dlg.c | |
| parent | f2b0e1f5df4ab9dc6a15f7694a8a97c056018dd1 (diff) | |
| download | wireshark-66d340863f85d976285b0c88cd1e1a0e597fe1db.tar.gz wireshark-66d340863f85d976285b0c88cd1e1a0e597fe1db.tar.bz2 wireshark-66d340863f85d976285b0c88cd1e1a0e597fe1db.zip | |
(Minor) Cleanup signal callbak signatures and related:
- Don't mark callback arg as _U_ if actually used (and vice-versa);
- Use Null as user_data in g_signal_callback if unused in callback;
- Use correct signature for certain event callbacks.
svn path=/trunk/; revision=33895
Diffstat (limited to 'gtk/prefs_dlg.c')
| -rw-r--r-- | gtk/prefs_dlg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index aa72be3206..6c9942eb83 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -412,7 +412,7 @@ prefs_nb_page_add(GtkWidget *notebook, const gchar *title, GtkWidget *page, cons /* show the dialog */ void -prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) +prefs_cb(GtkWidget *w, gpointer dummy) { prefs_page_cb (w, dummy, PREFS_PAGE_USER_INTERFACE); } @@ -620,7 +620,7 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG); - g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), prefs_w); + g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), NULL); g_signal_connect(prefs_w, "destroy", G_CALLBACK(prefs_main_destroy_cb), prefs_w); gtk_widget_show(prefs_w); @@ -1653,7 +1653,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) /* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */ static gboolean prefs_main_delete_event_cb(GtkWidget *prefs_w_lcl, GdkEvent *event _U_, - gpointer parent_w _U_) + gpointer user_data _U_) { prefs_main_cancel_cb(NULL, prefs_w_lcl); return FALSE; |