(Minor) Cleanup some "event callback" function declarations/definitions:

- Add missing 'user_data' arg as needed;
- Use gboolean rather than int as the type of the value returned.
Also: Cleanup whitespace & reformat long lines in a few cases.

svn path=/trunk/; revision=33679

21 files changed, 129 insertions, 117 deletions

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index a4dbc66479..6d4210e370 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -330,7 +330,7 @@ about_authors_page_new(void)
   return page;
 }
 
-static gint about_folders_callback(GtkWidget *widget, GdkEventButton *event, gint id _U_)
+static gboolean about_folders_callback(GtkWidget *widget, GdkEventButton *event, gint id _U_)
 {
   GtkTreeSelection *tree_selection;
   GtkTreeModel *model;
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 957a88ea35..13f5ea0281 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -70,7 +70,7 @@ static void destroy_edit_dialog_cb(gpointer filter_arg, gpointer dummy);
 static void create_new_color_filter(GtkButton *button, const char *filter);
 static void color_new_cb(GtkButton *button, gpointer user_data);
 static void color_edit_cb(GtkButton *button, gpointer user_data);
-static gint color_filters_button_cb(GtkWidget *, GdkEventButton *, gpointer);
+static gboolean color_filters_button_cb(GtkWidget *, GdkEventButton *, gpointer);
 static void color_disable_cb(GtkWidget *widget, gboolean user_data);
 static void color_delete_cb(GtkWidget *widget, gpointer user_data);
 static void color_save_cb(GtkButton *button, gpointer user_data);
@@ -817,7 +817,7 @@ color_edit_cb(GtkButton *button, gpointer user_data _U_)
 }
 
 /* User double-clicked on the coloring rule */
-static gint
+static gboolean
 color_filters_button_cb(GtkWidget *list, GdkEventButton *event,
                           gpointer data _U_)
 {
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 1e40c47f85..e2b8702f2d 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -613,7 +613,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
     g_free (str);
 }
 
-static gint
+static gboolean
 ct_show_popup_menu_cb(void *widg _U_, GdkEvent *event, conversations_table *ct)
 {
     GdkEventButton *bevent = (GdkEventButton *)event;
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 9615328c00..3d4b07bfb7 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1201,7 +1201,7 @@ decode_proto_add_to_list (const gchar *table_name, gpointer value, gpointer user
 }
 
 
-static gint
+static gboolean
 decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer data _U_)
 {
   if (event->type == GDK_2BUTTON_PRESS) {
@@ -1213,7 +1213,7 @@ decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer dat
   return FALSE;
 }
 
-static gint
+static gboolean
 decode_list_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer data _U_)
 {
   if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) {
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 66810cb626..162003629d 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -346,7 +346,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
     }
 }
 
-static gint
+static gboolean
 error_show_popup_menu_cb(void *widg _U_, GdkEvent *event, error_equiv_table *err)
 {
 	GdkEventButton *bevent = (GdkEventButton *)event;
diff --git a/gtk/filter_autocomplete.c b/gtk/filter_autocomplete.c
index be5a5d7186..e33f69ce64 100644
--- a/gtk/filter_autocomplete.c
+++ b/gtk/filter_autocomplete.c
@@ -25,8 +25,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */ 
- 
+ */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -44,10 +44,10 @@
 #define E_FILT_AUTOCOMP_TREE_KEY    "filter_autocomplete_tree"
 
 
-static GtkWidget *filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, 
+static GtkWidget *filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name,
                                           gboolean protocols_only, gboolean *stop_propagation);
 static void autocomplete_protocol_string(GtkWidget  *filter_te, gchar* selected_str);
-static void autoc_filter_row_activated_cb(GtkTreeView *treeview, GtkTreePath *path, 
+static void autoc_filter_row_activated_cb(GtkTreeView *treeview, GtkTreePath *path,
                                           GtkTreeViewColumn *column, gpointer data);
 static gint filter_te_focus_out_cb(GtkWidget *filter_te, GdkEvent *event, gpointer data);
 static void init_autocompletion_list(GtkWidget *list);
@@ -77,28 +77,28 @@ is_protocol_name_being_typed(GtkWidget *filter_te, int str_len)
                                 "||", "or",
                                 "&&", "and",
                                 "^^", "xor" };
-  
+
   /* If the cursor is located at the beginning of the filter editable text,
    * then it's _probably_ a protocol name.
    **/
   if(!(cursor_pos = gtk_editable_get_position(GTK_EDITABLE(filter_te))))
     return TRUE;
-  
+
   start = gtk_editable_get_chars(GTK_EDITABLE(filter_te), 0, (gint) cursor_pos);
-  
+
   /* Point to one char before the current string in the filter editable text */
   pos = start + (cursor_pos - str_len);
-  
+
   /* Walk back through string to find last char which isn't ' ' or '(' */
   while(pos > start) {
     if(*pos != ' ' && *pos != '(') {
       /* Check if we have one of the logical operations */
       for(i = 0; i < (sizeof(logic_ops)/sizeof(logic_ops[0])); i++) {
         op_len = (int) strlen(logic_ops[i]);
-        
+
         if(pos-start+1 < op_len)
           continue;
-        
+
         /* If one of the logical operations is found, then the current string is _probably_ a protocol name */
         if(!strncmp(pos-op_len+1, logic_ops[i], op_len)) {
           g_free (start);
@@ -112,8 +112,8 @@ is_protocol_name_being_typed(GtkWidget *filter_te, int str_len)
     }
     pos--;
   }
-  
-  /* The "str" preceded only by ' ' or '(' chars, 
+
+  /* The "str" preceded only by ' ' or '(' chars,
    * which means that the str is _probably_ a protocol name.
    **/
   g_free (start);
@@ -159,9 +159,9 @@ autocomplete_protocol_string(GtkWidget *filter_te, gchar *selected_str)
 
 /* On row activated signal, complete the protocol string automatically */
 static void
-autoc_filter_row_activated_cb(GtkTreeView *treeview, 
-                              GtkTreePath *path, 
-                              GtkTreeViewColumn *column _U_, 
+autoc_filter_row_activated_cb(GtkTreeView *treeview,
+                              GtkTreePath *path,
+                              GtkTreeViewColumn *column _U_,
                               gpointer data)
 {
   GtkWidget *w_main;
@@ -188,9 +188,9 @@ autoc_filter_row_activated_cb(GtkTreeView *treeview,
   }
 }
 
-static gint
-filter_te_focus_out_cb(GtkWidget *filter_te _U_, 
-                       GdkEvent *event _U_, 
+static gboolean
+filter_te_focus_out_cb(GtkWidget *filter_te _U_,
+                       GdkEvent *event _U_,
                        gpointer data)
 {
   GtkWidget *win;
@@ -205,7 +205,7 @@ filter_te_focus_out_cb(GtkWidget *filter_te _U_,
 }
 
 static gboolean
-check_select_region (GtkWidget *filter_te, GtkWidget *popup_win, 
+check_select_region (GtkWidget *filter_te, GtkWidget *popup_win,
                      const gchar *string, unsigned int str_len)
 {
   gint pos1 = gtk_editable_get_position(GTK_EDITABLE(filter_te));
@@ -257,8 +257,8 @@ add_to_autocompletion_list(GtkWidget *list, const gchar *str)
 }
 
 static gboolean
-autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget *list, 
-			   const gchar *str, gboolean *stop_propagation)
+autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget *list,
+                           const gchar *str, gboolean *stop_propagation)
 {
   GtkRequisition requisition;
   GtkListStore *store;
@@ -284,7 +284,7 @@ autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget
           exact_match = TRUE;
         }
         count++;
-        if (count == 1) 
+        if (count == 1)
           first = g_strdup (curr_str);
       } else {
         loop = gtk_list_store_remove(store, &iter);
@@ -312,8 +312,10 @@ autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget
     gtk_tree_view_columns_autosize(GTK_TREE_VIEW(list));
     gtk_widget_size_request(list, &requisition);
 
-    gtk_widget_set_size_request(popup_win, popup_win->allocation.width, (requisition.height<200? requisition.height+8:200));
-    gtk_window_resize(GTK_WINDOW(popup_win), popup_win->allocation.width, (requisition.height<200? requisition.height+8:200));
+    gtk_widget_set_size_request(popup_win, popup_win->allocation.width,
+                                (requisition.height<200? requisition.height+8:200));
+    gtk_window_resize(GTK_WINDOW(popup_win), popup_win->allocation.width,
+                      (requisition.height<200? requisition.height+8:200));
 
     return TRUE;
   }
@@ -322,7 +324,7 @@ autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget
 }
 
 gboolean
-filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
+filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event, gpointer user_data _U_)
 {
   GtkWidget *popup_win;
   GtkWidget *w_toplevel;
@@ -353,9 +355,9 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
     gtk_widget_show(popup_win);
 
   pos = gtk_editable_get_position(GTK_EDITABLE(filter_te));
-  if (g_ascii_isalnum(ckey) ||      
+  if (g_ascii_isalnum(ckey) ||
       k == GDK_KP_Decimal || k == GDK_period ||
-      k == GDK_underscore || k == GDK_minus) 
+      k == GDK_underscore || k == GDK_minus)
   {
     /* Ensure we delete the selected text */
     gtk_editable_delete_selection(GTK_EDITABLE(filter_te));
@@ -366,13 +368,13 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
   /* get the string from filter_te, start from 0 till cursor's position */
   prefix_start = gtk_editable_get_chars(GTK_EDITABLE(filter_te), 0, pos);
 
-  /* If the pressed key is non-alphanumeric or one of the keys specified 
+  /* If the pressed key is non-alphanumeric or one of the keys specified
    * in the condition (decimal, period...) then destroy popup window.
    **/
-  if( !g_ascii_isalnum(ckey) && 
-      k != GDK_KP_Decimal && k != GDK_period && 
+  if( !g_ascii_isalnum(ckey) &&
+      k != GDK_KP_Decimal && k != GDK_period &&
       k != GDK_underscore && k != GDK_minus &&
-      k != GDK_space && k != GDK_Return && k != GDK_KP_Enter && 
+      k != GDK_space && k != GDK_Return && k != GDK_KP_Enter &&
       k != GDK_Page_Down && k != GDK_Down && k != GDK_Page_Up && k != GDK_Up &&
       k != GDK_BackSpace)
   {
@@ -382,7 +384,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
     }
     return FALSE;
   }
-  
+
   /* Let prefix points to the first char that is not aphanumeric,'.', '_' or '-',
    * start from the end of filter_te_str.
    **/
@@ -464,8 +466,8 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
 
   switch(k)
     {
-      /* a better implementation for UP/DOWN keys would be moving the control to the popup'ed window, and letting 
-       * the treeview handle the up, down actions directly and return the control to the filter text once 
+      /* a better implementation for UP/DOWN keys would be moving the control to the popup'ed window, and letting
+       * the treeview handle the up, down actions directly and return the control to the filter text once
        * the user press Enter or any key except for UP, DOWN arrows. * I wasn't able to find a way to do that. *
        **/
     case GDK_Page_Down:
@@ -605,8 +607,8 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
  * implementing the autocomplete in an optimized way.
  **/
 static gboolean
-build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *popup_win, 
-			  const gchar *protocol_name, gboolean protocols_only, gboolean *stop_propagation)
+build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *popup_win,
+                          const gchar *protocol_name, gboolean protocols_only, gboolean *stop_propagation)
 {
   void *cookie, *cookie2;
   protocol_t *protocol;
@@ -640,14 +642,14 @@ build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *
           exact_match = TRUE;
         }
         count++;
-        if (count == 1) 
+        if (count == 1)
           first = name;
       }
     } else {
 
-      for (hfinfo = proto_get_first_protocol_field(i, &cookie2); 
+      for (hfinfo = proto_get_first_protocol_field(i, &cookie2);
            hfinfo != NULL;
-           hfinfo = proto_get_next_protocol_field(&cookie2)) 
+           hfinfo = proto_get_next_protocol_field(&cookie2))
       {
         if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */
           continue;
@@ -658,14 +660,14 @@ build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *
             exact_match = TRUE;
           }
           count++;
-          if (count == 1) 
+          if (count == 1)
             first = hfinfo->abbrev;
         }
       }
     }
   }
 
-  if (count == 1 && !exact_match && stop_propagation && 
+  if (count == 1 && !exact_match && stop_propagation &&
       strncmp(protocol_name, first, protocol_name_len) == 0)
   {
     /* Only one match (not exact) with correct case */
@@ -673,10 +675,10 @@ build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget *
   }
 
   /* Don't show an empty autocompletion-list or
-   * an autocompletion-list with only one entry with exact match 
+   * an autocompletion-list with only one entry with exact match
    **/
-  if (count == 0 || (count == 1 && exact_match && 
-		     strncmp(protocol_name, first, protocol_name_len) == 0))
+  if (count == 0 || (count == 1 && exact_match &&
+                     strncmp(protocol_name, first, protocol_name_len) == 0))
     return FALSE;
 
   return TRUE;
@@ -686,7 +688,8 @@ static void
 filter_autocomplete_disable_sorting(GtkTreeModel *model)
 {
 #if GTK_CHECK_VERSION(2,6,0)
-  gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
+  gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), 
+                                       GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
 #else
   gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), -2, GTK_SORT_ASCENDING);
 #endif
@@ -699,7 +702,8 @@ filter_autocomplete_enable_sorting(GtkTreeModel *model)
 }
 
 static GtkWidget *
-filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, gboolean protocols_only, gboolean *stop_propagation)
+filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name,
+                        gboolean protocols_only, gboolean *stop_propagation)
 {
   GtkWidget *popup_win;
   GtkWidget *treeview;
@@ -713,7 +717,7 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, gboole
   w_toplevel = gtk_widget_get_toplevel(filter_te);
 
   /* Create popup window */
-  popup_win = gtk_window_new (GTK_WINDOW_POPUP); 
+  popup_win = gtk_window_new (GTK_WINDOW_POPUP);
 
   /* Create scrolled window */
   filter_sc = scrolled_window_new(NULL, NULL);
@@ -748,8 +752,10 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, gboole
 
   gtk_widget_size_request(treeview, &requisition);
 
-  gtk_widget_set_size_request(popup_win, filter_te->allocation.width, (requisition.height<200? requisition.height+8:200));
-  gtk_window_resize(GTK_WINDOW(popup_win), filter_te->allocation.width, (requisition.height<200? requisition.height+8:200));
+  gtk_widget_set_size_request(popup_win, filter_te->allocation.width,
+                              (requisition.height<200? requisition.height+8:200));
+  gtk_window_resize(GTK_WINDOW(popup_win), filter_te->allocation.width,
+                    (requisition.height<200? requisition.height+8:200));
 
   gdk_window_get_origin(filter_te->window, &x_pos, &y_pos);
   y_pos = y_pos + filter_te->allocation.height;
@@ -764,7 +770,8 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, gboole
 }
 
 static void
-filter_autocomplete_handle_backspace(GtkWidget *filter_te, GtkWidget *list, GtkWidget *popup_win, gchar *prefix, GtkWidget *main_win)
+filter_autocomplete_handle_backspace(GtkWidget *filter_te, GtkWidget *list, GtkWidget *popup_win,
+                                     gchar *prefix, GtkWidget *main_win)
 {
   GtkTreeModel *model;
   GtkListStore *store;
@@ -806,15 +813,17 @@ filter_autocomplete_handle_backspace(GtkWidget *filter_te, GtkWidget *list, GtkW
 
   /* Enable sorting */
   filter_autocomplete_enable_sorting(model);
-  
+
   gtk_tree_view_columns_autosize(GTK_TREE_VIEW(list));
   gtk_widget_size_request(list, &requisition);
 
-  gtk_widget_set_size_request(popup_win, popup_win->allocation.width, (requisition.height<200? requisition.height+8:200));
-  gtk_window_resize(GTK_WINDOW(popup_win), popup_win->allocation.width, (requisition.height<200? requisition.height+8:200));
+  gtk_widget_set_size_request(popup_win, popup_win->allocation.width,
+                              (requisition.height<200? requisition.height+8:200));
+  gtk_window_resize(GTK_WINDOW(popup_win), popup_win->allocation.width,
+                    (requisition.height<200? requisition.height+8:200));
 }
 
-static void 
+static void
 filter_autocomplete_win_destroy_cb(GtkWidget *win, gpointer data _U_)
 {
   /* tell that the autocomplete window doesn't exist anymore */
@@ -822,7 +831,7 @@ filter_autocomplete_win_destroy_cb(GtkWidget *win, gpointer data _U_)
 }
 
 gboolean
-filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event)
+filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event, gpointer user_data _U_)
 {
   GtkWidget *popup_win;
 
diff --git a/gtk/filter_autocomplete.h b/gtk/filter_autocomplete.h
index 7546dcc0dc..dd851e94b0 100644
--- a/gtk/filter_autocomplete.h
+++ b/gtk/filter_autocomplete.h
@@ -39,15 +39,17 @@
  *
  * @param filter_te text-editing filter widget
  * @param event
+ * @aram  user_data pointer to user_data (unused)
  */
-extern gboolean filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event);
+extern gboolean filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event, gpointer user_data _U_);
 
 /** Callback function that is called when a "key-press-event" signal occur.
  *
  * @param win parent window of the text-editing filter widget
  * @param event
+ * @param user_data pointer to user_data (unused)
  */
-extern gboolean filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event);
+extern gboolean filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event, gpointer user_data _U_);
 
 
 #endif
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index df63171178..abaf5928f7 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -85,7 +85,7 @@ filter_dlg_delete_event_cb(GtkWidget *prefs_w, GdkEvent *event, gpointer data);
 static void
 filter_dlg_cancel_cb(GtkWidget *cancel_bt, gpointer data);
 
-static gint filter_sel_list_button_cb(GtkWidget *, GdkEventButton *,
+static gboolean filter_sel_list_button_cb(GtkWidget *, GdkEventButton *,
                                       gpointer);
 static void filter_sel_list_cb(GtkTreeSelection *, gpointer);
 static void filter_new_bt_clicked_cb(GtkWidget *, gpointer);
@@ -949,7 +949,7 @@ filter_dlg_destroy_cb(GtkWidget *win, gpointer data)
     forget_filter_dialog(win, list_type);
 }
 
-static gint
+static gboolean
 filter_sel_list_button_cb(GtkWidget *list, GdkEventButton *event,
                           gpointer data _U_)
 {
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index afbb005135..954cda355b 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -216,7 +216,7 @@ window_present(GtkWidget *win)
 }
 
 
-static gint
+static gboolean
 window_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer cancel_button)
 {
     g_return_val_if_fail (widget != NULL, FALSE);
@@ -854,7 +854,7 @@ static GList *trees;
 static void setup_tree(GtkWidget *tree);
 static void forget_tree(GtkWidget *tree, gpointer data);
 static void set_tree_styles(GtkWidget *tree);
-static int tree_view_key_pressed_cb(GtkWidget *tree, GdkEventKey *event, gpointer user_data _U_);
+static gboolean tree_view_key_pressed_cb(GtkWidget *tree, GdkEventKey *event, gpointer user_data _U_);
 
 /* Create a Tree, give it the right styles, and remember it. */
 GtkWidget *
@@ -1177,7 +1177,7 @@ create_user_window_title(const gchar *caption)
  * the packetlist header where there is currently visual hint
  * a header cell has focus.
  */
-static int
+static gboolean
 tree_view_key_pressed_cb(GtkWidget *tree, GdkEventKey *event, gpointer user_data _U_)
 {
     GtkTreeSelection* selection;
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 9daa222494..0cc0fe9c94 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -380,7 +380,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
 
     g_free (str);
 }
-static gint
+static gboolean
 hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et)
 {
     GdkEventButton *bevent = (GdkEventButton *)event;
diff --git a/gtk/main.c b/gtk/main.c
index 74a0d7bb19..7632a50461 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -3504,7 +3504,7 @@ main_widgets_show_or_hide(void)
 
 
 /* called, when the window state changes (minimized, maximized, ...) */
-static int
+static gboolean
 window_state_event_cb (GtkWidget *widget _U_,
                        GdkEvent *event,
                        gpointer  data _U_)
@@ -3524,7 +3524,7 @@ window_state_event_cb (GtkWidget *widget _U_,
 
 
 #define NO_SHIFT_MOD_MASK (GDK_MODIFIER_MASK & ~(GDK_SHIFT_MASK|GDK_MOD2_MASK|GDK_LOCK_MASK))
-static int
+static gboolean
 top_level_key_pressed_cb(GtkWidget *w _U_, GdkEventKey *event, gpointer user_data _U_)
 {
     if (event->keyval == GDK_F8) {
diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c
index 9b8bbf82ab..6a1532e0ef 100644
--- a/gtk/main_packet_list.c
+++ b/gtk/main_packet_list.c
@@ -644,7 +644,7 @@ packet_list_get_event_row_column(GtkWidget *w, GdkEventButton *event_button,
                                   row, column);
 }
 
-static gint
+static gboolean
 packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_)
 {
     GdkEventButton *event_button = (GdkEventButton *)event;
diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index 4ede0c43ee..e7bb12a228 100644
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -587,7 +587,7 @@ highlight_field(tvbuff_t *tvb, gint byte, GtkTreeView *tree_view,
 }
 
 /* Calls functions for different mouse-button presses. */
-static gint
+static gboolean
 byte_view_button_press_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
 	GdkEventButton *event_button = NULL;
diff --git a/gtk/menus.c b/gtk/menus.c
index 2fb8b0e68e..b13f479832 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -2497,7 +2497,7 @@ menu_recent_read_finished(void) {
 }
 
 
-gint
+gboolean
 popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     GtkWidget *menu = (GtkWidget *)data;
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index a296f0a816..32ad374538 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -89,7 +89,7 @@ static void new_tree_view_selection_changed_cb(GtkTreeSelection *sel,
 
 static void destroy_new_window(GtkObject *object, gpointer user_data);
 
-static gint
+static gboolean
 button_press_handler(GtkWidget *widget, GdkEvent *event, gpointer data _U_)
 {
   if (widget == NULL || event == NULL) {
diff --git a/gtk/prefs_gui.c b/gtk/prefs_gui.c
index 17d16357ee..42c15224d3 100644
--- a/gtk/prefs_gui.c
+++ b/gtk/prefs_gui.c
@@ -55,30 +55,30 @@
 
 
 static gint fetch_enum_value(gpointer control, const enum_val_t *enumvals);
-static gint fileopen_dir_changed_cb(GtkWidget *myentry _U_, GdkEvent *event, gpointer parent_w);
-static gint fileopen_preview_changed_cb(GtkWidget *myentry _U_, GdkEvent *event, gpointer parent_w);
+static gboolean fileopen_dir_changed_cb(GtkWidget *myentry _U_, GdkEvent *event, gpointer parent_w);
+static gboolean fileopen_preview_changed_cb(GtkWidget *myentry _U_, GdkEvent *event, gpointer parent_w);
 static void fileopen_selected_cb(GtkWidget *mybutton_rb _U_, gpointer parent_w);
-static gint recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_, 
-					  GdkEvent *event _U_, gpointer parent_w);
-static gint recent_df_entries_changed_cb(GtkWidget *recent_df_entry _U_,
-					  GdkEvent *event _U_, gpointer parent_w);
+static gboolean recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_, 
+					      GdkEvent *event _U_, gpointer parent_w);
+static gboolean recent_df_entries_changed_cb(GtkWidget *recent_df_entry _U_,
+					     GdkEvent *event _U_, gpointer parent_w);
 #define PLIST_SEL_BROWSE_KEY		"plist_sel_browse"
 #define PTREE_SEL_BROWSE_KEY		"ptree_sel_browse"
 #define GEOMETRY_POSITION_KEY		"geometry_position"
-#define GEOMETRY_SIZE_KEY			"geometry_size"
+#define GEOMETRY_SIZE_KEY		"geometry_size"
 #define GEOMETRY_MAXIMIZED_KEY		"geometry_maximized"
 
-#define MACOSX_STYLE_KEY			"macosx_style"
+#define MACOSX_STYLE_KEY		"macosx_style"
 
 #define GUI_CONSOLE_OPEN_KEY		"console_open"
-#define GUI_FILEOPEN_KEY			"fileopen_behavior"
+#define GUI_FILEOPEN_KEY		"fileopen_behavior"
 #define GUI_FILEOPEN_PREVIEW_KEY	"fileopen_preview_timeout"
 #define GUI_RECENT_FILES_COUNT_KEY	"recent_files_count"
 #define GUI_RECENT_DF_ENTRIES_KEY	"recent_display_filter_entries"
 #define GUI_FILEOPEN_DIR_KEY		"fileopen_directory"
-#define GUI_ASK_UNSAVED_KEY			"ask_unsaved"
-#define GUI_WEBBROWSER_KEY			"webbrowser"
-#define GUI_FIND_WRAP_KEY			"find_wrap"
+#define GUI_ASK_UNSAVED_KEY		"ask_unsaved"
+#define GUI_WEBBROWSER_KEY		"webbrowser"
+#define GUI_FIND_WRAP_KEY		"find_wrap"
 #define GUI_USE_PREF_SAVE_KEY		"use_pref_save"
 #define GUI_SHOW_VERSION_KEY		"show_version"
 
@@ -526,7 +526,7 @@ gui_prefs_destroy(GtkWidget *w _U_)
 	}
 }
 
-static gint
+static gboolean
 recent_df_entries_changed_cb(GtkWidget *recent_df_entry _U_,
 			      GdkEvent *event _U_, gpointer parent_w)
 {
@@ -576,7 +576,7 @@ recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_,
 	return FALSE;
 }
 
-static gint
+static gboolean
 fileopen_preview_changed_cb(GtkWidget *recent_files_entry _U_, 
 			      GdkEvent *event _U_, gpointer parent_w)
 {
@@ -601,7 +601,7 @@ fileopen_preview_changed_cb(GtkWidget *recent_files_entry _U_,
 	return FALSE;
 }
 
-static gint
+static gboolean
 fileopen_dir_changed_cb(GtkWidget *fileopen_entry _U_, GdkEvent *event _U_, gpointer parent_w)
 {
 	GtkWidget	*fileopen_dir_te;
diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c
index e9892dca8f..43c310538f 100644
--- a/gtk/profile_dlg.c
+++ b/gtk/profile_dlg.c
@@ -494,7 +494,7 @@ profile_dlg_destroy_cb(GtkWidget *w _U_, gpointer data _U_)
 }
 
 
-static gint
+static gboolean
 profile_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer data _U_)
 {
   if (event->type == GDK_2BUTTON_PRESS) {
@@ -506,7 +506,7 @@ profile_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer data _U
   return FALSE;
 }
 
-static gint
+static gboolean
 profile_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer data _U_)
 {
   if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) {
@@ -906,7 +906,7 @@ select_profile_cb (GtkWidget *w _U_, gpointer data)
 }
 
 gboolean
-profile_show_popup_cb (GtkWidget *w _U_, GdkEvent *event)
+profile_show_popup_cb (GtkWidget *w _U_, GdkEvent *event, gpointer user_data _U_)
 {
   GdkEventButton *bevent = (GdkEventButton *)event;
   const gchar    *profile_name = get_profile_name ();
diff --git a/gtk/profile_dlg.h b/gtk/profile_dlg.h
index c5994e5784..6fe0ebce78 100644
--- a/gtk/profile_dlg.h
+++ b/gtk/profile_dlg.h
@@ -35,8 +35,9 @@
  *
  * @param widget parent widget
  * @param event button event
+ * @param user_data pointer to user_data (unused)
  */
-gboolean profile_show_popup_cb(GtkWidget *w _U_, GdkEvent *event);
+gboolean profile_show_popup_cb(GtkWidget *w _U_, GdkEvent *event, gpointer user_data _U_);
 
 /** User requested the "Configuration Profiles" dialog box by menu or toolbar.
  *
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index ea980934a6..fd616f42a2 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -228,7 +228,7 @@ fill_in_tree(GtkWidget *tree_lcl, ph_stats_t *ps)
 
 static GtkWidget *popup_menu_object;
 
-static gint
+static gboolean
 proto_hier_show_popup_menu_cb(GtkWidget *widget _U_, GdkEvent *event, gpointer data _U_)
 {
     GdkEventButton *bevent = (GdkEventButton *)event;
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 45f09cbde9..fbbf77a268 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -446,15 +446,15 @@ static void magnify_move (struct graph * , int , int );
 static void magnify_destroy (struct graph * );
 static void magnify_draw (struct graph * );
 static void magnify_get_geom (struct graph * , int , int );
-static gint configure_event (GtkWidget * , GdkEventConfigure * );
-static gint expose_event (GtkWidget * , GdkEventExpose * );
-static gint button_press_event (GtkWidget * , GdkEventButton * );
-static gint button_release_event (GtkWidget * , GdkEventButton * );
-static gint motion_notify_event (GtkWidget * , GdkEventMotion * );
-static gint key_press_event (GtkWidget * , GdkEventKey * );
-static gint key_release_event (GtkWidget * , GdkEventKey * );
-static gint leave_notify_event (GtkWidget * , GdkEventCrossing * );
-static gint enter_notify_event (GtkWidget * , GdkEventCrossing * );
+static gboolean configure_event (GtkWidget * , GdkEventConfigure * , gpointer );
+static gboolean expose_event (GtkWidget * , GdkEventExpose * , gpointer );
+static gboolean button_press_event (GtkWidget * , GdkEventButton * , gpointer );
+static gboolean button_release_event (GtkWidget * , GdkEventButton * , gpointer );
+static gboolean motion_notify_event (GtkWidget * , GdkEventMotion * , gpointer );
+static gboolean key_press_event (GtkWidget * , GdkEventKey * , gpointer );
+static gboolean key_release_event (GtkWidget * , GdkEventKey * , gpointer );
+static gboolean leave_notify_event (GtkWidget * , GdkEventCrossing * , gpointer );
+static gboolean enter_notify_event (GtkWidget * , GdkEventCrossing * , gpointer );
 static void tseq_initialize (struct graph * );
 static void tseq_get_bounds (struct graph * );
 static void tseq_stevens_read_config (struct graph * );
@@ -760,7 +760,7 @@ static void create_drawing_area (struct graph *g)
 	 * !!! NEMLLO BY TO BYT NA KONCI graph_init_sequence()? !!!
 	 *
 	 */
-	g_signal_connect(g->drawing_area,"configure_event", G_CALLBACK(configure_event),
+	g_signal_connect(g->drawing_area, "configure_event", G_CALLBACK(configure_event),
                        NULL);
 
 	/* puts ("exiting create_drawing_area()"); */
@@ -2728,7 +2728,7 @@ static void magnify_draw (struct graph *g)
 
 }
 
-static gint configure_event (GtkWidget *widget, GdkEventConfigure *event)
+static gboolean configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 	struct {
@@ -2787,7 +2787,7 @@ static gint configure_event (GtkWidget *widget, GdkEventConfigure *event)
 	return TRUE;
 }
 
-static gint expose_event (GtkWidget *widget, GdkEventExpose *event)
+static gboolean expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
@@ -3036,7 +3036,7 @@ static void do_key_motion_right (struct graph *g, int step)
 	do_key_motion (g);
 }
 
-static gint button_press_event (GtkWidget *widget, GdkEventButton *event)
+static gboolean button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
@@ -3073,7 +3073,7 @@ static gint button_press_event (GtkWidget *widget, GdkEventButton *event)
 	return TRUE;
 }
 
-static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
+static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 	int x, y;
@@ -3130,7 +3130,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
 	return TRUE;
 }
 
-static gint button_release_event (GtkWidget *widget, GdkEventButton *event)
+static gboolean button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
@@ -3144,7 +3144,7 @@ static gint button_release_event (GtkWidget *widget, GdkEventButton *event)
 	return TRUE;
 }
 
-static gint key_press_event (GtkWidget *widget, GdkEventKey *event)
+static gboolean key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 	int step;
@@ -3221,7 +3221,7 @@ static gint key_press_event (GtkWidget *widget, GdkEventKey *event)
 	return TRUE;
 }
 
-static gint key_release_event (GtkWidget *widget, GdkEventKey *event)
+static gboolean key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
@@ -3234,7 +3234,7 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event)
 	return TRUE;
 }
 
-static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
+static gboolean leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
@@ -3244,7 +3244,7 @@ static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
 	return TRUE;
 }
 
-static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
+static gboolean enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_, gpointer user_data _U_)
 {
         struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
 
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index 77f1138171..a8441fff78 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -813,7 +813,7 @@ wlan_details_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, gui
 	g_free (str);
 }
 
-static gint
+static gboolean
 wlan_show_popup_menu_cb(void *widg _U_, GdkEvent *event, wlanstat_t *et)
 {
 	GdkEventButton *bevent = (GdkEventButton *)event;
@@ -1009,7 +1009,7 @@ wlan_create_popup_menu(wlanstat_t *hs)
 	g_signal_connect(hs->table, "button_press_event", G_CALLBACK(wlan_show_popup_menu_cb), hs);
 }
 
-static gint
+static gboolean
 wlan_details_show_popup_menu_cb(void *widg _U_, GdkEvent *event, wlanstat_t *et)
 {
 	GdkEventButton *bevent = (GdkEventButton *)event;