aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app-indicator.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index a2bcaf2..a95c7c1 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -129,10 +129,7 @@ enum {
PROP_CONNECTED,
PROP_LABEL,
PROP_LABEL_GUIDE,
- PROP_X_LABEL,
- PROP_X_LABEL_GUIDE,
PROP_ORDERING_INDEX,
- PROP_X_ORDERING_INDEX,
PROP_DBUS_MENU_SERVER
};
@@ -147,10 +144,7 @@ enum {
#define PROP_CONNECTED_S "connected"
#define PROP_LABEL_S "label"
#define PROP_LABEL_GUIDE_S "label-guide"
-#define PROP_X_LABEL_S ("x-ayatana-" PROP_LABEL_S)
-#define PROP_X_LABEL_GUIDE_S ("x-ayatana-" PROP_LABEL_GUIDE_S)
#define PROP_ORDERING_INDEX_S "ordering-index"
-#define PROP_X_ORDERING_INDEX_S ("x-ayatana-" PROP_ORDERING_INDEX_S)
#define PROP_DBUS_MENU_SERVER_S "dbus-menu-server"
/* Private macro, shhhh! */
@@ -392,47 +386,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
"A way to override the default ordering of the applications by providing a very specific idea of where this entry should be placed.",
0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- AppIndicator:x-ayatana-ordering-index:
-
- A wrapper for #AppIndicator:ordering-index so that it can match the
- dbus interface currently. It will hopefully be retired, please don't
- use it anywhere.
- */
- g_object_class_install_property(object_class,
- PROP_X_ORDERING_INDEX,
- g_param_spec_uint (PROP_X_ORDERING_INDEX_S,
- "A wrapper, please don't use.",
- "A wrapper, please don't use.",
- 0, G_MAXUINT32, 0,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- /**
- AppIndicator:x-ayatana-label:
-
- Wrapper for #AppIndicator:label. Please use that in all of your
- code.
- */
- g_object_class_install_property(object_class,
- PROP_X_LABEL,
- g_param_spec_string (PROP_X_LABEL_S,
- "A wrapper, please don't use.",
- "A wrapper, please don't use.",
- NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- AppIndicator:x-ayatana-label-guide:
- Wrapper for #AppIndicator:label-guide. Please use that in all of your
- code.
- */
- g_object_class_install_property(object_class,
- PROP_X_LABEL_GUIDE,
- g_param_spec_string (PROP_X_LABEL_GUIDE_S,
- "A wrapper, please don't use.",
- "A wrapper, please don't use.",
- NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
AppIndicator:dbus-menu-server:
@@ -829,7 +783,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
check_connect (self);
break;
- case PROP_X_LABEL:
case PROP_LABEL: {
gchar * oldlabel = priv->label;
priv->label = g_value_dup_string(value);
@@ -848,7 +801,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
}
break;
}
- case PROP_X_LABEL_GUIDE:
case PROP_LABEL_GUIDE: {
gchar * oldguide = priv->label_guide;
priv->label_guide = g_value_dup_string(value);
@@ -867,7 +819,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
}
break;
}
- case PROP_X_ORDERING_INDEX:
case PROP_ORDERING_INDEX:
priv->ordering_index = g_value_get_uint(value);
break;
@@ -948,17 +899,14 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
break;
}
- case PROP_X_LABEL:
case PROP_LABEL:
g_value_set_string (value, priv->label);
break;
- case PROP_X_LABEL_GUIDE:
case PROP_LABEL_GUIDE:
g_value_set_string (value, priv->label_guide);
break;
- case PROP_X_ORDERING_INDEX:
case PROP_ORDERING_INDEX:
g_value_set_uint(value, priv->ordering_index);
break;