[meego-packaging] 4852: Changes to MeeGo:1.0:Netbook:Update:Testing/nautilus

[Wang Quanxian]

Hi,
I have made the following changes to nautilus in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Wang Quanxian

[This message was auto-generated]

---

Request #4852:

  submit:   home:quanxianwang:branches:MeeGo:1.0:Netbook:Update:Testing/nautilus(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/nautilus


Message:
    delete the help contents and F1 hotkey

State:   new          2010-06-24T13:56:38 quanxianwang
Comment: None



changes files:
--------------
--- nautilus.changes
+++ nautilus.changes
@@ -0,0 +1,4 @@
+* Fri Jun 18 2010 Quanxian Wang <quanxian.wang at intel.com> - 2.30.0
+- Remove the help
+- Fixes BMC#2842
+

new:
----
  del_help_2842.patch

spec files:
-----------
--- nautilus.spec
+++ nautilus.spec
@@ -71,6 +71,7 @@
 Patch6: nautilus-2.28.0-gthread.patch
 Patch7: nautilus-2.28.0-correct-ko-string.patch
 Patch9: meego-fix-desktop-folder-name.patch
+Patch10: del_help_2842.patch
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -107,6 +108,7 @@
 %patch6 -p1 -b .gthread
 %patch7 -p1 -b .correct-ko-string
 %patch9 -p1 -b .meego-fix-desktop-folder-name
+%patch10 -p1 -b .del_help_2842
 %build
 
 gtkdocize

other changes:
--------------

++++++ del_help_2842.patch (new)
--- del_help_2842.patch
+++ del_help_2842.patch
+--- nautilus-2.30.0/src/nautilus-window-menus.c_orig	2010-06-18 10:31:11.029005136 +0800
++++ nautilus-2.30.0/src/nautilus-window-menus.c	2010-06-18 10:31:31.285631008 +0800
+@@ -814,10 +814,10 @@ static const GtkActionEntry main_entries
+   /* label, accelerator */       N_("_Reload"), "<control>R",
+   /* tooltip */                  N_("Reload the current location"),
+                                  G_CALLBACK (action_reload_callback) },
+-  /* name, stock id */         { "Nautilus Manual", GTK_STOCK_HELP,
+-  /* label, accelerator */       N_("_Contents"), "F1",
+-  /* tooltip */                  N_("Display Nautilus help"),
+-                                 G_CALLBACK (action_nautilus_manual_callback) },
++//  /* name, stock id */         { "Nautilus Manual", GTK_STOCK_HELP,
++//  /* label, accelerator */       N_("_Contents"), "F1",
++//  /* tooltip */                  N_("Display Nautilus help"),
++//                                 G_CALLBACK (action_nautilus_manual_callback) },
+   /* name, stock id */         { "About Nautilus", GTK_STOCK_ABOUT,
+   /* label, accelerator */       N_("_About"), NULL,
+   /* tooltip */                  N_("Display credits for the creators of Nautilus"),
+--- nautilus-2.30.0/src/nautilus-shell-ui.xml_orig	2010-06-18 12:26:10.957977832 +0800
++++ nautilus-2.30.0/src/nautilus-shell-ui.xml	2010-06-18 12:26:22.532588589 +0800
+@@ -64,7 +64,6 @@
+ 	</menu>
+ 	<placeholder name="Other Menus"/>
+ 	<menu action="Help">
+-		<menuitem name="Nautilus Manual" action="Nautilus Manual"/>
+ 		<menuitem name="About Nautilus" action="About Nautilus"/>
+ 	</menu>
+ </menubar>