GNOME.org
 

[gnome-panel] panel: remove old menu bar object

commit 97e8610e43443d8ad2185c62a1a34d932cb26a3f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Feb 17 20:30:53 2018 +0200

    panel: remove old menu bar object

 gnome-panel/Makefile.am             |    2 -
 gnome-panel/applet.c                |    6 -
 gnome-panel/panel-action-protocol.c |    8 -
 gnome-panel/panel-addto-dialog.c    |   16 --
 gnome-panel/panel-enums.h           |    1 -
 gnome-panel/panel-menu-bar.c        |  281 -----------------------------------
 gnome-panel/panel-menu-bar.h        |   72 ---------
 gnome-panel/panel-object-loader.c   |    7 -
 gnome-panel/panel.c                 |   11 --
 po/POTFILES.in                      |    1 -
 10 files changed, 0 insertions(+), 405 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 1df0258..7355429 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -37,7 +37,6 @@ panel_sources =                       \
        panel-stock-icons.c     \
        panel-action-button.c   \
        panel-image-menu-item.c \
-       panel-menu-bar.c        \
        panel-menu-bar-object.c \
        panel-menu-button.c     \
        panel-menu-items.c      \
@@ -75,7 +74,6 @@ panel_headers =                       \
        panel-stock-icons.h     \
        panel-action-button.h   \
        panel-image-menu-item.h \
-       panel-menu-bar.h        \
        panel-menu-bar-object.h \
        panel-menu-button.h     \
        panel-menu-items.h      \
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index fd3567b..7b72f97 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -24,7 +24,6 @@
 #include "panel-bindings.h"
 #include "panel-applet-frame.h"
 #include "panel-action-button.h"
-#include "panel-menu-bar.h"
 #include "panel-toplevel.h"
 #include "panel-util.h"
 #include "panel-menu-button.h"
@@ -64,7 +63,6 @@ panel_applet_set_dnd_enabled (AppletInfo *info,
                panel_action_button_set_dnd_enabled (PANEL_ACTION_BUTTON (info->widget),
                                                     dnd_enabled);
                break;
-       case PANEL_OBJECT_MENU_BAR:
        case PANEL_OBJECT_USER_MENU:
                break;
        default:
@@ -180,10 +178,6 @@ applet_callback_callback (GtkWidget      *widget,
                panel_action_button_invoke_menu (
                        PANEL_ACTION_BUTTON (menu->info->widget), menu->name);
                break;
-       case PANEL_OBJECT_MENU_BAR:
-               panel_menu_bar_invoke_menu (
-                       PANEL_MENU_BAR (menu->info->widget), menu->name);
-               break;
 
        case PANEL_OBJECT_APPLET:
                /*
diff --git a/gnome-panel/panel-action-protocol.c b/gnome-panel/panel-action-protocol.c
index 2772f9c..e744101 100644
--- a/gnome-panel/panel-action-protocol.c
+++ b/gnome-panel/panel-action-protocol.c
@@ -35,7 +35,6 @@
 #include "panel-force-quit.h"
 #include "panel-run-dialog.h"
 #include "panel-menu-button.h"
-#include "panel-menu-bar.h"
 
 static Atom atom_gnome_panel_action            = None;
 static Atom atom_gnome_panel_action_main_menu  = None;
@@ -54,13 +53,6 @@ panel_action_protocol_main_menu (GdkScreen *screen,
        if (panel_applet_activate_main_menu (activate_time))
                return;
 
-       info = panel_applet_get_by_type (PANEL_OBJECT_MENU_BAR, screen);
-       if (info) {
-               panel_menu_bar_popup_menu (PANEL_MENU_BAR (info->widget),
-                                          activate_time);
-               return;
-       }
-
        info = panel_applet_get_by_type (PANEL_OBJECT_MENU, screen);
        if (info && panel_menu_button_is_main_menu (PANEL_MENU_BUTTON (info->widget))) {
                panel_menu_button_popup_menu (PANEL_MENU_BUTTON (info->widget),
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index d630926..810cc8e 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -36,7 +36,6 @@
 #include "panel-applets-manager.h"
 #include "panel-applet-frame.h"
 #include "panel-action-button.h"
-#include "panel-menu-bar.h"
 #include "panel-toplevel.h"
 #include "panel-menu-button.h"
 #include "panel-layout.h"
@@ -88,7 +87,6 @@ typedef enum {
        PANEL_ADDTO_LAUNCHER,
        PANEL_ADDTO_LAUNCHER_NEW,
        PANEL_ADDTO_MENU,
-       PANEL_ADDTO_MENUBAR,
        PANEL_ADDTO_USER_MENU
 } PanelAddtoItemType;
 
@@ -143,15 +141,6 @@ prepend_internal_applets (GSList *list)
        internal->action_type = PANEL_ACTION_NONE;
        internal->iid = g_strdup ("MENU:MAIN");
        list = g_slist_prepend (list, internal);
-       
-       internal = g_new0 (PanelAddtoItemInfo, 1);
-       internal->type = PANEL_ADDTO_MENUBAR;
-       internal->name = g_strdup (_("Menu Bar"));
-       internal->description = g_strdup (_("A custom menu bar"));
-       internal->icon = g_themed_icon_new (PANEL_ICON_MAIN_MENU);
-       internal->action_type = PANEL_ACTION_NONE;
-       internal->iid = g_strdup ("MENUBAR:NEW");
-       list = g_slist_prepend (list, internal);
 
        internal = g_new0 (PanelAddtoItemInfo, 1);
        internal->type = PANEL_ADDTO_USER_MENU;
@@ -752,11 +741,6 @@ panel_addto_add_item (PanelAddtoDialog   *dialog,
                                          item_info->menu_path,
                                          item_info->name);
                break;
-       case PANEL_ADDTO_MENUBAR:
-               panel_menu_bar_create (dialog->panel_widget->toplevel,
-                                      dialog->insert_pack_type,
-                                      pack_index);
-               break;
        case PANEL_ADDTO_USER_MENU:
                panel_user_menu_create (dialog->panel_widget->toplevel,
                                        dialog->insert_pack_type,
diff --git a/gnome-panel/panel-enums.h b/gnome-panel/panel-enums.h
index 000130c..939a7dd 100644
--- a/gnome-panel/panel-enums.h
+++ b/gnome-panel/panel-enums.h
@@ -36,7 +36,6 @@ typedef enum {
        PANEL_OBJECT_LAUNCHER,
        PANEL_OBJECT_APPLET,
        PANEL_OBJECT_ACTION,
-       PANEL_OBJECT_MENU_BAR,
        PANEL_OBJECT_USER_MENU
 } PanelObjectType;
 
diff --git a/gnome-panel/panel-object-loader.c b/gnome-panel/panel-object-loader.c
index eda33ca..d5c36b7 100644
--- a/gnome-panel/panel-object-loader.c
+++ b/gnome-panel/panel-object-loader.c
@@ -39,7 +39,6 @@
 #include "launcher.h"
 #include "panel-action-button.h"
 #include "panel-applet-frame.h"
-#include "panel-menu-bar.h"
 #include "panel-menu-button.h"
 #include "panel-user-menu.h"
 
@@ -219,11 +218,6 @@ panel_object_loader_idle_handler (gpointer dummy)
                                           object->settings,
                                           object_type_detail);
                 break;
-        case PANEL_OBJECT_MENU_BAR:
-                panel_menu_bar_load (panel_widget,
-                                     object->id,
-                                     object->settings);
-                break;
         case PANEL_OBJECT_USER_MENU:
                 panel_user_menu_load (panel_widget,
                                       object->id,
@@ -364,7 +358,6 @@ static struct {
         gboolean         has_detail;
 } panel_object_iid_map[] = {
         { PANEL_OBJECT_ACTION,    "ActionButton" , TRUE  },
-        { PANEL_OBJECT_MENU_BAR,  "MenuBar"      , FALSE },
         { PANEL_OBJECT_MENU,      "MenuButton"   , FALSE },
         { PANEL_OBJECT_LAUNCHER,  "Launcher"     , FALSE },
         { PANEL_OBJECT_USER_MENU, "UserMenu"     , FALSE }
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index abe98cb..7994ba0 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -32,7 +32,6 @@
 #include "panel-util.h"
 #include "panel-applet-frame.h"
 #include "panel-action-button.h"
-#include "panel-menu-bar.h"
 #include "panel-multiscreen.h"
 #include "panel-toplevel.h"
 #include "panel-menu-button.h"
@@ -82,7 +81,6 @@ orientation_change (AppletInfo  *info,
        case PANEL_OBJECT_ACTION:
                button_widget_set_orientation (BUTTON_WIDGET (info->widget), orientation);
                break;
-       case PANEL_OBJECT_MENU_BAR:
        case PANEL_OBJECT_USER_MENU:
                panel_menu_bar_object_set_orientation (PANEL_MENU_BAR_OBJECT (info->widget), orientation);
                break;
@@ -834,15 +832,6 @@ drop_internal_applet (PanelWidget         *panel,
                        success = FALSE;
                }
 
-       } else if (!strcmp (applet_type, "MENUBAR:NEW")) {
-               if (panel_layout_is_writable ()) {
-                       panel_menu_bar_create (panel->toplevel,
-                                              pack_type, pack_index);
-                       success = TRUE;
-               } else {
-                       success = FALSE;
-               }
-
        } else if (!strcmp (applet_type, "USERMENU:NEW")) {
                if (panel_layout_is_writable ()) {
                        panel_user_menu_create (panel->toplevel,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 622390e..4e91f9f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,7 +35,6 @@ gnome-panel/panel-context-menu.c
 gnome-panel/panel-ditem-editor.c
 gnome-panel/panel-force-quit.c
 gnome-panel/panel-layout.c
-gnome-panel/panel-menu-bar.c
 gnome-panel/panel-menu-button.c
 gnome-panel/panel-menu-items.c
 gnome-panel/panel-image-menu-item.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]