aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator/app-indicator.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 15:51:47 -0500
committerTed Gould <ted@gould.cx>2010-04-01 15:51:47 -0500
commit45e7b47b25e7dcb713c2d592730587c847693b18 (patch)
treecad54405358ffc25f1afce96da2e9835b8c97569 /src/libappindicator/app-indicator.c
parent70600e1fad7decbd5c1bf98f17a01f05469919f3 (diff)
parentd005a22755a0dd3b9f752d66a0479272a09663ae (diff)
downloadlibayatana-appindicator-45e7b47b25e7dcb713c2d592730587c847693b18.tar.gz
libayatana-appindicator-45e7b47b25e7dcb713c2d592730587c847693b18.tar.bz2
libayatana-appindicator-45e7b47b25e7dcb713c2d592730587c847693b18.zip
* New upstream release.
* Don't set the fallback timer if we're already in a fallback mode to avoid unfalling back excessively. (LP: #529052) * Fix distcheck of documentation
Diffstat (limited to 'src/libappindicator/app-indicator.c')
-rw-r--r--src/libappindicator/app-indicator.c67
1 files changed, 33 insertions, 34 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 4076334..132e279 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -47,6 +47,11 @@ License version 3 and version 2.1 along with this program. If not, see
/**
AppIndicatorPrivate:
+
+ All of the private data in an instance of a
+ application indicator.
+*/
+/* Private Fields
@id: The ID of the indicator. Maps to AppIndicator::id.
@category: Which category the indicator is. Maps to AppIndicator::category.
@status: The status of the indicator. Maps to AppIndicator::status.
@@ -54,11 +59,9 @@ License version 3 and version 2.1 along with this program. If not, see
@attention_icon_name: The name of the attention icon to use. Maps to AppIndicator::attention-icon-name.
@menu: The menu for this indicator. Maps to AppIndicator::menu
@watcher_proxy: The proxy connection to the watcher we're connected to. If we're not connected to one this will be #NULL.
-
- All of the private data in an instance of a
- application indicator.
*/
struct _AppIndicatorPrivate {
+ /*< Private >*/
/* Properties */
gchar *id;
gchar *clean_id;
@@ -458,8 +461,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
{
AppIndicator *self = APP_INDICATOR (object);
AppIndicatorPrivate *priv = self->priv;
- gchar *long_name;
- const gchar *instr;
GEnumValue *enum_val;
switch (prop_id) {
@@ -502,26 +503,15 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
break;
case PROP_ICON_NAME:
- instr = g_value_get_string (value);
-
- if (g_strcmp0 (priv->icon_name, instr) != 0)
- {
- if (priv->icon_name)
- g_free (priv->icon_name);
-
- long_name = append_panel_icon_suffix (instr);
- priv->icon_name = long_name;
-
- g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
- }
-
+ app_indicator_set_icon (APP_INDICATOR (object),
+ g_value_get_string (value));
check_connect (self);
break;
case PROP_ATTENTION_ICON_NAME:
app_indicator_set_attention_icon (APP_INDICATOR (object),
g_value_get_string (value));
- break;
+ break;
case PROP_ICON_THEME_PATH:
if (priv->icon_path != NULL) {
@@ -781,6 +771,11 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout)
return;
}
+ if (priv->status_icon != NULL) {
+ /* We're already fallen back. Let's not do it again. */
+ return;
+ }
+
if (priv->dbus_proxy == NULL) {
/* NOTE: Read the comment on setup_name_owner_proxy */
g_idle_add(setup_name_owner_proxy, self);
@@ -867,30 +862,36 @@ status_icon_changes (AppIndicator * self, gpointer data)
{
GtkStatusIcon * icon = GTK_STATUS_ICON(data);
GIcon *themed_icon = NULL;
+ gchar *longname = NULL;
switch (app_indicator_get_status(self)) {
case APP_INDICATOR_STATUS_PASSIVE:
- themed_icon =
- g_themed_icon_new_with_default_fallbacks (app_indicator_get_icon (self));
+ longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+ themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
gtk_status_icon_set_visible(icon, FALSE);
gtk_status_icon_set_from_gicon(icon, themed_icon);
break;
case APP_INDICATOR_STATUS_ACTIVE:
- themed_icon =
- g_themed_icon_new_with_default_fallbacks (app_indicator_get_icon (self));
+ longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+ themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
gtk_status_icon_set_from_gicon(icon, themed_icon);
gtk_status_icon_set_visible(icon, TRUE);
break;
case APP_INDICATOR_STATUS_ATTENTION:
- themed_icon =
- g_themed_icon_new_with_default_fallbacks (app_indicator_get_attention_icon (self));
+ longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
+ themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
gtk_status_icon_set_from_gicon(icon, themed_icon);
gtk_status_icon_set_visible(icon, TRUE);
break;
};
- if (themed_icon)
+ if (themed_icon) {
g_object_unref (themed_icon);
+ }
+
+ if (longname) {
+ g_free(longname);
+ }
return;
}
@@ -1045,8 +1046,6 @@ app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status)
void
app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
{
- gchar *long_name;
-
g_return_if_fail (IS_APP_INDICATOR (self));
g_return_if_fail (icon_name != NULL);
@@ -1055,11 +1054,12 @@ app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
if (self->priv->attention_icon_name)
g_free (self->priv->attention_icon_name);
- long_name = append_panel_icon_suffix (icon_name);
- self->priv->attention_icon_name = long_name;
+ self->priv->attention_icon_name = g_strdup(icon_name);
g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
}
+
+ return;
}
/**
@@ -1074,8 +1074,6 @@ app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
void
app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
{
- gchar *long_name;
-
g_return_if_fail (IS_APP_INDICATOR (self));
g_return_if_fail (icon_name != NULL);
@@ -1084,11 +1082,12 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
if (self->priv->icon_name)
g_free (self->priv->icon_name);
- long_name = append_panel_icon_suffix (icon_name);
- self->priv->icon_name = long_name;
+ self->priv->icon_name = g_strdup(icon_name);
g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
}
+
+ return;
}
static void