Index: libgthumb/gth-file-view-list.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/gth-file-view-list.c,v
retrieving revision 1.7
diff -u -r1.7 gth-file-view-list.c
--- libgthumb/gth-file-view-list.c	24 Apr 2005 08:16:11 -0000	1.7
+++ libgthumb/gth-file-view-list.c	5 May 2005 09:58:20 -0000
@@ -63,7 +63,7 @@
 	GtkSortType     sort_type;
 	GthViewMode     view_mode;
 	int             max_image_size;
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme   *icon_theme;
 	gboolean        enable_thumbs;
 
 	GdkPixbuf      *unknown_pixbuf_small;
@@ -1106,10 +1106,10 @@
 static GdkPixbuf *
 create_unknown_pixbuf (GthFileViewList *gfv_list, gboolean big)
 {
-	GnomeIconTheme *icon_theme = gfv_list->priv->icon_theme;
+	GtkIconTheme   *icon_theme = gfv_list->priv->icon_theme;
+  GtkIconInfo    *icon_info = NULL;
 	int             icon_width, icon_height, icon_size;
 	char           *icon_name;
-	char           *icon_path;
 	GdkPixbuf      *pixbuf = NULL;
 	int             width, height;
 
@@ -1126,16 +1126,16 @@
 				       "image/*",
 				       GNOME_ICON_LOOKUP_FLAGS_NONE,
 				       NULL);
-	icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-						  icon_name,
-						  icon_size,
-						  NULL, 
-						  NULL);
+
+  icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+              icon_name,
+              icon_size,
+              0);
 	g_free (icon_name);
 
-	if (icon_path != NULL) {
-		pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL);
-		g_free (icon_path);
+	if (icon_info != NULL) {
+		pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
 	}
 
 	if (pixbuf == NULL) 
@@ -1609,8 +1609,7 @@
 
 	/**/
 
-	priv->icon_theme = gnome_icon_theme_new ();
-	gnome_icon_theme_set_allow_svg (priv->icon_theme, TRUE);
+	priv->icon_theme = gtk_icon_theme_get_default ();
 	priv->unknown_pixbuf_small = create_unknown_pixbuf (gfv_list, FALSE);
 	priv->unknown_pixbuf_big = create_unknown_pixbuf (gfv_list, TRUE);
 
Index: libgthumb/gth-file-view-thumbs.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/gth-file-view-thumbs.c,v
retrieving revision 1.6
diff -u -r1.6 gth-file-view-thumbs.c
--- libgthumb/gth-file-view-thumbs.c	24 Apr 2005 08:16:11 -0000	1.6
+++ libgthumb/gth-file-view-thumbs.c	5 May 2005 09:58:21 -0000
@@ -35,7 +35,7 @@
 
 struct _GthFileViewThumbsPrivate {
 	GthImageList   *ilist;
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme   *icon_theme;
 	GdkPixbuf      *unknown_pixbuf;
 };
 
@@ -779,11 +779,11 @@
 static GdkPixbuf *
 create_unknown_pixbuf (GthFileViewThumbs *gfv_thumbs)
 {
-	int         icon_size;
-	char       *icon_name;
-	char       *icon_path;
-	GdkPixbuf  *pixbuf = NULL;
-	int         width, height;
+  GtkIconInfo *icon_info = NULL;
+	int          icon_size;
+	char        *icon_name;
+	GdkPixbuf   *pixbuf = NULL;
+	int          width, height;
 
 	icon_size = get_default_icon_size (GTK_WIDGET (gfv_thumbs->priv->ilist));
 
@@ -795,16 +795,15 @@
 				       "image/*",
 				       GNOME_ICON_LOOKUP_FLAGS_NONE,
 				       NULL);
-	icon_path = gnome_icon_theme_lookup_icon (gfv_thumbs->priv->icon_theme,
+	icon_info = gtk_icon_theme_lookup_icon (gfv_thumbs->priv->icon_theme,
 						  icon_name,
 						  icon_size,
-						  NULL,
-						  NULL);
+              0);
 	g_free (icon_name);
 
-	if (icon_path != NULL) {
-		pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL);
-		g_free (icon_path);
+	if (icon_info != NULL) {
+		pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
 	}
 
 	if (pixbuf == NULL)
@@ -1055,8 +1054,7 @@
 
 	/**/
 
-	gfv_thumbs->priv->icon_theme = gnome_icon_theme_new ();
-	gnome_icon_theme_set_allow_svg (gfv_thumbs->priv->icon_theme, TRUE);
+	gfv_thumbs->priv->icon_theme = gtk_icon_theme_get_default ();
 	gfv_thumbs->priv->unknown_pixbuf = create_unknown_pixbuf (gfv_thumbs);
 
 	return GTH_FILE_VIEW (gfv_thumbs);
Index: src/dlg-photo-importer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-photo-importer.c,v
retrieving revision 1.26
diff -u -r1.26 dlg-photo-importer.c
--- src/dlg-photo-importer.c	10 Apr 2005 20:02:36 -0000	1.26
+++ src/dlg-photo-importer.c	5 May 2005 09:58:22 -0000
@@ -641,9 +641,9 @@
 {
 	GdkPixbuf      *pixbuf = NULL;
 	int             icon_size;
-        GnomeIconTheme *icon_theme = gnome_icon_theme_new ();
+        GtkIconTheme   *icon_theme = gtk_icon_theme_get_default ();
+        GtkIconInfo    *icon_info = NULL;
         char           *icon_name;
-        char           *icon_path;
 
         icon_size = get_default_icon_size (data->dialog);
         icon_name = gnome_icon_lookup (icon_theme,
@@ -654,16 +654,15 @@
                                        mime_type,
                                        GNOME_ICON_LOOKUP_FLAGS_NONE,
                                        NULL);
-	icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-                                                  icon_name,
-                                                  icon_size,
-                                                  NULL,
-                                                  NULL);
+  icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+                                            icon_name,
+                                            icon_size,
+                                            0);
         g_free (icon_name);
 
-	if (icon_path != NULL) {
-		 pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL);
-                g_free (icon_path);
+	if (icon_info != NULL) {
+		 pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+     gtk_icon_info_free (icon_info);
 	}
 
 	g_object_unref (icon_theme);
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/main.c,v
retrieving revision 1.29
diff -u -r1.29 main.c
--- src/main.c	9 Jun 2004 16:20:03 -0000	1.29
+++ src/main.c	5 May 2005 09:58:22 -0000
@@ -67,7 +67,7 @@
 static gboolean        view_single_image = FALSE;
 static GdkPixbuf      *folder_pixbuf = NULL;
 static GThumbWindow   *first_window = NULL;
-static GnomeIconTheme *icon_theme = NULL;
+static GtkIconTheme   *icon_theme = NULL;
 
 
 static void     prepare_app         ();
@@ -205,7 +205,7 @@
 
 
 static void
-theme_changed_cb (GnomeIconTheme *theme, 
+theme_changed_cb (GtkIconTheme *theme, 
 		  gpointer        data)
 {
 	if (folder_pixbuf != NULL) {
@@ -277,8 +277,7 @@
 	if (g_file_test (pixmap_file, G_FILE_TEST_EXISTS))
 		gnome_window_icon_set_default_from_file (pixmap_file);
 
-	icon_theme = gnome_icon_theme_new ();
-	gnome_icon_theme_set_allow_svg (icon_theme, TRUE);
+	icon_theme = gtk_icon_theme_get_default ();
 	g_signal_connect (icon_theme,
 			  "changed",
 			  G_CALLBACK (theme_changed_cb),
@@ -796,15 +795,14 @@
 	static gboolean  scale = TRUE;
 
 	if (folder_pixbuf == NULL) {
-		char *icon_path;
-		
-		icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-							  ICON_NAME_DIRECTORY,
-							  icon_size,
-							  NULL,
-							  NULL);
+    GtkIconInfo *icon_info = NULL;
 
-		if (icon_path == NULL) {
+    icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+                ICON_NAME_DIRECTORY,
+                icon_size,
+                0);
+		
+		if (icon_info == NULL) {
 			folder_pixbuf = gdk_pixbuf_new_from_inline (-1, 
 								    dir_16_rgba, 
 								    FALSE, 
@@ -812,9 +810,8 @@
 			scale = FALSE;
 
 		} else {
-			folder_pixbuf = gdk_pixbuf_new_from_file (icon_path, 
-								  NULL);
-			g_free (icon_path);
+      folder_pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+      gtk_icon_info_free (icon_info);
 		}
 	}
 
