GNOME.org
 

[gnome-panel] action-button: remove unused buttons

commit 82a6bad50da7a4515932d2d20220a601a90fa9c7
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Apr 16 22:52:04 2020 +0300

    action-button: remove unused buttons
    
    Hibernate, suspend, hybrid sleep and restart was added for user menu:
    https://gitlab.gnome.org/GNOME/gnome-panel/-/commit/4ed46751373193c10c0dd001013c396d3ced3118
    https://gitlab.gnome.org/GNOME/gnome-panel/-/commit/551cac1ea3f591e917e16474079f675ceac5e89a
    
    Remove these buttons as they where never meant to be used as applets.

 gnome-panel/libpanel-util/Makefile.am              |  19 --
 .../org.freedesktop.login1.Manager.xml             |  35 ---
 .../libpanel-util/panel-end-session-dialog.c       | 291 ---------------------
 .../libpanel-util/panel-end-session-dialog.h       |  65 -----
 gnome-panel/libpanel-util/panel-session-manager.c  |  40 ---
 gnome-panel/libpanel-util/panel-session-manager.h  |   1 -
 gnome-panel/panel-action-button.c                  | 116 --------
 gnome-panel/panel-addto-dialog.c                   |   4 -
 gnome-panel/panel-enums.h                          |   4 -
 gnome-panel/panel-icon-names.h                     |   3 -
 modules/menu/gp-lock-logout.c                      |   8 +-
 11 files changed, 4 insertions(+), 582 deletions(-)
---
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index a5fcd1259..3faeea3f1 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -3,7 +3,6 @@ NULL =
 noinst_LTLIBRARIES = libpanel-util.la
 
 libpanel_util_la_CFLAGS = \
-       -DDATADIR=\""$(datadir)"\" \
        -I$(srcdir) \
        -I$(top_builddir)/gnome-panel/libpanel-util \
        $(PANEL_CFLAGS) \
@@ -11,25 +10,11 @@ libpanel_util_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(NULL)
 
-BUILT_SOURCES =                        \
-       dbus-login1-manager.c \
-       dbus-login1-manager.h
-
-dbus-login1-manager.h:
-dbus-login1-manager.c: org.freedesktop.login1.Manager.xml Makefile.am
-       $(AM_V_GEN) gdbus-codegen \
-               --interface-prefix=org.freedesktop \
-               --generate-c-code dbus-login1-manager \
-               $(srcdir)/org.freedesktop.login1.Manager.xml
-
 libpanel_util_la_SOURCES =             \
-       $(BUILT_SOURCES)                \
        panel-cleanup.c                 \
        panel-cleanup.h                 \
        panel-dconf.c                   \
        panel-dconf.h                   \
-       panel-end-session-dialog.c \
-       panel-end-session-dialog.h \
        panel-error.c                   \
        panel-error.h                   \
        panel-glib.c                    \
@@ -51,8 +36,4 @@ libpanel_util_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
-EXTRA_DIST = \
-       org.freedesktop.login1.Manager.xml \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnome-panel/libpanel-util/panel-session-manager.c 
b/gnome-panel/libpanel-util/panel-session-manager.c
index 6cf840144..52689709c 100644
--- a/gnome-panel/libpanel-util/panel-session-manager.c
+++ b/gnome-panel/libpanel-util/panel-session-manager.c
@@ -101,46 +101,6 @@ panel_session_manager_request_shutdown (PanelSessionManager *manager)
                           manager);
 }
 
-static void
-reboot_ready_callback (GObject      *source_object,
-                       GAsyncResult *res,
-                       gpointer      user_data)
-{
-       PanelSessionManager *manager = (PanelSessionManager *) user_data;
-       GError *error = NULL;
-       GVariant *ret;
-
-       ret = g_dbus_proxy_call_finish (manager->priv->session_proxy, res, &error);
-       if (ret) {
-               g_variant_unref (ret);
-       }
-
-       if (error) {
-               g_warning ("Could not ask session manager to reboot: %s", error->message);
-               g_error_free (error);
-       }
-}
-
-void
-panel_session_manager_request_reboot (PanelSessionManager *manager)
-{
-       g_return_if_fail (PANEL_IS_SESSION_MANAGER (manager));
-
-       if (!manager->priv->session_proxy) {
-               g_warning ("Session manager service not available.");
-               return;
-       }
-
-       g_dbus_proxy_call (manager->priv->session_proxy,
-                          "Reboot",
-                          NULL,
-                          G_DBUS_CALL_FLAGS_NONE,
-                          -1,
-                          NULL,
-                          (GAsyncReadyCallback) reboot_ready_callback,
-                          manager);
-}
-
 gboolean
 panel_session_manager_is_shutdown_available (PanelSessionManager *manager)
 {
diff --git a/gnome-panel/libpanel-util/panel-session-manager.h 
b/gnome-panel/libpanel-util/panel-session-manager.h
index 65a4e6770..4fb14800b 100644
--- a/gnome-panel/libpanel-util/panel-session-manager.h
+++ b/gnome-panel/libpanel-util/panel-session-manager.h
@@ -54,7 +54,6 @@ GType panel_session_manager_get_type (void);
 PanelSessionManager *panel_session_manager_get (void);
 
 void panel_session_manager_request_shutdown (PanelSessionManager *session);
-void panel_session_manager_request_reboot   (PanelSessionManager *session);
 
 gboolean panel_session_manager_is_shutdown_available (PanelSessionManager *session);
 
diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
index bfeaf9c78..cfdc3f9bf 100644
--- a/gnome-panel/panel-action-button.c
+++ b/gnome-panel/panel-action-button.c
@@ -32,7 +32,6 @@
 
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-glib.h>
-#include <libpanel-util/panel-end-session-dialog.h>
 #include <libpanel-util/panel-session-manager.h>
 #include <libpanel-util/panel-show.h>
 
@@ -67,10 +66,6 @@ static PanelEnumStringPair panel_action_type_map [] = {
        { PANEL_ACTION_NONE,           "none"           },
        { PANEL_ACTION_RUN,            "run"            },
        { PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
-       { PANEL_ACTION_HIBERNATE,      "hibernate"      },
-       { PANEL_ACTION_SUSPEND,        "suspend"        },
-       { PANEL_ACTION_HYBRID_SLEEP,   "hybrid-sleep"   },
-       { PANEL_ACTION_REBOOT,         "reboot"         },
        { PANEL_ACTION_SHUTDOWN,       "shutdown"       },
        { 0,                           NULL             },
 };
@@ -104,81 +99,6 @@ panel_enum_to_string (gint enum_value)
        return NULL;
 }
 
-static void
-panel_action_hibernate (GtkWidget *widget)
-{
-       PanelEndSessionDialog *dialog;
-
-       dialog = panel_end_session_dialog_get ();
-       panel_end_session_dialog_request_hibernate (dialog);
-}
-
-static gboolean
-panel_action_hibernate_is_disabled (void)
-{
-       PanelEndSessionDialog *dialog;
-
-       if (panel_lockdown_get_disable_log_out_s ())
-               return TRUE;
-
-       dialog = panel_end_session_dialog_get ();
-
-       return (!panel_end_session_dialog_is_hibernate_available (dialog));
-}
-
-static void
-panel_action_suspend (GtkWidget *widget)
-{
-       PanelEndSessionDialog *dialog;
-
-       dialog = panel_end_session_dialog_get ();
-       panel_end_session_dialog_request_suspend (dialog);
-}
-
-static gboolean
-panel_action_suspend_is_disabled (void)
-{
-       PanelEndSessionDialog *dialog;
-
-       if (panel_lockdown_get_disable_log_out_s ())
-               return TRUE;
-
-       dialog = panel_end_session_dialog_get ();
-
-       return (!panel_end_session_dialog_is_suspend_available (dialog));
-}
-
-static void
-panel_action_hybrid_sleep  (GtkWidget *widget)
-{
-       PanelEndSessionDialog *dialog;
-
-       dialog = panel_end_session_dialog_get ();
-       panel_end_session_dialog_request_hybrid_sleep (dialog);
-}
-
-static gboolean
-panel_action_hybrid_sleep_is_disabled (void)
-{
-       PanelEndSessionDialog *dialog;
-
-       if (panel_lockdown_get_disable_log_out_s ())
-               return TRUE;
-
-       dialog = panel_end_session_dialog_get ();
-
-       return (!panel_end_session_dialog_is_hybrid_sleep_available (dialog));
-}
-
-static void
-panel_action_reboot (GtkWidget *widget)
-{
-       PanelSessionManager *manager;
-
-       manager = panel_session_manager_get ();
-       panel_session_manager_request_reboot (manager);
-}
-
 static void
 panel_action_shutdown (GtkWidget *widget)
 {
@@ -255,42 +175,6 @@ static PanelAction actions [] = {
                panel_action_force_quit,
                panel_lockdown_get_disable_force_quit_s
        },
-       {
-               PANEL_ACTION_HIBERNATE,
-               PANEL_ICON_HIBERNATE,
-               N_("Hibernate"),
-               NULL,
-               "ACTION:hibernate:NEW",
-               panel_action_hibernate,
-               panel_action_hibernate_is_disabled
-       },
-       {
-               PANEL_ACTION_SUSPEND,
-               PANEL_ICON_SUSPEND,
-               N_("Suspend"),
-               NULL,
-               "ACTION:suspend:NEW",
-               panel_action_suspend,
-               panel_action_suspend_is_disabled
-       },
-       {
-               PANEL_ACTION_HYBRID_SLEEP,
-               PANEL_ICON_SUSPEND,
-               N_("Hybrid sleep"),
-               NULL,
-               "ACTION:hybrid-sleep:NEW",
-               panel_action_hybrid_sleep,
-               panel_action_hybrid_sleep_is_disabled
-       },
-       {
-               PANEL_ACTION_REBOOT,
-               PANEL_ICON_REBOOT,
-               N_("Restart"),
-               N_("Restart the computer"),
-               "ACTION:reboot:NEW",
-               panel_action_reboot,
-               panel_action_shutdown_reboot_is_disabled
-       },
        {
                PANEL_ACTION_SHUTDOWN,
                PANEL_ICON_SHUTDOWN,
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index edc7a9b43..c57adf902 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -112,10 +112,6 @@ panel_addto_prepend_internal_applets (GSList *list)
        for (i = 1; i < PANEL_ACTION_LAST; i++) {
                PanelAddtoItemInfo *info;
 
-               if (i == PANEL_ACTION_REBOOT || i == PANEL_ACTION_HYBRID_SLEEP
-                   || i == PANEL_ACTION_SUSPEND || i == PANEL_ACTION_HIBERNATE)
-                       continue;
-
                if (panel_action_get_is_disabled (i))
                        continue;
 
diff --git a/gnome-panel/panel-enums.h b/gnome-panel/panel-enums.h
index b0bef1864..8ebc1dea7 100644
--- a/gnome-panel/panel-enums.h
+++ b/gnome-panel/panel-enums.h
@@ -40,10 +40,6 @@ typedef enum {
         PANEL_ACTION_NONE = 0,
         PANEL_ACTION_RUN,
        PANEL_ACTION_FORCE_QUIT,
-       PANEL_ACTION_HIBERNATE,
-       PANEL_ACTION_SUSPEND,
-       PANEL_ACTION_HYBRID_SLEEP,
-       PANEL_ACTION_REBOOT,
        PANEL_ACTION_SHUTDOWN,
         PANEL_ACTION_LAST
 } PanelActionButtonType;
diff --git a/gnome-panel/panel-icon-names.h b/gnome-panel/panel-icon-names.h
index de26633bd..5bdb8827e 100644
--- a/gnome-panel/panel-icon-names.h
+++ b/gnome-panel/panel-icon-names.h
@@ -15,15 +15,12 @@
 #define PANEL_ICON_FOLDER_VIDEOS       "folder-videos"
 #define PANEL_ICON_FORCE_QUIT          "gnome-panel-force-quit"
 #define PANEL_ICON_HOME                        "user-home"
-#define PANEL_ICON_HIBERNATE           "gnome-panel-hibernate"
 #define PANEL_ICON_LAUNCHER            "gnome-panel-launcher"
 #define PANEL_ICON_NETWORK             "network-workgroup"
 #define PANEL_ICON_PANEL               "gnome-panel"
-#define PANEL_ICON_REBOOT              "view-refresh"
 #define PANEL_ICON_REMOTE              "applications-internet"
 #define PANEL_ICON_RUN                 "system-run"
 #define PANEL_ICON_SHUTDOWN            "system-shutdown"
-#define PANEL_ICON_SUSPEND             "gnome-panel-suspend"
 #define PANEL_ICON_UNKNOWN             "image-missing"
 
 #endif /* PANEL_ICON_NAMES_H */
diff --git a/modules/menu/gp-lock-logout.c b/modules/menu/gp-lock-logout.c
index c034b2875..8b07db464 100644
--- a/modules/menu/gp-lock-logout.c
+++ b/modules/menu/gp-lock-logout.c
@@ -1080,7 +1080,7 @@ gp_lock_logout_append_to_menu (GpLockLogout *lock_logout,
     {
       label = _("Hibernate");
       tooltip = NULL;
-      drag_id = "ACTION:hibernate:NEW";
+      drag_id = NULL;
 
       hibernate = create_menu_item (lock_logout,
                                     "gnome-panel-hibernate",
@@ -1097,7 +1097,7 @@ gp_lock_logout_append_to_menu (GpLockLogout *lock_logout,
     {
       label = _("Suspend");
       tooltip = NULL;
-      drag_id = "ACTION:suspend:NEW";
+      drag_id = NULL;
 
       suspend = create_menu_item (lock_logout,
                                   "gnome-panel-suspend",
@@ -1114,7 +1114,7 @@ gp_lock_logout_append_to_menu (GpLockLogout *lock_logout,
     {
       label = _("Hybrid Sleep");
       tooltip = NULL;
-      drag_id = "ACTION:hybrid-sleep:NEW";
+      drag_id = NULL;
 
       hybrid_sleep = create_menu_item (lock_logout,
                                        "gnome-panel-suspend",
@@ -1133,7 +1133,7 @@ gp_lock_logout_append_to_menu (GpLockLogout *lock_logout,
     {
       label = _("Restart");
       tooltip = _("Restart the computer");
-      drag_id = "ACTION:reboot:NEW";
+      drag_id = NULL;
 
       reboot = create_menu_item (lock_logout,
                                  "view-refresh",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]