[Pkg-utopia-commits] r181 - packages/gnome-volume-manager/trunk/debian/patches
Sjoerd Simons
sjoerd@costa.debian.org
Sat, 12 Feb 2005 20:10:34 +0100
Author: sjoerd
Date: 2005-02-12 20:10:34 +0100 (Sat, 12 Feb 2005)
New Revision: 181
Modified:
packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch
Log:
Improved the remove autorun patch
Modified: packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch 2005-02-12 19:09:13 UTC (rev 180)
+++ packages/gnome-volume-manager/trunk/debian/patches/40_no_autorun.patch 2005-02-12 19:10:34 UTC (rev 181)
@@ -1,6 +1,6 @@
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
++++ gnome-volume-manager-1.1.3/gnome-volume-properties.glade 2005-02-12 19:57:50.560900586 +0100
@@ -182,25 +182,6 @@
<property name="fill">False</property>
</packing>
@@ -96,8 +96,8 @@
</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
+--- gnome-volume-manager-1.1.3-old/src/manager.c 2005-02-12 19:57:50.366896000 +0100
++++ gnome-volume-manager-1.1.3/src/manager.c 2005-02-12 19:57:50.562900632 +0100
@@ -462,7 +462,7 @@
if (gvm_check_photos (udi, device, mount_point))
@@ -116,3 +116,97 @@
if ((config.autobrowse == TRUE) && (autorun_succeeded == FALSE)) {
gvm_run_command (device, NAUTILUS_COMMAND, mount_point, udi);
}
+diff -ruN gnome-volume-manager-1.1.3-old/src/properties.c gnome-volume-manager-1.1.3/src/properties.c
+--- gnome-volume-manager-1.1.3-old/src/properties.c 2005-02-12 19:57:50.432897000 +0100
++++ gnome-volume-manager-1.1.3/src/properties.c 2005-02-12 19:59:23.414029155 +0100
+@@ -36,7 +36,7 @@
+ GtkWidget *automount_drives_cb;
+ GtkWidget *automount_media_cb;
+ GtkWidget *autobrowse_cb;
+-GtkWidget *autorun_cb;
++//GtkWidget *autorun_cb;
+ GtkWidget *autoplay_cda_cb;
+ GtkWidget *command_cda_hbox;
+ GtkWidget *command_cda_entry;
+@@ -65,8 +65,8 @@
+ static void
+ set_sensitivity (void)
+ {
+- gtk_widget_set_sensitive (autorun_cb,
+- config.automount_media || config.automount_drives);
++/* gtk_widget_set_sensitive (autorun_cb,
++ config.automount_media || config.automount_drives); */
+ gtk_widget_set_sensitive (command_cda_hbox, config.autoplay_cda);
+ gtk_widget_set_sensitive (command_cdr_hbox, config.autoburn_cdr);
+ gtk_widget_set_sensitive (command_dvd_hbox, config.autoplay_dvd);
+@@ -85,8 +85,8 @@
+ config.automount_media, NULL);
+ gconf_client_set_bool (config.client, GCONF_ROOT "autobrowse",
+ config.autobrowse, NULL);
+- gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
+- config.autorun, NULL);
++/* gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
++ config.autorun, NULL); */
+ gconf_client_set_bool (config.client, GCONF_ROOT "autoburn_cdr",
+ config.autoburn_cdr, NULL);
+ gconf_client_set_string (config.client,
+@@ -120,7 +120,7 @@
+ (automount_media_cb)->active;
+ config.autobrowse = GTK_TOGGLE_BUTTON
+ (autobrowse_cb)->active;
+- config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active;
++/* config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active; */
+ config.autoburn_cdr = GTK_TOGGLE_BUTTON (autoburn_cdr_cb)->active;
+ config.autoplay_cda = GTK_TOGGLE_BUTTON (autoplay_cda_cb)->active;
+ config.autoplay_dvd = GTK_TOGGLE_BUTTON (autoplay_dvd_cb)->active;
+@@ -170,7 +170,7 @@
+ GError *error = NULL;
+
+ if (!(config.automount_drives || config.automount_media
+- || config.autobrowse || config.autorun
++ || config.autobrowse /* || config.autorun */
+ || config.autoplay_cda || config.autoplay_dvd
+ || config.autophoto) || check_clipboard ())
+ return;
+@@ -209,8 +209,8 @@
+ config.automount_media);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autobrowse_cb),
+ config.autobrowse);
+- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
+- config.autorun);
++/* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
++ config.autorun); */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autoplay_cda_cb),
+ config.autoplay_cda);
+
+@@ -252,8 +252,8 @@
+ GCONF_ROOT "automount_media", NULL);
+ config.autobrowse = gconf_client_get_bool (config.client,
+ GCONF_ROOT "autobrowse", NULL);
+- config.autorun = gconf_client_get_bool (config.client,
+- GCONF_ROOT "autorun", NULL);
++/* config.autorun = gconf_client_get_bool (config.client,
++ GCONF_ROOT "autorun", NULL); */
+ config.autoplay_cda = gconf_client_get_bool (config.client,
+ GCONF_ROOT "autoplay_cda", NULL);
+ config.autoplay_cda_command =
+@@ -434,7 +434,7 @@
+ automount_drives_cb = glade_xml_get_widget (xml, "automount_drives_cb");
+ automount_media_cb = glade_xml_get_widget (xml, "automount_media_cb");
+ autobrowse_cb = glade_xml_get_widget (xml, "autobrowse_cb");
+- autorun_cb = glade_xml_get_widget (xml, "autorun_cb");
++/* autorun_cb = glade_xml_get_widget (xml, "autorun_cb"); */
+
+ autoplay_cda_cb = glade_xml_get_widget (xml, "autoplay_cda_cb");
+ command_cda_entry = glade_xml_get_widget (xml, "command_cda_entry");
+@@ -485,8 +485,8 @@
+ GTK_SIGNAL_FUNC (signal_response), NULL);
+ gtk_signal_connect (GTK_OBJECT (autobrowse_cb), "toggled",
+ GTK_SIGNAL_FUNC (signal_response), NULL);
+- gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
+- GTK_SIGNAL_FUNC (signal_response), NULL);
++/* gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
++ GTK_SIGNAL_FUNC (signal_response), NULL); */
+
+ gtk_signal_connect (GTK_OBJECT (autoplay_cda_cb), "toggled",
+ GTK_SIGNAL_FUNC (signal_response), NULL);