diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c
--- ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c 2009-04-15 16:16:49.824374976 +0200
+++ nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c 2009-04-15 16:19:04.097748578 +0200
@@ -498,7 +499,7 @@ static const PreferenceDefault preferenc
{ NAUTILUS_PREFERENCES_DESKTOP_TRASH_VISIBLE,
PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (TRUE)
+ GINT_TO_POINTER (FALSE)
},
{ NAUTILUS_PREFERENCES_DESKTOP_TRASH_NAME,
@@ -514,7 +515,7 @@ static const PreferenceDefault preferenc
{ NAUTILUS_PREFERENCES_DESKTOP_NETWORK_VISIBLE,
PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (FALSE)
+ GINT_TO_POINTER (TRUE)
},
{ NAUTILUS_PREFERENCES_DESKTOP_NETWORK_NAME,
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/src/nautilus-navigation-window-ui.xml nautilus-2.26.2/src/nautilus-navigation-window-ui.xml
--- ../nautilus-2.26.2/src/nautilus-navigation-window-ui.xml 2009-04-15 16:16:49.914242382 +0200
+++ nautilus-2.26.2/src/nautilus-navigation-window-ui.xml 2009-04-15 16:19:04.100155154 +0200
@@ -29,10 +29,13 @@
</placeholder>
<separator/>
<menuitem name="Home" action="Home"/>
+ <menuitem name="Desktop" action="Desktop"/>
<menuitem name="Computer" action="Go to Computer"/>
+ <separator/>
- <menuitem name="Go to Templates" action="Go to Templates"/>
- <menuitem name="Go to Trash" action="Go to Trash"/>
+ <menuitem name="Go to FileSystem" action="Go to FileSystem"/>
<menuitem name="Go to Network" action="Go to Network"/>
+ <menuitem name="Go to Trash" action="Go to Trash"/>
+ <separator/>
<menuitem name="Go to Location" action="Go to Location"/>
<menuitem name="Search" action="Search"/>
<separator/>
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' SUNWgnome-file-mgr-2.27.90/nautilus-2.27.91/src/nautilus-places-sidebar.c nautilus-2.27.91/src/nautilus-places-sidebar.c
--- SUNWgnome-file-mgr-2.27.90/nautilus-2.27.91/src/nautilus-places-sidebar.c 2009-07-14 19:08:11.000000000 +0800
+++ nautilus-2.27.91/src/nautilus-places-sidebar.c 2009-08-26 17:37:06.889301891 +0800
@@ -276,7 +276,7 @@ update_places (NautilusPlacesSidebar *si
GList *volumes;
GVolume *volume;
int bookmark_count, index;
- char *location, *mount_uri, *name, *desktop_path;
+ char *location, *mount_uri, *name, *desktop_path, *display_name;
GIcon *icon;
GFile *root;
NautilusWindowSlotInfo *slot;
@@ -318,7 +318,19 @@ update_places (NautilusPlacesSidebar *si
}
g_free (mount_uri);
g_free (desktop_path);
-
+
+ mount_uri = "computer:///"; /* No need to strdup */
+ icon = g_themed_icon_new ("gnome-fs-client");
+ last_iter = add_place (sidebar, PLACES_BUILT_IN,
+ /* SUN_BRANDING */
+ _("Computer"), icon,
+ mount_uri, NULL, NULL, NULL, 0);
+ g_object_unref (icon);
+ if (strcmp (location, mount_uri) == 0) {
+ gtk_tree_selection_select_iter (selection, &last_iter);
+ }
+ desktop_path = nautilus_get_desktop_directory ();
+
mount_uri = "file:///"; /* No need to strdup */
icon = g_themed_icon_new (NAUTILUS_ICON_FILESYSTEM);
last_iter = add_place (sidebar, PLACES_BUILT_IN,
--- /usr/tmp/clean/nautilus-2.29.92.1/src/nautilus-spatial-window-ui.xml 2010-03-10 13:59:13.000000000 +0000
+++ nautilus-2.29.92.1/src/nautilus-spatial-window-ui.xml 2010-03-19 13:36:55.666213448 +0000
@@ -13,10 +13,13 @@
<placeholder name="Other Menus">
<menu action="Places">
<menuitem name="Home" action="Home"/>
+ <menuitem name="Desktop" action="Desktop"/>
<menuitem name="Go to Computer" action="Go to Computer"/>
- <menuitem name="Go to Templates" action="Go to Templates"/>
- <menuitem name="Go to Trash" action="Go to Trash"/>
+ <separator/>
+ <menuitem name="Go to FileSystem" action="Go to FileSystem"/>
<menuitem name="Go to Network" action="Go to Network"/>
+ <menuitem name="Go to Trash" action="Go to Trash"/>
+ <separator/>
<menuitem name="Search" action="Search"/>
<separator/>
<placeholder name="Bookmarks Placeholder"/>
--- /usr/tmp/clean/nautilus-2.29.92.1/src/nautilus-spatial-window.c 2010-03-10 13:59:13.000000000 +0000
+++ nautilus-2.29.92.1/src/nautilus-spatial-window.c 2010-03-19 13:39:31.004137386 +0000
@@ -74,6 +74,11 @@
#define SPATIAL_ACTION_CLOSE_ALL_FOLDERS "Close All Folders"
#define MENU_PATH_SPATIAL_BOOKMARKS_PLACEHOLDER "/MenuBar/Other Menus/Places/Bookmarks Placeholder"
+#define NETWORK_URI "network:"
+#define COMPUTER_URI "computer:"
+#define FILESYSTEM_URI "file:///"
+#define BURN_CD_URI "burn:"
+
struct _NautilusSpatialWindowDetails {
GtkActionGroup *spatial_action_group; /* owned by ui_manager */
char *last_geometry;
@@ -922,6 +927,94 @@
g_free (uri);
}
+static void
+action_desktop_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ f = nautilus_get_desktop_location ();
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+}
+
+static void
+action_go_to_computer_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ f = g_file_new_for_uri (COMPUTER_URI);
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+}
+
+static void
+action_filesystem_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ f = g_file_new_for_uri (FILESYSTEM_URI);
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+}
+
+static void
+action_go_to_network_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ f = g_file_new_for_uri (NETWORK_URI);
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+}
+
+static void
+action_go_to_templates_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ char *uri;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ nautilus_create_templates_directory ();
+ uri = nautilus_get_templates_directory_uri ();
+ f = g_file_new_for_uri (uri);
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+ g_free (uri);
+}
+
+static void
+action_go_to_burn_cd_callback (GtkAction *action,
+ gpointer user_data)
+{
+ NautilusWindow *window;
+ GFile *f;
+
+ window = NAUTILUS_WINDOW (user_data);
+
+ f = g_file_new_for_uri (BURN_CD_URI);
+ nautilus_window_go_to (window, f);
+ g_object_unref (f);
+}
+
static const GtkActionEntry spatial_entries[] = {
/* name, stock id, label */ { SPATIAL_ACTION_PLACES, NULL, N_("_Places") },
/* name, stock id, label */ { SPATIAL_ACTION_GO_TO_LOCATION, NULL, N_("Open _Location..."),
@@ -939,15 +1032,45 @@
/* name, stock id, label */ { "Edit Bookmarks", NULL, N_("_Edit Bookmarks..."),
"<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
G_CALLBACK (action_edit_bookmarks_callback) },
- /* name, stock id, label */ { "Search", "gtk-find", N_("_Search for Files..."),
- "<control>F", N_("Locate documents and folders on this computer by name or content"),
- G_CALLBACK (action_search_callback) },
+ /* SUN_BRANDING */
+ { "Search", "gtk-find", N_("F_ind Files"), /* name, stock id, label */
+ /* SUN_BRANDING */
+ "<control>F", N_("Find files, folders, and documents"), G_CALLBACK (action_search_callback) },
+ { "Desktop", "gnome-fs-desktop", /* name, stock id */
+ /* SUN_BRANDING */
+ N_("_Desktop"), NULL, /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("Go to the Desktop"), /* tooltip */
+ G_CALLBACK (action_desktop_callback) },
+ { "Go to Computer", "gnome-fs-client", /* name, stockid */
+ /* SUN_BRANDING */
+ N_("_Computer"), NULL, /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("Go to the computer location"), /* tooltip */
+ G_CALLBACK (action_go_to_computer_callback) },
+ { "Go to FileSystem", "gnome-dev-harddisk", /* name, stock id */
+ /* SUN_BRANDING */
+ N_("File _System"), NULL, /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("Go to the file system"), /* tooltip */
+ G_CALLBACK (action_filesystem_callback) },
+ { "Go to Network", "gnome-fs-network", /* name, stockid */
+ /* SUN_BRANDING */
+ N_("_Network"), NULL, /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("Go to the network location"), /* tooltip */
+ G_CALLBACK (action_go_to_network_callback) },
+ { "Go to Templates", "stock_new-template", /* name, stock id */
+ /* SUN_BRANDING */
+ N_("T_emplates"), NULL, /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("Go to the templates folder"), /* tooltip */
+ G_CALLBACK (action_go_to_templates_callback) },
};
static const char* icon_entries[] = {
"/MenuBar/Other Menus/Places/Home",
"/MenuBar/Other Menus/Places/Go to Computer",
- "/MenuBar/Other Menus/Places/Go to Templates",
"/MenuBar/Other Menus/Places/Go to Trash",
"/MenuBar/Other Menus/Places/Go to Network"
};
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/src/nautilus-window-menus.c nautilus-2.26.2/src/nautilus-window-menus.c
--- ../nautilus-2.26.2/src/nautilus-window-menus.c 2009-04-15 16:16:49.902777583 +0200
+++ nautilus-2.26.2/src/nautilus-window-menus.c 2009-04-15 16:19:04.104453909 +0200
@@ -65,6 +65,7 @@
#define NETWORK_URI "network:"
#define COMPUTER_URI "computer:"
+#define FILESYSTEM_URI "file:///"
#define BURN_CD_URI "burn:"
/* Struct that stores all the info necessary to activate a bookmark. */
@@ -278,6 +265,22 @@ action_undo_callback (GtkAction *action,
}
static void
+action_desktop_callback (GtkAction *action,
+ gpointer user_data)
+{
+ GFile *file;
+ gchar *desktop_uri;
+ NautilusWindowSlot *slot;
+
+ desktop_uri = nautilus_get_desktop_directory ();
+ file = g_file_new_for_path (desktop_uri);
+ nautilus_window_slot_go_to (slot, file,
+ should_open_in_new_tab ());
+ g_object_unref (file);
+}
+
+
+static void
action_go_to_computer_callback (GtkAction *action,
gpointer user_data)
{
@@ -296,6 +322,17 @@ action_go_to_computer_callback (GtkActio
}
static void
+action_filesystem_callback (GtkAction *action,
+ gpointer user_data)
+{
+ GFile *file;
+ file = g_file_new_for_uri (FILESYSTEM_URI);
+ nautilus_window_go_to (NAUTILUS_WINDOW (user_data),
+ file);
+ g_object_unref (file);
+}
+
+static void
action_go_to_network_callback (GtkAction *action,
gpointer user_data)
{
@@ -869,6 +906,18 @@ static const GtkActionEntry main_entries
/* label, accelerator */ N_("_Home Folder"), "<alt>Home",
/* tooltip */ N_("Open your personal folder"),
G_CALLBACK (action_home_callback) },
+ /* name, stock id */ { "Desktop", "gnome-fs-desktop",
+ /* SUN_BRANDING */
+ /* label, accelerator */ N_("_Desktop"), NULL,
+ /* SUN_BRANDING */
+ /* tooltip */ N_("Go to the Desktop"),
+ G_CALLBACK (action_desktop_callback) },
+ /* name, stock id */ { "Go to FileSystem", "gnome-dev-harddisk",
+ /* SUN_BRANDING */
+ /* label, accelerator */ N_("File _System"), NULL,
+ /* SUN_BRANDING */
+ /* tooltip */ N_("Go to the file system"),
+ G_CALLBACK (action_filesystem_callback) },
/* name, stock id */ { "Go to Computer", NAUTILUS_ICON_COMPUTER,
/* label, accelerator */ N_("_Computer"), NULL,
/* tooltip */ N_("Browse all local and remote disks and folders accessible from this computer"),
diff -ruN nautilus-2.29.2.orig/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.29.2/libnautilus-private/apps_nautilus_preferences.schemas.in
--- nautilus-2.29.2.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2010-02-01 23:49:09.572809808 +0000
+++ nautilus-2.29.2/libnautilus-private/apps_nautilus_preferences.schemas.in 2010-02-01 23:52:42.002100727 +0000
@@ -57,7 +57,7 @@
<applyto>/desktop/gnome/file_views/show_backup_files</applyto>
<owner>nautilus</owner>
<type>bool</type>
- <default>false</default>
+ <default>true</default>
<locale name="C">
<short>Whether to show backup files</short>
<long>
@@ -517,11 +517,11 @@
<applyto>/apps/nautilus/preferences/desktop_font</applyto>
<owner>nautilus</owner>
<type>string</type>
- <default>Sans 10</default>
+ <default>Sans Book 10</default>
<locale name="C">
<default><!-- Translators: please note this can choose the size. e.g.
"Sans 15". Please do not change "Sans", only change the size if you need to. In
-most cases, this should be left alone. -->Sans 10</default>
+most cases, this should be left alone. SUN_BRANDING -->Sans 10</default>
<short>Desktop font</short>
<long>
The font description used for the icons on the desktop.
@@ -755,7 +755,7 @@
<applyto>/apps/nautilus/icon_view/default_zoom_level</applyto>
<owner>nautilus</owner>
<type>string</type>
- <default>standard</default>
+ <default>small</default>
<locale name="C">
<short>Default icon zoom level</short>
<long>
@@ -1057,7 +1057,7 @@
<applyto>/apps/nautilus/desktop/home_icon_visible</applyto>
<owner>nautilus</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Home icon visible on desktop</short>
<long>
@@ -1072,7 +1072,7 @@
<applyto>/apps/nautilus/desktop/computer_icon_visible</applyto>
<owner>nautilus</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Computer icon visible on desktop</short>
<long>
@@ -1087,7 +1087,7 @@
<applyto>/apps/nautilus/desktop/trash_icon_visible</applyto>
<owner>nautilus</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Trash icon visible on desktop</short>
<long>
--- /usr/tmp/clean/nautilus-2.29.92.1/src/nautilus-navigation-window-menus.c 2010-03-10 13:59:13.000000000 +0000
+++ nautilus-2.29.92.1/src/nautilus-navigation-window-menus.c 2010-03-19 13:40:04.448973487 +0000
@@ -399,7 +399,6 @@
static const char* icon_entries[] = {
"/MenuBar/Other Menus/Go/Home",
"/MenuBar/Other Menus/Go/Computer",
- "/MenuBar/Other Menus/Go/Go to Templates",
"/MenuBar/Other Menus/Go/Go to Trash",
"/MenuBar/Other Menus/Go/Go to Network",
"/MenuBar/Other Menus/Go/Go to Location"
@@ -849,9 +848,9 @@
G_CALLBACK (action_show_hide_statusbar_callback),
/* is_active */ TRUE },
/* name, stock id */ { "Search", "gtk-find",
- /* label, accelerator */ N_("_Search for Files..."),
+ /* label, accelerator */ N_("F_ind Files"),
/* Accelerator is in ShowSearch */"",
- /* tooltip */ N_("Search documents and folders by name"),
+ /* tooltip */ N_("Find files, folders, and documents on your computer"),
G_CALLBACK (action_show_hide_search_callback),
/* is_active */ FALSE },
/* name, stock id */ { NAUTILUS_ACTION_SHOW_HIDE_EXTRA_PANE, NULL,
diff -ruN nautilus-2.29.2.orig/src/network-scheme.desktop.in nautilus-2.29.2/src/network-scheme.desktop.in
--- nautilus-2.29.2.orig/src/network-scheme.desktop.in 2010-02-02 00:20:43.286324706 +0000
+++ nautilus-2.29.2/src/network-scheme.desktop.in 2010-02-02 00:21:09.242116032 +0000
@@ -1,6 +1,7 @@
[Desktop Entry]
_Name=Network
-_Comment=Browse bookmarked and local network locations
+# SUN_BRANDING
+_Comment=Browse computers and files on your local network
TryExec=nautilus
Exec=nautilus --no-desktop network:
Terminal=false
diff -ruN nautilus-2.29.2.orig/data/nautilus-computer.desktop.in.in nautilus-2.29.2/data/nautilus-computer.desktop.in.in
--- nautilus-2.29.2.orig/data/nautilus-computer.desktop.in.in 2010-02-02 00:23:17.161304623 +0000
+++ nautilus-2.29.2/data/nautilus-computer.desktop.in.in 2010-02-02 00:23:39.354818259 +0000
@@ -1,6 +1,7 @@
[Desktop Entry]
_Name=Computer
-_Comment=Browse all local and remote disks and folders accessible from this computer
+# SUN_BRANDING
+_Comment=Browse computers and files on your local network
TryExec=nautilus
Exec=nautilus --no-desktop computer:
Icon=computer