nautilus r14660 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Mon Sep 22 10:02:31 2008
New Revision: 14660
URL: http://svn.gnome.org/viewvc/nautilus?rev=14660&view=rev

Log:
2008-09-22  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-file.c
	(nautilus_file_get_emblem_icons):
	* libnautilus-private/nautilus-icon-info.c:
	* libnautilus-private/nautilus-icon-info.h:
	Support emblem file names that do not start with âemblem-â. Fixes
	#350643.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file.c
   trunk/libnautilus-private/nautilus-icon-info.c
   trunk/libnautilus-private/nautilus-icon-info.h

Modified: trunk/libnautilus-private/nautilus-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file.c	(original)
+++ trunk/libnautilus-private/nautilus-file.c	Mon Sep 22 10:02:31 2008
@@ -5711,7 +5711,7 @@
 {
 	GList *keywords, *l;
 	GList *icons;
-	char *icon_name;
+	char *icon_names[2];
 	char *keyword;
 	int i;
 	GIcon *icon;
@@ -5753,9 +5753,12 @@
 			}
 		}
 		
-		icon_name = nautilus_icon_get_emblem_icon_by_name (keyword);
-		icon = g_themed_icon_new (icon_name);
-		g_free (icon_name);
+
+		icon_names[0] = g_strconcat ("emblem-", keyword, NULL);
+		icon_names[1] = keyword;
+		icon = g_themed_icon_new_from_names (icon_names, 2);
+		g_free (icon_names[0]);
+
 		icons = g_list_prepend (icons, icon);
 	}
 	

Modified: trunk/libnautilus-private/nautilus-icon-info.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-info.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-info.c	Mon Sep 22 10:02:31 2008
@@ -25,8 +25,6 @@
 #include <gio/gio.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 
-#define NAUTILUS_EMBLEM_NAME_PREFIX "emblem-"
-
 struct _NautilusIconInfo
 {
 	GObject parent;
@@ -645,16 +643,6 @@
 }
 
 
-char *
-nautilus_icon_get_emblem_icon_by_name (const char *emblem_name)
-{
-	char *name_with_prefix;
-
-	name_with_prefix = g_strconcat (NAUTILUS_EMBLEM_NAME_PREFIX, emblem_name, NULL);
-
-	return name_with_prefix;
-}
-
 guint
 nautilus_icon_get_emblem_size_for_icon_size (guint size)
 {

Modified: trunk/libnautilus-private/nautilus-icon-info.h
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-info.h	(original)
+++ trunk/libnautilus-private/nautilus-icon-info.h	Mon Sep 22 10:02:31 2008
@@ -82,7 +82,6 @@
 guint nautilus_icon_get_smaller_icon_size            (guint              size);
 
 gint  nautilus_get_icon_size_for_stock_size          (GtkIconSize        size);
-char *nautilus_icon_get_emblem_icon_by_name          (const char        *emblem_name);
 guint nautilus_icon_get_emblem_size_for_icon_size    (guint              size);