summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGymnasiast <[email protected]>2014-07-08 13:12:49 +0200
committerinfirit <[email protected]>2015-08-29 14:07:19 +0200
commit9d76273d550a6ec24e716beb63e3c31c6f71552b (patch)
treebaf90936d4b6fd16adc90cdac1d9ac9ea49b6dd5
parentf22c5a77f194d54d811cb21916edb5f1fa909b53 (diff)
downloadmate-panel-9d76273d550a6ec24e716beb63e3c31c6f71552b.tar.bz2
mate-panel-9d76273d550a6ec24e716beb63e3c31c6f71552b.tar.xz
Removed obsolete compatibility code
-rw-r--r--mate-panel/applet.c4
-rw-r--r--mate-panel/main.c3
-rw-r--r--mate-panel/panel-action-button.c4
3 files changed, 1 insertions, 10 deletions
diff --git a/mate-panel/applet.c b/mate-panel/applet.c
index d2d8e5d8..516d9ab4 100644
--- a/mate-panel/applet.c
+++ b/mate-panel/applet.c
@@ -67,8 +67,6 @@ mate_panel_applet_set_dnd_enabled (AppletInfo *info,
break;
case PANEL_OBJECT_APPLET:
break;
- case PANEL_OBJECT_LOGOUT:
- case PANEL_OBJECT_LOCK:
case PANEL_OBJECT_ACTION:
panel_action_button_set_dnd_enabled (PANEL_ACTION_BUTTON (info->widget),
dnd_enabled);
@@ -268,8 +266,6 @@ applet_callback_callback (GtkWidget *widget,
PANEL_MENU_BUTTON (menu->info->widget), menu->name);
break;
case PANEL_OBJECT_ACTION:
- case PANEL_OBJECT_LOGOUT:
- case PANEL_OBJECT_LOCK:
panel_action_button_invoke_menu (
PANEL_ACTION_BUTTON (menu->info->widget), menu->name);
break;
diff --git a/mate-panel/main.c b/mate-panel/main.c
index 8a9c3b5d..b26f67e4 100644
--- a/mate-panel/main.c
+++ b/mate-panel/main.c
@@ -40,7 +40,6 @@
GSList *panels = NULL;
GSList *panel_list = NULL;
-static char* deprecated_profile;
static char* layout;
static gboolean replace = FALSE;
static gboolean reset = FALSE;
@@ -48,8 +47,6 @@ static gboolean run_dialog = FALSE;
static const GOptionEntry options[] = {
{ "replace", 0, 0, G_OPTION_ARG_NONE, &replace, N_("Replace a currently running panel"), NULL },
- /* keep this for compatibilty with old MATE < 2.10 */
- { "profile", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &deprecated_profile, NULL, NULL },
/* this feature was request in #mate irc channel */
{ "reset", 0, 0, G_OPTION_ARG_NONE, &reset, N_("Reset the panel configuration to default"), NULL },
/* open run dialog */
diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
index 30e03541..67be0f78 100644
--- a/mate-panel/panel-action-button.c
+++ b/mate-panel/panel-action-button.c
@@ -713,18 +713,16 @@ panel_action_button_load (PanelActionButtonType type,
const char *id)
{
PanelActionButton *button;
- PanelObjectType object_type;
g_return_if_fail (panel != NULL);
button = g_object_new (PANEL_TYPE_ACTION_BUTTON, "action-type", type, NULL);
- object_type = PANEL_OBJECT_ACTION;
button->priv->info = mate_panel_applet_register (GTK_WIDGET (button),
NULL, NULL,
panel, locked, position,
- exactpos, object_type, id);
+ exactpos, PANEL_OBJECT_ACTION, id);
if (!button->priv->info) {
gtk_widget_destroy (GTK_WIDGET (button));
return;