aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-08 15:37:45 -0600
committerTed Gould <ted@gould.cx>2010-01-08 15:37:45 -0600
commit7a78594a6017f4c7aab921a778bb186759b5cded (patch)
tree71d883c4ac28e60235cb870f3961a6fcd28bed3d /src/libappindicator
parentaaa7438bff492c735bffa378ef5d38d3452b4e6f (diff)
parentc4b431a4070d84c12b56ba3007356d38006d89ec (diff)
downloadlibayatana-appindicator-7a78594a6017f4c7aab921a778bb186759b5cded.tar.gz
libayatana-appindicator-7a78594a6017f4c7aab921a778bb186759b5cded.tar.bz2
libayatana-appindicator-7a78594a6017f4c7aab921a778bb186759b5cded.zip
* Upstream merge:
* Adding support for icons changing through the service and in the indicator. * Fixing the generated headers for DBus Properties calls * Fixing libappindicator set_icon to set the right icon.
Diffstat (limited to 'src/libappindicator')
-rw-r--r--src/libappindicator/app-indicator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 9a2e2a1..5868a4d 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -698,14 +698,14 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
g_return_if_fail (IS_APP_INDICATOR (self));
g_return_if_fail (icon_name != NULL);
- if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0)
+ if (g_strcmp0 (self->priv->icon_name, icon_name) != 0)
{
- if (self->priv->attention_icon_name)
- g_free (self->priv->attention_icon_name);
+ if (self->priv->icon_name)
+ g_free (self->priv->icon_name);
- self->priv->attention_icon_name = g_strdup (icon_name);
+ self->priv->icon_name = g_strdup (icon_name);
- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
+ g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
}
}