20802N/A/jds/bin/diff -uprN nautilus-2.26.3.old/src/najutiulus-desktop-icon-view.c nautilus-2.26.3/src/nautilus-desktop-icon-view.c
20802N/A--- nautilus-2.26.3.old/src/nautilus-desktop-icon-view.c 2009-05-18 20:44:27.000000000 +0100
20802N/A+++ nautilus-2.26.3/src/nautilus-desktop-icon-view.c 2009-07-13 11:36:17.871809000 +0100
20824N/A@@ -658,6 +658,71 @@ action_change_background_callback (GtkAc
9802N/A }
9802N/A
9802N/A static void
9802N/A+action_help_callback (GtkAction *action,
9802N/A+ gpointer data)
9802N/A+{
9802N/A+ GError *error = NULL;
20802N/A+ g_assert (data);
9802N/A+
16220N/A+ gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (data)),
20824N/A+ "ghelp:user-guide", gtk_get_current_event_time (),
20824N/A+ &error);
9802N/A+
9802N/A+ if (error) {
10017N/A+ /* SUN_BRANDING */
9802N/A+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
9802N/A+ NULL);
9802N/A+ g_error_free (error);
9802N/A+ }
9802N/A+}
9802N/A+
9802N/A+static void
9802N/A+action_change_resolution_callback (GtkAction *action,
9802N/A+ gpointer data)
9802N/A+{
20802N/A+ g_assert (data);
9802N/A+
9802N/A+ nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
10017N/A+ /* SUN_BRANDING */
9802N/A+ _("Resolution"),
9802N/A+ "gnome-display-properties",
9802N/A+ NULL,
9802N/A+ FALSE);
9802N/A+}
9802N/A+
14017N/A+static void
14017N/A+action_run_application_callback (GtkAction *action,
14017N/A+ gpointer data)
14017N/A+{
14017N/A+ Display *display;
14017N/A+ Atom gnome_panel_atom, run_atom;
14017N/A+ XClientMessageEvent event;
14017N/A+
14017N/A+ display = XOpenDisplay(NULL);
14017N/A+ if (display == NULL)
14017N/A+ return;
14017N/A+
14017N/A+ gnome_panel_atom = XInternAtom(display, "_GNOME_PANEL_ACTION", False);
14017N/A+ run_atom = XInternAtom(display, "_GNOME_PANEL_ACTION_RUN_DIALOG", False);
14017N/A+
14017N/A+ if (gnome_panel_atom != None && run_atom != None) {
14017N/A+ event.type = ClientMessage;
14017N/A+ event.window = DefaultRootWindow(display);
14017N/A+ event.message_type = gnome_panel_atom;
14017N/A+ event.format = 32;
14017N/A+ event.data.l[0] = run_atom;
14017N/A+ event.data.l[1] = (Time)(time(NULL) * 1000);
14017N/A+
14017N/A+ XSendEvent(display, event.window, False, StructureNotifyMask,
14017N/A+ (XEvent *)&event);
14017N/A+
14017N/A+ }
14017N/A+ XCloseDisplay(display);
14017N/A+
14017N/A+ return;
14017N/A+}
9802N/A+
9802N/A+static void
9802N/A action_empty_trash_conditional_callback (GtkAction *action,
9802N/A gpointer data)
9802N/A {
20824N/A@@ -725,13 +790,41 @@ real_update_menus (NautilusView *view)
20824N/A }
9802N/A
9802N/A static const GtkActionEntry desktop_view_entries[] = {
20824N/A+ /* name, stock id */
20824N/A+ { "About Solaris Desktop", "gtk-help",
20824N/A+ /* label, accelerator */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("_Help"), NULL,
20824N/A+ /* tooltip */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("About Sun Java Desktop System"),
20824N/A+ G_CALLBACK (action_help_callback) },
9802N/A /* name, stock id */
9802N/A- { "Change Background", NULL,
20824N/A- /* label, accelerator */
9802N/A- N_("Change Desktop _Background"), NULL,
20824N/A- /* tooltip */
20824N/A- N_("Show a window that lets you set your desktop background's pattern or color"),
20824N/A- G_CALLBACK (action_change_background_callback) },
20824N/A+ { "Run Application", NULL,
20824N/A+ /* label, accelerator */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("Run Application..."), NULL,
20824N/A+ /* tooltip */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("Run an application by typing a command or choosing from a list"),
20824N/A+ G_CALLBACK (action_run_application_callback) },
20824N/A+ /* name, stock id */
20824N/A+ { "Desktop Appearance", NULL,
20824N/A+ /* label, accelerator */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("Desktop A_ppearance..."), NULL,
20824N/A+ /* tooltip */
20824N/A+ N_("Show a window that lets you set your desktop background's pattern or color"),
20824N/A+ G_CALLBACK (action_change_background_callback) },
20824N/A+ /* name, stock id */
20824N/A+ { "Screen Resolution", NULL,
20824N/A+ /* label, accelerator */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("Screen _Resolution..."), NULL,
20824N/A+ /* tooltip */
20824N/A+ /* SUN_BRANDING */
20824N/A+ N_("Show a window that lets you set your desktop screen resolution"),
20824N/A+ G_CALLBACK (action_change_resolution_callback) },
9802N/A /* name, stock id */
9802N/A { "Empty Trash Conditional", NULL,
9802N/A /* label, accelerator */
20802N/A/jds/bin/diff -uprN nautilus-2.26.3.old/src/nautilus-desktop-icon-view-ui.xml nautilus-2.26.3/src/nautilus-desktop-icon-view-ui.xml
20802N/A--- nautilus-2.26.3.old/src/nautilus-desktop-icon-view-ui.xml 2009-04-20 11:57:20.000000000 +0100
20802N/A+++ nautilus-2.26.3/src/nautilus-desktop-icon-view-ui.xml 2009-07-13 11:36:17.872197000 +0100
18162N/A@@ -8,8 +8,11 @@
14017N/A </placeholder>
9802N/A </placeholder>
9802N/A <placeholder name="After Zoom Items">
14017N/A+ <menuitem name="Run Application" action="Run Application"/>
14017N/A+ <separator/>
9802N/A <placeholder name="Background Items">
9802N/A- <menuitem name="Change Background" action="Change Background"/>
14017N/A+ <menuitem name="Desktop Appearance" action="Desktop Appearance"/>
9802N/A+ <menuitem name="Screen Resolution" action="Screen Resolution"/>
9802N/A </placeholder>
9802N/A </placeholder>
9802N/A </popup>