[meego-commits] 9488: Changes to MeeGo:1.1:Netbook:Testing/nautilus

[Zhang Qiang]

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

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #9488:

  submit:   home:xiaoqiang:branches:MeeGo:1.1:Netbook:Testing/nautilus(r4)(cleanup) -> MeeGo:1.1:Netbook:Testing/nautilus


Message:
    update nautilus-config.patch to disable media auto-run. and also  disable it in source code. fix BMC#1061

State:   new          2010-11-14T18:32:29 xiaoqiang
Comment: None



changes files:
--------------
--- nautilus.changes
+++ nautilus.changes
@@ -0,0 +1,4 @@
+* Fri Nov 12 2010 Zhang Qiang <qiang.z.zhang at intel.com> -2.30.0
+- update nautilus-config.patch to disable media auto-run. and also
+  disable it in source code. fix BMC#1061
+

new:
----
  nautilus-disable-media-auto-run.patch

spec files:
-----------
--- nautilus.spec
+++ nautilus.spec
@@ -31,7 +31,7 @@
 Requires:       gvfs-gphoto2  
 Requires:       xdg-user-dirs-gtk
 Requires:	eject
-PreReq:		scrollkeeper >= 0.1.4
+Requires(pre):    scrollkeeper >= 0.1.4
 
 BuildRequires:	pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:	pango-devel >= %{pango_version}
@@ -75,6 +75,7 @@
 Patch11: del_help_2842.patch
 Patch12: meego-adjust-file-management-properties-layout.patch
 Patch13: MeeGo-adjust-nautilus-property-layout.patch
+Patch14: nautilus-disable-media-auto-run.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.
@@ -115,6 +116,7 @@
 %patch11 -p1 -b .del_help_2842
 %patch12 -p1 -b .meego-adjust-file-management-properties-layout
 %patch13 -p1 -b .MeeGo-adjust-nautilus-property-layout
+%patch14 -p1 -b .nautilus-disable-media-auto-run
 %build
 
 gtkdocize

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

++++++ nautilus-config.patch
--- nautilus-config.patch
+++ nautilus-config.patch
@@ -1,7 +1,16 @@
-diff -up nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in
---- nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config	2009-08-12 21:07:44.331994084 -0400
-+++ nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in	2009-08-12 21:26:31.258991695 -0400
-@@ -169,7 +169,7 @@
+diff -uNr nautilus-2.30.0/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.30.0.new/libnautilus-private/apps_nautilus_preferences.schemas.in
+--- nautilus-2.30.0/libnautilus-private/apps_nautilus_preferences.schemas.in	2010-03-17 18:14:12.000000000 +0800
++++ nautilus-2.30.0.new/libnautilus-private/apps_nautilus_preferences.schemas.in	2010-10-27 10:56:05.776518373 +0800
+@@ -138,7 +138,7 @@
+       <applyto>/apps/nautilus/preferences/media_autorun_never</applyto>
+       <owner>nautilus</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+          <short>Never prompt or autorun/autostart programs when media are inserted</short>
+          <long>
+@@ -154,7 +154,7 @@
        <owner>nautilus</owner>
        <type>list</type>
        <list_type>string</list_type>
@@ -10,7 +19,7 @@
        <locale name="C">
           <short>List of x-content/* types where the preferred application will be launched</short>
           <long>
-@@ -187,7 +187,7 @@
+@@ -172,7 +172,7 @@
        <owner>nautilus</owner>
        <type>list</type>
        <list_type>string</list_type>

++++++ nautilus-disable-media-auto-run.patch (new)
--- nautilus-disable-media-auto-run.patch
+++ nautilus-disable-media-auto-run.patch
+diff -uNr nautilus-2.30.0/libnautilus-private/nautilus-autorun.c nautilus-2.30.0.new/libnautilus-private/nautilus-autorun.c
+--- nautilus-2.30.0/libnautilus-private/nautilus-autorun.c	2009-12-08 17:50:42.000000000 +0800
++++ nautilus-2.30.0.new/libnautilus-private/nautilus-autorun.c	2010-11-12 16:40:32.713518546 +0800
+@@ -1106,6 +1106,8 @@
+ nautilus_autorun (GMount *mount, NautilusAutorunOpenWindow open_window_func, gpointer user_data)
+ {
+ 	AutorunData *data;
++	
++	return;
+ 
+ 	if (!should_autorun_mount (mount) ||
+ 	    eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER)) {