aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 14:57:30 -0500
committerTed Gould <ted@gould.cx>2010-04-01 14:57:30 -0500
commitbf2c8f10f0bf8b18693f9987e420a87f8b060753 (patch)
treec60117e2f3076ffd71b338d28eb64dc10acaca14 /src
parentd6bb68c1ba7e9c0d3cfe1f7f4aeeacd01f3af55b (diff)
parent5055af870eadff1cdd0f472298047514e25b3af0 (diff)
downloadlibayatana-appindicator-bf2c8f10f0bf8b18693f9987e420a87f8b060753.tar.gz
libayatana-appindicator-bf2c8f10f0bf8b18693f9987e420a87f8b060753.tar.bz2
libayatana-appindicator-bf2c8f10f0bf8b18693f9987e420a87f8b060753.zip
Catch up to trunk
Diffstat (limited to 'src')
-rw-r--r--src/libappindicator/app-indicator.c53
-rw-r--r--src/libappindicator/app-indicator.h3
2 files changed, 24 insertions, 32 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index d7c8a8d..f82587e 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -458,8 +458,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 +500,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) {
@@ -872,30 +859,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;
}
@@ -1050,8 +1043,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);
@@ -1060,11 +1051,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;
}
/**
@@ -1079,8 +1071,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);
@@ -1089,11 +1079,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
diff --git a/src/libappindicator/app-indicator.h b/src/libappindicator/app-indicator.h
index 03656ce..d490c8c 100644
--- a/src/libappindicator/app-indicator.h
+++ b/src/libappindicator/app-indicator.h
@@ -189,6 +189,7 @@ struct _AppIndicatorClass {
/**
AppIndicator:
@parent: Parent object.
+ @priv: Internal data.
A application indicator represents the values that are needed to show a
unique status in the panel for an application. In general, applications
@@ -198,7 +199,7 @@ struct _AppIndicatorClass {
struct _AppIndicator {
GObject parent;
- AppIndicatorPrivate *priv;
+ AppIndicatorPrivate *priv;
};
/* GObject Stuff */