[Pkg-utopia-commits] r174 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Tue, 08 Feb 2005 16:09:54 +0100
Author: sjoerd
Date: 2005-02-08 16:09:53 +0100 (Tue, 08 Feb 2005)
New Revision: 174
Added:
packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
Log:
Disable the autorun code
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2005-02-08 13:37:03 UTC (rev 173)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2005-02-08 15:09:53 UTC (rev 174)
@@ -6,11 +6,13 @@
+ debian/patches/08_fr.patch
+ debian/patches/30_26_kernel_hint.patch
* debian/gnome-volume-manager-gthumb
- Fix a problem when the mountpoint contains spaces.
- Patch from Olivier Berger (Closes: #294039)
+ + Fix a problem when the mountpoint contains spaces.
+ Patch from Olivier Berger (Closes: #294039)
+ * debian/patches/40_no_autorun.patch*
+ + Disable the autorun code.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Tue, 8 Feb 2005 16:05:41 +0100
- -- Sjoerd Simons <sjoerd@debian.org> Tue, 8 Feb 2005 14:33:25 +0100
-
gnome-volume-manager (1.1.2-5) unstable; urgency=low
* debian/patches/20_specify_programs.patch
Added: packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch 2005-02-08 13:37:03 UTC (rev 173)
+++ packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch 2005-02-08 15:09:53 UTC (rev 174)
@@ -0,0 +1,118 @@
+diff -ruN gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade gnome-volume-manager-1.1.3/gnome-volume-properties.glade
+--- gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade 2005-01-23 23:11:02.000000000 +0100
++++ gnome-volume-manager-1.1.3/gnome-volume-properties.glade 2005-02-08 15:46:19.555024502 +0100
+@@ -182,25 +182,6 @@
+ <property name="fill">False</property>
+ </packing>
+ </child>
+-
+- <child>
+- <widget class="GtkCheckButton" id="autorun_cb">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Auto-run programs on new drives and media</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+@@ -357,6 +338,7 @@
+ <property name="directory_entry">False</property>
+ <property name="modal">False</property>
+ <property name="use_filechooser">True</property>
++ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="command_cdr_entry">
+@@ -367,7 +349,7 @@
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+- <property name="invisible_char" translatable="yes">*</property>
++ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+@@ -581,6 +563,7 @@
+ <property name="directory_entry">False</property>
+ <property name="modal">False</property>
+ <property name="use_filechooser">True</property>
++ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="command_cda_entry">
+@@ -591,7 +574,7 @@
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+- <property name="invisible_char" translatable="yes">*</property>
++ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+@@ -773,6 +756,7 @@
+ <property name="directory_entry">False</property>
+ <property name="modal">False</property>
+ <property name="use_filechooser">True</property>
++ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="command_dvd_entry">
+@@ -783,7 +767,7 @@
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+- <property name="invisible_char" translatable="yes">*</property>
++ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+@@ -965,6 +949,7 @@
+ <property name="directory_entry">False</property>
+ <property name="modal">False</property>
+ <property name="use_filechooser">True</property>
++ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="command_photo_entry">
+@@ -975,7 +960,7 @@
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+- <property name="invisible_char" translatable="yes">*</property>
++ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
+--- gnome-volume-manager-1.1.3-old/src/manager.c 2005-02-08 15:46:19.461022000 +0100
++++ gnome-volume-manager-1.1.3/src/manager.c 2005-02-08 15:49:07.553017499 +0100
+@@ -462,7 +462,7 @@
+
+ if (gvm_check_photos (udi, device, mount_point))
+ goto out;
+-
++/*
+ if (config.autorun == TRUE && config.autorun_path) {
+ char **autorun_fns;
+ int i;
+@@ -500,7 +500,7 @@
+
+ g_strfreev (autorun_fns);
+ }
+-
++*/
+ if ((config.autobrowse == TRUE) && (autorun_succeeded == FALSE)) {
+ gvm_run_command (device, NAUTILUS_COMMAND, mount_point, udi);
+ }