[gnome-panel] menu: remove unneeded parameter from main_menu_append



commit 3a74817088bac59a715d0f8e176cc47459d67d90
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu May 25 00:53:20 2017 +0300

    menu: remove unneeded parameter from main_menu_append

 gnome-panel/menu.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gnome-panel/menu.c b/gnome-panel/menu.c
index 7b48310..8950f8f 100644
--- a/gnome-panel/menu.c
+++ b/gnome-panel/menu.c
@@ -699,8 +699,7 @@ submenu_to_display (GtkWidget *menu)
        GMenuTree           *tree;
        GMenuTreeDirectory  *directory;
        const char          *menu_path;
-       void               (*append_callback) (GtkWidget *, gpointer);
-       gpointer             append_data;
+       void               (*append_callback) (GtkWidget *);
 
        if (!g_object_get_data (G_OBJECT (menu), "panel-menu-needs-loading"))
                return;
@@ -733,10 +732,9 @@ submenu_to_display (GtkWidget *menu)
 
        append_callback = g_object_get_data (G_OBJECT (menu),
                                             "panel-menu-append-callback");
-       append_data     = g_object_get_data (G_OBJECT (menu),
-                                            "panel-menu-append-callback-data");
+
        if (append_callback)
-               append_callback (menu, append_data);
+               append_callback (menu);
 }
 
 static gboolean
@@ -1163,8 +1161,7 @@ setup_menu_item_with_icon (GtkWidget   *item,
 }
 
 static void
-main_menu_append (GtkWidget *main_menu,
-                 gpointer   data)
+main_menu_append (GtkWidget *main_menu)
 {
        GtkWidget   *item;
        gboolean     add_separator;
@@ -1206,9 +1203,6 @@ create_main_menu (PanelWidget *panel)
        g_object_set_data (G_OBJECT (main_menu),
                           "panel-menu-append-callback",
                           main_menu_append);
-       g_object_set_data (G_OBJECT (main_menu),
-                          "panel-menu-append-callback-data",
-                          panel);
 
        return main_menu;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]