gnome-control-center r9024 - branches/gnome-2-24/capplets/common

[jensg svn gnome org]

Author: jensg
Date: Mon Sep 29 20:03:36 2008
New Revision: 9024
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9024&view=rev

Log:
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)


Modified:
   branches/gnome-2-24/capplets/common/ChangeLog
   branches/gnome-2-24/capplets/common/gnome-theme-info.c

Modified: branches/gnome-2-24/capplets/common/gnome-theme-info.c
==============================================================================
--- branches/gnome-2-24/capplets/common/gnome-theme-info.c	(original)
+++ branches/gnome-2-24/capplets/common/gnome-theme-info.c	Mon Sep 29 20:03:36 2008
@@ -404,10 +404,13 @@
   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 */