aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-08 09:23:36 -0600
committerTed Gould <ted@gould.cx>2010-02-08 09:23:36 -0600
commit585f9e3a0d77d945e9270b95c2fba77242ba06b9 (patch)
tree363c4aa0aab02907f47d3b85eabbc07c13fc88a4 /src
parent5bd28754757d8fa61fdad1d7f065d1c25c75befa (diff)
parent821e84539deec041e24410ce83f5b0c196f13814 (diff)
downloadayatana-indicator-application-585f9e3a0d77d945e9270b95c2fba77242ba06b9.tar.gz
ayatana-indicator-application-585f9e3a0d77d945e9270b95c2fba77242ba06b9.tar.bz2
ayatana-indicator-application-585f9e3a0d77d945e9270b95c2fba77242ba06b9.zip
* Upstream Merge
* Fixing copying of the attention icon * Adding status changing to the example application * Adding a test for status changing getting sent over DBus.
Diffstat (limited to 'src')
-rw-r--r--src/application-service-appstore.c2
-rw-r--r--src/indicator-application.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 70fab18..c784495 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -224,7 +224,7 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU));
if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) {
- app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
+ app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME));
}
gpointer icon_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_PATH);
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 6c053a9..269150a 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -407,8 +407,10 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn
just use the name we were given. */
gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), longname)) {
+ g_debug("Setting icon on %d to %s", position, longname);
gtk_image_set_from_icon_name(app->entry.image, longname, GTK_ICON_SIZE_MENU);
} else {
+ g_debug("Setting icon on %d to %s", position, iconname);
gtk_image_set_from_icon_name(app->entry.image, iconname, GTK_ICON_SIZE_MENU);
}
g_free(longname);