aboutsummaryrefslogtreecommitdiff
path: root/src/app-indicator.c
diff options
context:
space:
mode:
authorLuke Yelavich <luke.yelavich@canonical.com>2011-02-08 17:55:35 +1100
committerLuke Yelavich <luke.yelavich@canonical.com>2011-02-08 17:55:35 +1100
commitfffab2e1e8d991a41cc591ceaca77c8a40f31f33 (patch)
tree357a2665a5cdda03ee4635d154a31c23b5adbf98 /src/app-indicator.c
parent31519e77b290d832f287c1daa6a90f8d6e11b136 (diff)
downloadlibayatana-appindicator-fffab2e1e8d991a41cc591ceaca77c8a40f31f33.tar.gz
libayatana-appindicator-fffab2e1e8d991a41cc591ceaca77c8a40f31f33.tar.bz2
libayatana-appindicator-fffab2e1e8d991a41cc591ceaca77c8a40f31f33.zip
accessible_name -> accessible_desc
Diffstat (limited to 'src/app-indicator.c')
-rw-r--r--src/app-indicator.c124
1 files changed, 62 insertions, 62 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index de9dd39..a5045e3 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -80,9 +80,9 @@ struct _AppIndicatorPrivate {
guint32 ordering_index;
gchar * label;
gchar * label_guide;
- gchar * accessible_name;
+ gchar * accessible_desc;
guint label_change_idle;
- guint accessible_name_change_idle;
+ guint accessible_desc_change_idle;
GtkStatusIcon * status_icon;
gint fallback_timer;
@@ -106,7 +106,7 @@ enum {
CONNECTION_CHANGED,
NEW_ICON_THEME_PATH,
SCROLL_EVENT,
- NEW_ACCESSIBLE_NAME,
+ NEW_ACCESSIBLE_DESC,
LAST_SIGNAL
};
@@ -127,7 +127,7 @@ enum {
PROP_LABEL_GUIDE,
PROP_ORDERING_INDEX,
PROP_DBUS_MENU_SERVER,
- PROP_ACCESSIBLE_NAME
+ PROP_ACCESSIBLE_DESC
};
/* The strings so that they can be slowly looked up. */
@@ -142,7 +142,7 @@ enum {
#define PROP_LABEL_GUIDE_S "label-guide"
#define PROP_ORDERING_INDEX_S "ordering-index"
#define PROP_DBUS_MENU_SERVER_S "dbus-menu-server"
-#define PROP_ACCESSIBLE_NAME_S "accessible-name"
+#define PROP_ACCESSIBLE_DESC_S "accessible-desc"
/* Private macro, shhhh! */
#define APP_INDICATOR_GET_PRIVATE(o) \
@@ -170,7 +170,7 @@ static void app_indicator_set_property (GObject * object, guint prop_id, const G
static void app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
/* Other stuff */
static void signal_label_change (AppIndicator * self);
-static void signal_accessible_name_change (AppIndicator * self);
+static void signal_accessible_desc_change (AppIndicator * self);
static void check_connect (AppIndicator * self);
static void register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data);
static void start_fallback_timer (AppIndicator * self, gboolean disable_timeout);
@@ -352,7 +352,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- AppIndicator:accessible-name:
+ AppIndicator:accessible-desc:
A string that describes the indicator in text form. This string is
used to identify the indicator to users of assistive technologies, such
@@ -361,10 +361,10 @@ app_indicator_class_init (AppIndicatorClass *klass)
information about the state of the indicator to the user.
*/
g_object_class_install_property(object_class,
- PROP_ACCESSIBLE_NAME,
- g_param_spec_string (PROP_ACCESSIBLE_NAME_S,
+ PROP_ACCESSIBLE_DESC,
+ g_param_spec_string (PROP_ACCESSIBLE_DESC_S,
"A string that describes the indicator in text form.",
- "This string shoudl convey a description of the indicator's current status, for users who use assistive technologies.",
+ "This string should convey a description of the indicator's current status, for users who use assistive technologies.",
NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
@@ -465,16 +465,16 @@ app_indicator_class_init (AppIndicatorClass *klass)
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
/**
- AppIndicator::new-accessible-name:
+ AppIndicator::new-accessible-desc:
@arg0: The #AppIndicator object
- @arg1: The string for the accessible name
+ @arg1: The string for the accessible description
- Emitted when #AppIndicator:accessible_name changes.
+ Emitted when #AppIndicator:accessible_desc changes.
*/
- signals[NEW_ACCESSIBLE_NAME] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_NAME,
+ signals[NEW_ACCESSIBLE_DESC] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC,
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (AppIndicatorClass, new_accessible_name),
+ G_STRUCT_OFFSET (AppIndicatorClass, new_accessible_desc),
NULL, NULL,
_application_service_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -583,7 +583,7 @@ app_indicator_init (AppIndicator *self)
priv->label = NULL;
priv->label_guide = NULL;
priv->label_change_idle = 0;
- priv->accessible_name_change_idle = 0;
+ priv->accessible_desc_change_idle = 0;
priv->watcher_proxy = NULL;
priv->connection = NULL;
@@ -647,9 +647,9 @@ app_indicator_dispose (GObject *object)
priv->label_change_idle = 0;
}
- if (priv->accessible_name_change_idle != 0) {
- g_source_remove(priv->accessible_name_change_idle);
- priv->accessible_name_change_idle = 0;
+ if (priv->accessible_desc_change_idle != 0) {
+ g_source_remove(priv->accessible_desc_change_idle);
+ priv->accessible_desc_change_idle = 0;
}
if (priv->menu != NULL) {
@@ -729,9 +729,9 @@ app_indicator_finalize (GObject *object)
priv->label_guide = NULL;
}
- if (priv->accessible_name != NULL) {
- g_free(priv->accessible_name);
- priv->accessible_name = NULL;
+ if (priv->accessible_desc != NULL) {
+ g_free(priv->accessible_desc);
+ priv->accessible_desc = NULL;
}
if (priv->path != NULL) {
@@ -845,21 +845,21 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
}
break;
}
- case PROP_ACCESSIBLE_NAME: {
- gchar * olda11yname = priv->accessible_name;
- priv->accessible_name = g_value_dup_string(value);
+ case PROP_ACCESSIBLE_DESC: {
+ gchar * olda11ydesc = priv->accessible_desc;
+ priv->accessible_desc = g_value_dup_string(value);
- if (g_strcmp0(olda11yname, priv->accessible_name) != 0) {
- signal_accessible_name_change(APP_INDICATOR(object));
+ if (g_strcmp0(olda11ydesc, priv->accessible_desc) != 0) {
+ signal_accessible_desc_change(APP_INDICATOR(object));
}
- if (priv->accessible_name != NULL && priv->accessible_name[0] == '\0') {
- g_free(priv->accessible_name);
- priv->accessible_name = NULL;
+ if (priv->accessible_desc != NULL && priv->accessible_desc[0] == '\0') {
+ g_free(priv->accessible_desc);
+ priv->accessible_desc = NULL;
}
- if (olda11yname != NULL) {
- g_free(olda11yname);
+ if (olda11ydesc != NULL) {
+ g_free(olda11ydesc);
}
break;
}
@@ -941,8 +941,8 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
g_value_set_string (value, priv->label_guide);
break;
- case PROP_ACCESSIBLE_NAME:
- g_value_set_string (value, priv->accessible_name);
+ case PROP_ACCESSIBLE_DESC:
+ g_value_set_string (value, priv->accessible_desc);
break;
case PROP_ORDERING_INDEX:
@@ -1067,8 +1067,8 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar *
return g_variant_new_string(priv->label_guide ? priv->label_guide : "");
} else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) {
return g_variant_new_uint32(priv->ordering_index);
- } else if (g_strcmp0(property, "AccessibleName") == 0) {
- return g_variant_new_string(priv->accessible_name ? priv->accessible_name : "");
+ } else if (g_strcmp0(property, "AccessibleDesc") == 0) {
+ return g_variant_new_string(priv->accessible_desc ? priv->accessible_desc : "");
}
*error = g_error_new(0, 0, "Unknown property: %s", property);
@@ -1125,17 +1125,17 @@ signal_label_change (AppIndicator * self)
return;
}
-/* Sends the accessible name changed signal and resets the source ID */
+/* Sends the accessible description changed signal and resets the source ID */
static gboolean
-signal_accessible_name_change_idle (gpointer user_data)
+signal_accessible_desc_change_idle (gpointer user_data)
{
AppIndicator * self = (AppIndicator *)user_data;
AppIndicatorPrivate *priv = self->priv;
- gchar * accessible_name = priv->accessible_name != NULL ? priv->accessible_name : "";
+ gchar * accessible_desc = priv->accessible_desc != NULL ? priv->accessible_desc : "";
- g_signal_emit(G_OBJECT(self), signals[NEW_ACCESSIBLE_NAME], 0,
- accessible_name, TRUE);
+ g_signal_emit(G_OBJECT(self), signals[NEW_ACCESSIBLE_DESC], 0,
+ accessible_desc, TRUE);
if (priv->dbus_registration != 0 && priv->connection != NULL) {
GError * error = NULL;
@@ -1143,34 +1143,34 @@ signal_accessible_name_change_idle (gpointer user_data)
NULL,
priv->path,
NOTIFICATION_ITEM_DBUS_IFACE,
- "NewAccessibleName",
- g_variant_new("(s)", accessible_name),
+ "NewAccessibleDesc",
+ g_variant_new("(s)", accessible_desc),
&error);
if (error != NULL) {
- g_warning("Unable to send signal for NewIcon: %s", error->message);
+ g_warning("Unable to send signal for NewAccessibleDesc: %s", error->message);
g_error_free(error);
}
}
- priv->accessible_name_change_idle = 0;
+ priv->accessible_desc_change_idle = 0;
return FALSE;
}
-/* Sets up an idle function to send the accessible name changed
- signal so that we don't send it too many times. */
+/* Sets up an idle function to send the accessible description
+ changed signal so that we don't send it too many times. */
static void
-signal_accessible_name_change (AppIndicator * self)
+signal_accessible_desc_change (AppIndicator * self)
{
AppIndicatorPrivate *priv = self->priv;
/* don't set it twice */
- if (priv->accessible_name_change_idle != 0) {
+ if (priv->accessible_desc_change_idle != 0) {
return;
}
- priv->accessible_name_change_idle = g_idle_add(signal_accessible_name_change_idle, self);
+ priv->accessible_desc_change_idle = g_idle_add(signal_accessible_desc_change_idle, self);
return;
}
@@ -1840,22 +1840,22 @@ app_indicator_set_label (AppIndicator *self, const gchar * label, const gchar *
}
/**
- app_indicator_set_accessible_name:
+ app_indicator_set_accessible_desc:
@self: The #AppIndicator object to use
- @accessible_name: The accessible name used by assistive technologies.
+ @accessible_desc: The accessible description used by assistive technologies.
- This is a wrapper function for the #AppIndicator:accessible_name
- property. This function can take #NULL as @accessible_name and
+ This is a wrapper function for the #AppIndicator:accessible_desc
+ property. This function can take #NULL as @accessible_desc and
will clear the entry.
*/
void
-app_indicator_set_accessible_name (AppIndicator *self, const gchar * accessible_name)
+app_indicator_set_accessible_desc (AppIndicator *self, const gchar * accessible_desc)
{
g_return_if_fail (IS_APP_INDICATOR (self));
- /* Note: The accessible name can be NULL, it's okay */
+ /* Note: The accessible description can be NULL, it's okay */
g_object_set(G_OBJECT(self),
- PROP_ACCESSIBLE_NAME_S, accessible_name == NULL ? "" : accessible_name,
+ PROP_ACCESSIBLE_DESC_S, accessible_desc == NULL ? "" : accessible_desc,
NULL);
return;
@@ -2156,19 +2156,19 @@ app_indicator_get_label_guide (AppIndicator *self)
}
/**
- app_indicator_get_accessible_name:
+ app_indicator_get_accessible_desc:
@self: The #AppIndicator object to use
- Wrapper function for property #AppIndicator:accessible_name.
+ Wrapper function for property #AppIndicator:accessible_desc.
- Return value: The current accessible name.
+ Return value: The current accessible description.
*/
const gchar *
-app_indicator_get_accessible_name (AppIndicator *self)
+app_indicator_get_accessible_desc (AppIndicator *self)
{
g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
- return self->priv->accessible_name;
+ return self->priv->accessible_desc;
}
/**