--- a/patches/nautilus-05-context-menu.diff Mon Mar 23 05:20:33 2009 +0000
+++ b/patches/nautilus-05-context-menu.diff Mon Mar 23 06:06:57 2009 +0000
@@ -1,7 +1,6 @@
-diff -ur nautilus-2.23.6.1-orig/src/file-manager/fm-desktop-icon-view.c nautilus-2.23.6.1/src/file-manager/fm-desktop-icon-view.c
---- nautilus-2.23.6.1-orig/src/file-manager/fm-desktop-icon-view.c 2008-07-21 17:53:43.000000000 +0800
-+++ nautilus-2.23.6.1/src/file-manager/fm-desktop-icon-view.c 2008-08-19 14:27:01.481290399 +0800
-@@ -589,6 +589,24 @@
+--- nautilus-2.26.0/src/file-manager/fm-desktop-icon-view.c.old 2009-02-02 20:28:28.000000000 +0800
++++ nautilus-2.26.0/src/file-manager/fm-desktop-icon-view.c 2009-03-20 12:44:40.374095000 +0800
+@@ -592,6 +592,25 @@
}
static void
@@ -11,8 +10,9 @@
+ GError *error = NULL;
+ g_assert (FM_DIRECTORY_VIEW (data));
+
-+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml", NULL,
-+ gtk_widget_get_screen (GTK_WIDGET (data)), &error);
++ gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (data)),
++ "ghelp:user-guide", gtk_get_current_event_time (),
++ &error);
+
+ if (error) {
+ /* SUN_BRANDING */
@@ -26,7 +26,7 @@
action_new_launcher_callback (GtkAction *action, gpointer data)
{
char *desktop_directory;
-@@ -620,6 +638,52 @@
+@@ -623,6 +642,52 @@
}
static void
@@ -79,11 +79,11 @@
action_empty_trash_conditional_callback (GtkAction *action,
gpointer data)
{
-@@ -686,6 +750,15 @@
+@@ -689,6 +754,15 @@
static const GtkActionEntry desktop_view_entries[] = {
/* name, stock id */
-+ { "About JDS", "gtk-help",
++ { "About Solaris Desktop", "gtk-help",
+ /* label, accelerator */
+ /* SUN_BRANDING */
+ N_("_Help"), NULL,
@@ -95,7 +95,7 @@
{ "New Launcher Desktop", NULL,
/* label, accelerator */
N_("Create L_auncher..."), NULL,
-@@ -693,13 +766,32 @@
+@@ -696,13 +770,32 @@
N_("Create a new launcher"),
G_CALLBACK (action_new_launcher_callback) },
/* name, stock id */
@@ -130,9 +130,8 @@
{ "Empty Trash Conditional", NULL,
/* label, accelerator */
N_("Empty Trash"), NULL,
-diff -ur nautilus-2.23.6.1-orig/src/file-manager/nautilus-desktop-icon-view-ui.xml nautilus-2.23.6.1/src/file-manager/nautilus-desktop-icon-view-ui.xml
---- nautilus-2.23.6.1-orig/src/file-manager/nautilus-desktop-icon-view-ui.xml 2008-07-01 00:09:59.000000000 +0800
-+++ nautilus-2.23.6.1/src/file-manager/nautilus-desktop-icon-view-ui.xml 2008-08-19 15:14:38.508835060 +0800
+--- nautilus-2.26.0/src/file-manager/nautilus-desktop-icon-view-ui.xml.old 2009-03-20 12:36:33.416820000 +0800
++++ nautilus-2.26.0/src/file-manager/nautilus-desktop-icon-view-ui.xml 2009-03-20 12:38:41.895914000 +0800
@@ -2,14 +2,19 @@
<popup name="background">
<placeholder name="Before Zoom Items">