diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2008-09-29 20:03:36 +0000 |
|---|---|---|
| committer | Jens Granseuer <jensg@src.gnome.org> | 2008-09-29 20:03:36 +0000 |
| commit | ce6ca2f553c25469e52a7050f27c79f984b73a2d (patch) | |
| tree | 6c5163ccd0aa2116253a4cd2263ae47d1268d818 | |
| parent | 11db8e8e486f99e94a247198e7fa486a692021f7 (diff) | |
| download | gnome-control-center-ce6ca2f553c25469e52a7050f27c79f984b73a2d.tar.gz | |
Merged from trunk.
2008-09-29 Jens Granseuer <jensgr@gmx.net>
Merged from trunk.
* gnome-theme-info.c: (read_icon_theme): use translated names for
icon themes if available (bug #554272)
svn path=/branches/gnome-2-24/; revision=9024
| -rw-r--r-- | capplets/common/ChangeLog | 7 | ||||
| -rw-r--r-- | capplets/common/gnome-theme-info.c | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 1df4c96e8..efa71532c 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,10 @@ +2008-09-29 Jens Granseuer <jensgr@gmx.net> + + Merged from trunk. + + * gnome-theme-info.c: (read_icon_theme): use translated names for + icon themes if available (bug #554272) + ==================== 2.24.0.1 ==================== 2008-09-02 Jens Granseuer <jensgr@gmx.net> diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c index 77e927fb3..aa4d75b5b 100644 --- a/capplets/common/gnome-theme-info.c +++ b/capplets/common/gnome-theme-info.c @@ -404,10 +404,13 @@ read_icon_theme (GFile *icon_theme_uri) if (icon_theme_ditem == NULL) return NULL; - name = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Name"); - if (name == NULL) { - gnome_desktop_item_unref (icon_theme_ditem); - return NULL; + name = gnome_desktop_item_get_localestring (icon_theme_ditem, "Icon Theme/Name"); + if (!name) { + name = gnome_desktop_item_get_localestring (icon_theme_ditem, GNOME_DESKTOP_ITEM_NAME); + if (!name) { + gnome_desktop_item_unref (icon_theme_ditem); + return NULL; + } } /* If index.theme has no Directories entry, it is only a cursor theme */ |