Index: libgthumb/gth-file-view-list.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/gth-file-view-list.c,v
retrieving revision 1.10
diff -u -p -r1.10 gth-file-view-list.c
--- libgthumb/gth-file-view-list.c	14 Mar 2006 17:49:50 -0000	1.10
+++ libgthumb/gth-file-view-list.c	2 Oct 2006 12:55:46 -0000
@@ -59,7 +59,7 @@ struct _GthFileViewListPrivate {
 	GtkSortType     sort_type;
 	GthViewMode     view_mode;
 	int             max_image_size;
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme   *icon_theme;
 	gboolean        enable_thumbs;
 	gboolean        reorderable;
 	GdkPixbuf      *unknown_pixbuf_small;
@@ -1120,10 +1120,10 @@ gfv_get_cursor (GthFileView *file_view)
 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;
 
@@ -1140,16 +1140,16 @@ create_unknown_pixbuf (GthFileViewList *
 				       "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) 
@@ -1707,8 +1707,7 @@ gth_file_view_list_new (guint image_widt
 
 	/**/
 
-	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.9
diff -u -p -r1.9 gth-file-view-thumbs.c
--- libgthumb/gth-file-view-thumbs.c	14 Mar 2006 17:49:50 -0000	1.9
+++ libgthumb/gth-file-view-thumbs.c	2 Oct 2006 12:55:47 -0000
@@ -36,7 +36,7 @@
 
 struct _GthFileViewThumbsPrivate {
 	GthImageList   *ilist;
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme   *icon_theme;
 	GdkPixbuf      *unknown_pixbuf;
 };
 
@@ -781,11 +781,11 @@ get_default_icon_size (GtkWidget *widget
 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));
 
@@ -797,16 +797,15 @@ create_unknown_pixbuf (GthFileViewThumbs
 				       "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)
@@ -1108,8 +1107,7 @@ gth_file_view_thumbs_new (guint image_wi
 
 	/**/
 
-	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.38
diff -u -p -r1.38 dlg-photo-importer.c
--- src/dlg-photo-importer.c	8 May 2006 17:39:49 -0000	1.38
+++ src/dlg-photo-importer.c	2 Oct 2006 12:55:50 -0000
@@ -666,9 +666,9 @@ get_icon_from_mime_type (DialogData *dat
 {
 	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,
@@ -679,16 +679,15 @@ get_icon_from_mime_type (DialogData *dat
                                        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.52
diff -u -p -r1.52 main.c
--- src/main.c	13 Apr 2006 12:59:48 -0000	1.52
+++ src/main.c	2 Oct 2006 12:55:51 -0000
@@ -80,7 +80,7 @@ static gboolean        view_comline_cata
 static gboolean        view_single_image = FALSE;
 static GdkPixbuf      *icon_pixbuf[ICON_NAMES] = { 0 };
 static GtkWidget      *first_window = NULL;
-static GnomeIconTheme *icon_theme = NULL;
+static GtkIconTheme   *icon_theme = NULL;
 static BonoboObject   *gth_application = NULL;
 
 struct poptOption options[] = {
@@ -122,7 +122,7 @@ free_icon_pixbufs (void)
 
 
 static void
-theme_changed_cb (GnomeIconTheme *theme, 
+theme_changed_cb (GtkIconTheme *theme, 
 		  gpointer        data)
 {
 	free_icon_pixbufs ();
@@ -379,8 +379,7 @@ initialize_data (poptContext pctx)
 
 	/* Icon theme */
 
-	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),
@@ -902,6 +901,7 @@ get_fs_icon (IconName icon_name,
 	GdkPixbuf *pixbuf = NULL;
 	gboolean   scale = TRUE;
 
+
 	/*
 	if (icon_pixbuf[icon_name] != NULL) {
 		g_object_ref (icon_pixbuf[icon_name]);
@@ -916,26 +916,22 @@ get_fs_icon (IconName icon_name,
 	*/
 
 	if (icon_pixbuf[icon_name] == NULL) {
-		const GnomeIconData *icon_data;
-		int                  base_size;
-		char                *icon_path;
-		
-		icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-							  icon_mime_name[icon_name],
-							  icon_size,
-							  &icon_data,
-							  &base_size);
+		GtkIconInfo         *icon_info = NULL;
+
+		icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+							icon_mime_name[icon_name],
+							icon_size,
+							0);
 
-		if (icon_path == NULL) {
+		if (icon_info == NULL) {
 			icon_pixbuf[icon_name] = gdk_pixbuf_new_from_inline (-1, 
 									     dir_16_rgba, 
 									     FALSE, 
 									     NULL);
 			scale = FALSE;
 		} else {
-			icon_pixbuf[icon_name] = gdk_pixbuf_new_from_file (icon_path, 
-									   NULL);
-			g_free (icon_path);
+			icon_pixbuf[icon_name] = gtk_icon_info_load_icon (icon_info, NULL);
+			gtk_icon_info_free (icon_info);
 		}
 	}
 
