Disable network icon on desktop by default.

2005-12-15  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/apps_nautilus_preferences.schemas.in:
	* libnautilus-private/nautilus-global-preferences.c:
	Disable network icon on desktop by default.

	* src/nautilus-main.c:
	* src/nautilus-navigation-window-ui.xml:
	* src/nautilus-spatial-window-ui.xml:
	* src/nautilus-window-menus.c:
	Add network to go/places menu.

7 files changed, 40 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 69e765d6f..b6ba71571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-12-15  Alexander Larsson  <alexl@redhat.com>
 
+	* libnautilus-private/apps_nautilus_preferences.schemas.in:
+	* libnautilus-private/nautilus-global-preferences.c:
+	Disable network icon on desktop by default.
+	
+	* src/nautilus-main.c:
+	* src/nautilus-navigation-window-ui.xml:
+	* src/nautilus-spatial-window-ui.xml:
+	* src/nautilus-window-menus.c:
+	Add network to go/places menu.
+
+2005-12-15  Alexander Larsson  <alexl@redhat.com>
+
 	* src/nautilus-location-dialog.c: (nautilus_location_dialog_init):
 	Make entry 30 chars to match file selector dialog.
 	Patch from Ray Strode
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index a31cee3da..67438627c 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -814,7 +814,7 @@ most cases, this should be left alone. -->Sans 10</default>
       <applyto>/apps/nautilus/desktop/network_visible</applyto>
       <owner>nautilus</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
       	<short>Network Servers icon visible on the desktop</short>
 	<long>
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 22208b110..886d92ae1 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -489,6 +489,16 @@ static const PreferenceDefault preference_defaults[] = {
 	  default_trash_link_name, g_free,
 	},
 	
+	{ NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE,
+	  PREFERENCE_BOOLEAN,
+	  GINT_TO_POINTER (TRUE)
+	},
+
+	{ NAUTILUS_PREFERENCES_DESKTOP_NETWORK_VISIBLE,
+	  PREFERENCE_BOOLEAN,
+	  GINT_TO_POINTER (FALSE)
+	},
+	
 	{ NULL }
 };
 
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index cebd99f0c..59de798dc 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -137,7 +137,7 @@ register_icons (void)
 	GtkIconSource *source;
 	GtkIconSet *set;
 	GtkIconFactory *factory;
-	const char *icons_to_register[] = {"gnome-fs-client", "gnome-fs-home", "gnome-fs-trash-empty", "gnome-dev-cdrom", "stock_new-template"};
+	const char *icons_to_register[] = {"gnome-fs-client", "gnome-fs-network", "gnome-fs-home", "gnome-fs-trash-empty", "gnome-dev-cdrom", "stock_new-template"};
 	struct { int pixel; int gtk; } sizes[] = {
 		{16, GTK_ICON_SIZE_MENU},
 		{18, GTK_ICON_SIZE_SMALL_TOOLBAR},
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 1da8913bc..1b3e58147 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -30,6 +30,7 @@
 			<menuitem name="Go to Templates" action="Go to Templates"/>
 			<menuitem name="Go to Trash" action="Go to Trash"/>
 			<menuitem name="Go to Burn CD" action="Go to Burn CD"/>
+		        <menuitem name="Go to Network" action="Go to Network"/>
 			<menuitem name="Go to Location" action="Go to Location"/>
 			<menuitem name="Search" action="Search"/>
 			<separator/>
diff --git a/src/nautilus-spatial-window-ui.xml b/src/nautilus-spatial-window-ui.xml
index eefb0d590..7446dd876 100644
--- a/src/nautilus-spatial-window-ui.xml
+++ b/src/nautilus-spatial-window-ui.xml
@@ -17,6 +17,7 @@
  		      <menuitem name="Go to Templates" action="Go to Templates"/>
 		      <menuitem name="Go to Trash" action="Go to Trash"/>
 		      <menuitem name="Go to Burn CD" action="Go to Burn CD"/>
+		      <menuitem name="Go to Network" action="Go to Network"/>
 		      <menuitem name="Search" action="Search"/>
 		      <separator/>
 		      <placeholder name="Bookmarks Placeholder"/>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 2adbcf8df..8aa6260f4 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -72,7 +72,8 @@
 #define MENU_PATH_EXTENSION_ACTIONS                     "/MenuBar/File/Extension Actions"
 #define POPUP_PATH_EXTENSION_ACTIONS                     "/background/Before Zoom Items/Extension Actions"
 
-#define COMPUTER_URI          "computer:"
+#define NETWORK_URI          "network:"
+#define COMPUTER_URI         "computer:"
 #define BURN_CD_URI          "burn:"
 
 /* Struct that stores all the info necessary to activate a bookmark. */
@@ -280,6 +281,14 @@ action_go_to_computer_callback (GtkAction *action,
 }
 
 static void
+action_go_to_network_callback (GtkAction *action, 
+				gpointer user_data) 
+{
+	nautilus_window_go_to (NAUTILUS_WINDOW (user_data),
+			       NETWORK_URI);
+}
+
+static void
 action_go_to_templates_callback (GtkAction *action,
 				 gpointer user_data) 
 {
@@ -677,6 +686,10 @@ static const GtkActionEntry main_entries[] = {
     N_("_Computer"), NULL,           /* label, accelerator */
     N_("Go to the computer location"),                                  /* tooltip */ 
     G_CALLBACK (action_go_to_computer_callback) },
+  { "Go to Network", "gnome-fs-network",                        /* name, stock id */
+    N_("_Network"), NULL,           /* label, accelerator */
+    N_("Go to the network location"),                                  /* tooltip */ 
+    G_CALLBACK (action_go_to_network_callback) },
   { "Go to Templates", "stock_new-template",                        /* name, stock id */
     N_("T_emplates"), NULL,           /* label, accelerator */
     N_("Go to the templates folder"),                                  /* tooltip */