patches/nautilus-05-context-menu.diff
changeset 13275 95823eef5cd4
parent 13213 8ff5d25653af
child 15469 6f7be4164ea8
--- a/patches/nautilus-05-context-menu.diff	Tue Aug 26 04:39:21 2008 +0000
+++ b/patches/nautilus-05-context-menu.diff	Tue Aug 26 04:47:35 2008 +0000
@@ -1,7 +1,7 @@
-diff -urN nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c
---- nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c	2006-03-18 19:45:15.000000000 +1300
-+++ nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c	2006-05-12 15:39:56.940987000 +1200
-@@ -590,6 +590,24 @@
+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 @@
  }
  
  static void
@@ -26,7 +26,7 @@
  action_new_launcher_callback (GtkAction *action, gpointer data)
  {
  	char *desktop_directory;
-@@ -621,6 +639,21 @@
+@@ -620,6 +638,52 @@
  }
  
  static void
@@ -43,12 +43,43 @@
 +                                                  FALSE);
 +}
 +
++static void
++action_run_application_callback (GtkAction *action,
++                                   gpointer data)
++{
++	Display *display;
++	Atom gnome_panel_atom, run_atom;
++	XClientMessageEvent event;
++
++	display = XOpenDisplay(NULL);
++	if (display == NULL)
++		return;
++
++	gnome_panel_atom = XInternAtom(display, "_GNOME_PANEL_ACTION", False);
++	run_atom = XInternAtom(display, "_GNOME_PANEL_ACTION_RUN_DIALOG", False);
++
++	if (gnome_panel_atom != None && run_atom != None) {
++		event.type = ClientMessage;
++		event.window = DefaultRootWindow(display);
++		event.message_type = gnome_panel_atom;
++		event.format = 32;
++		event.data.l[0] = run_atom;
++		event.data.l[1] = (Time)(time(NULL) * 1000);
++
++		XSendEvent(display, event.window, False, StructureNotifyMask,
++				(XEvent *)&event);
++
++	}
++	XCloseDisplay(display);
++
++	return;
++}
 +
 +static void
  action_empty_trash_conditional_callback (GtkAction *action,
  					 gpointer data)
  {
-@@ -687,6 +720,15 @@
+@@ -686,6 +750,15 @@
  
  static const GtkActionEntry desktop_view_entries[] = {
  	/* name, stock id */
@@ -64,16 +95,25 @@
  	{ "New Launcher Desktop", NULL,
  	  /* label, accelerator */
  	  N_("Create L_auncher..."), NULL,
-@@ -694,13 +736,23 @@
+@@ -693,13 +766,32 @@
  	  N_("Create a new launcher"),
  	  G_CALLBACK (action_new_launcher_callback) },
  	/* name, stock id */
 -	{ "Change Background", NULL,
-+	{ "Desktop Background", NULL,
++	{ "Run Application", NULL,
++	  /* label, accelerator */
++	  /* SUN_BRANDING */
++	  N_("Run Application..."), NULL,
++	  /* tooltip */
++	  /* SUN_BRANDING */
++	  N_("Run an application by typing a command or choosing from a list"),
++	  G_CALLBACK (action_run_application_callback) },
++	/* name, stock id */
++	{ "Desktop Appearance", NULL,
  	  /* label, accelerator */
 -	  N_("Change Desktop _Background"), NULL,
 +	  /* SUN_BRANDING */
-+	  N_("Desktop _Background..."), NULL,
++	  N_("Desktop A_ppearance..."), NULL,
  	  /* tooltip */
  	  N_("Show a window that lets you set your desktop background's pattern or color"),
  	  G_CALLBACK (action_change_background_callback) },
@@ -90,10 +130,10 @@
  	{ "Empty Trash Conditional", NULL,
  	  /* label, accelerator */
  	  N_("Empty Trash"), NULL,
-diff -urN nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml
---- nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml	2005-05-03 00:31:08.000000000 +1200
-+++ nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml	2006-05-12 15:39:27.060581000 +1200
-@@ -2,6 +2,8 @@
+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
+@@ -2,14 +2,19 @@
  <popup name="background">
          <placeholder name="Before Zoom Items">
                  <placeholder name="New Window Items">
@@ -102,12 +142,14 @@
                  </placeholder>
                  <placeholder name="New Object Items">
                          <menuitem name="New Launcher" action="New Launcher Desktop"/>
-@@ -9,7 +11,8 @@
+                 </placeholder>
          </placeholder>
          <placeholder name="After Zoom Items">
++                        <menuitem name="Run Application" action="Run Application"/>
++                        <separator/>
                  <placeholder name="Background Items">
 -                        <menuitem name="Change Background" action="Change Background"/>
-+                        <menuitem name="Desktop Background" action="Desktop Background"/>
++                        <menuitem name="Desktop Appearance" action="Desktop Appearance"/>
 +			<menuitem name="Screen Resolution" action="Screen Resolution"/>
                  </placeholder>
          </placeholder>