Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.8296.2.44
diff -u -p -r1.8296.2.44 ChangeLog
--- ChangeLog	22 Sep 2006 18:50:55 -0000	1.8296.2.44
+++ ChangeLog	22 Sep 2006 20:38:42 -0000
@@ -1,3 +1,11 @@
+2006-09-22  Dennis Cranston  <dennis_cranston@yahoo.com>
+
+	* gtk/gtkfilechooserbutton.c: (change_icon_theme),
+	(model_add_bookmarks), (model_update_current_folder):
+	* gtk/gtkfilechooserdefault.c: (shortcuts_reload_icons),
+	(shortcuts_insert_path):  Use the remote folder icon when
+	appropriate.
+
 2006-09-22  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
Index: gtk/gtkfilechooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
retrieving revision 1.329.2.7
diff -u -p -r1.329.2.7 gtkfilechooserdefault.c
--- gtk/gtkfilechooserdefault.c	22 Sep 2006 16:32:45 -0000	1.329.2.7
+++ gtk/gtkfilechooserdefault.c	22 Sep 2006 20:38:47 -0000
@@ -1208,7 +1208,7 @@ shortcuts_reload_icons (GtkFileChooserDe
 	       * should use mime info to get a better icon.
 	       */
 	      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-	      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 						 impl->icon_size, 0, NULL);
 
 	      gtk_list_store_set (impl->shortcuts_model, &iter,
@@ -1588,7 +1588,7 @@ shortcuts_insert_path (GtkFileChooserDef
        * should use mime info to get a better icon.
        */
       icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 					 impl->icon_size, 0, NULL);
     }
 
Index: gtk/gtkfilechooserbutton.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserbutton.c,v
retrieving revision 1.52.2.6
diff -u -p -r1.52.2.6 gtkfilechooserbutton.c
--- gtk/gtkfilechooserbutton.c	22 Sep 2006 17:48:24 -0000	1.52.2.6
+++ gtk/gtkfilechooserbutton.c	22 Sep 2006 20:38:48 -0000
@@ -1316,7 +1316,7 @@ change_icon_theme (GtkFileChooserButton 
 		 * If we switch to a better bookmarks file format (XBEL), we
 		 * should use mime info to get a better icon.
 		 */
-		pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-regular",
+		pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-share",
 						   priv->icon_size, 0, NULL);
 	    }
 	  else
@@ -1865,7 +1865,7 @@ model_add_bookmarks (GtkFileChooserButto
 	    }
 
 	  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
-	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 					     button->priv->icon_size, 0, NULL);
 
 	  gtk_list_store_insert (store, &iter, pos);
@@ -1974,8 +1974,16 @@ model_update_current_folder (GtkFileChoo
 	}
       
       icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
-      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
-					 button->priv->icon_size, 0, NULL);
+      if (!gtk_file_system_path_is_local (button->priv->fs, path)) 
+	{
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+	                                     button->priv->icon_size, 0, NULL);
+	}
+      else
+	{
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	                                     button->priv->icon_size, 0, NULL);	    
+	}
       
       gtk_list_store_set (store, &iter,
 			  ICON_COLUMN, pixbuf,
