for latest's libgnomeui

[Bastien Nocera <hadess hadess net>]

Heya,

Here's patch you might want to look at.

src/nautilus-bookmark-list.c: append_bookmark_node () uses
nautilus_bookmark_get_icon () which now has different semantics and i
couldn't find a way to get the icon-name for a bookmark entry.

Cheers

-- 
/Bastien Nocera
http://hadess.net

Perfection is reached, not when there is no longer anything to add, but
when
there is no longer anything to take away.
						Antoine de Saint-Exupery

Index: libnautilus-private/nautilus-icon-factory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-factory.c,v
retrieving revision 1.274
diff -u -r1.274 nautilus-icon-factory.c
--- libnautilus-private/nautilus-icon-factory.c	21 Aug 2002 12:07:25 -0000	1.274
+++ libnautilus-private/nautilus-icon-factory.c	30 Oct 2002 23:21:29 -0000
@@ -165,7 +165,7 @@
 	GdkPixbuf *thumbnail_frame;
 
 	/* Used for icon themes according to the freedesktop icon spec. */
-	GnomeIconLoader *icon_loader;
+	GnomeIconTheme *icon_loader;
 } NautilusIconFactory;
 
 #define NAUTILUS_ICON_FACTORY(obj) \
@@ -321,7 +321,7 @@
 }
 
 static void
-icon_loader_changed_callback (GnomeIconLoader *icon_loader,
+icon_loader_changed_callback (GnomeIconTheme *icon_loader,
 			      gpointer user_data)
 {
 	NautilusIconFactory *factory;
@@ -332,7 +332,7 @@
 		       signals[ICONS_CHANGED], 0);
 }
 
-GnomeIconLoader *
+GnomeIconTheme *
 nautilus_icon_factory_get_icon_loader (void)
 {
 	NautilusIconFactory *factory;
@@ -340,7 +340,7 @@
 	factory = get_icon_factory ();
 
 	if (factory->icon_loader == NULL) {
-		factory->icon_loader = gnome_icon_loader_new ();
+		factory->icon_loader = gnome_icon_theme_new ();
 		g_signal_connect_object (factory->icon_loader,
 					 "changed",
 					 G_CALLBACK (icon_loader_changed_callback),
Index: libnautilus-private/nautilus-icon-factory.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-factory.h,v
retrieving revision 1.41
diff -u -r1.41 nautilus-icon-factory.h
--- libnautilus-private/nautilus-icon-factory.h	5 Jul 2002 10:51:00 -0000	1.41
+++ libnautilus-private/nautilus-icon-factory.h	30 Oct 2002 23:21:29 -0000
@@ -31,7 +31,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkobject.h>
 #include <libnautilus-private/nautilus-file.h>
-#include <libgnome/gnome-icon-loader.h>
+#include <libgnomeui/gnome-icon-theme.h>
 
 /* NautilusIconFactory is a class that knows how to hand out icons to be
  * used for representing files and some other objects. It was designed
@@ -178,4 +178,4 @@
 
 #endif /* NAUTILUS_ICON_FACTORY_H */
 
-GnomeIconLoader *     nautilus_icon_factory_get_icon_loader              (void);
+GnomeIconTheme *     nautilus_icon_factory_get_icon_loader              (void);
Index: libnautilus-private/nautilus-link-desktop-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-desktop-file.c,v
retrieving revision 1.23.2.1
diff -u -r1.23.2.1 nautilus-link-desktop-file.c
--- libnautilus-private/nautilus-link-desktop-file.c	1 Oct 2002 07:37:04 -0000	1.23.2.1
+++ libnautilus-private/nautilus-link-desktop-file.c	30 Oct 2002 23:21:30 -0000
@@ -338,7 +338,7 @@
 static char *
 nautilus_link_desktop_file_get_link_icon_from_desktop (GnomeDesktopItem *desktop_file)
 {
-	GnomeIconLoader *icon_loader;
+	GnomeIconTheme *icon_loader;
 	char *icon_uri;
 	char *absolute;

Attachment: signature.asc
Description: This is a digitally signed message part