diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-30 14:20:21 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-30 14:20:21 -0500 |
| commit | 8ca677a0b7aa11b48f1d6ee2aec4f06f1381ff5a (patch) | |
| tree | b39ba3b56c31533cea86dbfdbf7a41a6aae753b4 /src/indicator-application.c | |
| parent | 2d7ae83da48335e8a9354006110de128ccb42caf (diff) | |
| parent | d3026a23f611f1790d8c9dc2e49a50217f1fe5aa (diff) | |
| download | ayatana-indicator-application-8ca677a0b7aa11b48f1d6ee2aec4f06f1381ff5a.tar.gz ayatana-indicator-application-8ca677a0b7aa11b48f1d6ee2aec4f06f1381ff5a.tar.bz2 ayatana-indicator-application-8ca677a0b7aa11b48f1d6ee2aec4f06f1381ff5a.zip | |
* Upstream Merge
* Setup the icons to use the -panel variants even when falling
back to status icons. (LP: #547072)
* Change python bindings to use _with_path so that they can set
the icon path. (LP: #527061)
Diffstat (limited to 'src/indicator-application.c')
| -rw-r--r-- | src/indicator-application.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/indicator-application.c b/src/indicator-application.c index b681a24..16c3a9f 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -447,7 +447,12 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co /* We make a long name using the suffix, and if that icon is available we want to use it. Otherwise we'll just use the name we were given. */ - gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); + gchar * longname = NULL; + if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) { + longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); + } else { + longname = g_strdup(iconname); + } app->entry.image = indicator_image_helper(longname); g_free(longname); |