[Pkg-utopia-commits] r88 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@haydn.debian.org
Wed, 17 Nov 2004 08:29:43 -0700
Author: sjoerd
Date: 2004-11-17 08:29:06 -0700 (Wed, 17 Nov 2004)
New Revision: 88
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
Log:
* Don't change the gui. The preference to not mount fixed drives automagically
should be set in a hal fdi file now
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 15:26:28 UTC (rev 87)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 15:29:06 UTC (rev 88)
@@ -17,6 +17,9 @@
+ Removed. Obsoleted by debian/patches/00_set_defaults.patch
* debian/patches/04_honor_automount_enabled_hint.patch
+ Added. honor hal's storage.automount_enabled_hint property
+ * debian/patches/06_mount_at_start.patch
+ + Updated. Removed gui option to not mount static drives. This should be
+ done by a hal fdi file now.
-- Sjoerd Simons <sjoerd@debian.org> Wed, 17 Nov 2004 11:44:57 +0100
Modified: packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch 2004-11-17 15:26:28 UTC (rev 87)
+++ packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch 2004-11-17 15:29:06 UTC (rev 88)
@@ -1,82 +1,7 @@
-diff -ruN gnome-volume-manager-old/gnome-volume-manager.schemas.in gnome-volume-manager/gnome-volume-manager.schemas.in
---- gnome-volume-manager-old/gnome-volume-manager.schemas.in 2004-11-17 15:53:15.516544000 +0100
-+++ gnome-volume-manager/gnome-volume-manager.schemas.in 2004-11-17 15:54:17.588248200 +0100
-@@ -2,6 +2,17 @@
- <schemalist>
-
- <schema>
-+ <key>/schemas/desktop/gnome/volume_manager/automount_static_drives</key>
-+ <applyto>/desktop/gnome/volume_manager/automount_static_drives</applyto>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Automount static drives on session start</short>
-+ <long>Whether gnome-volume-manager should automatically mount
-+ static storage drives on session start.</long>
-+ </locale>
-+ </schema>
-+ <schema>
- <key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
- <applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
- <type>bool</type>
-diff -ruN gnome-volume-manager-old/gnome-volume-properties.glade gnome-volume-manager/gnome-volume-properties.glade
---- gnome-volume-manager-old/gnome-volume-properties.glade 2004-08-13 19:11:56.000000000 +0200
-+++ gnome-volume-manager/gnome-volume-properties.glade 2004-11-17 15:54:17.593248498 +0100
-@@ -122,10 +122,29 @@
- <property name="spacing">0</property>
-
- <child>
-+ <widget class="GtkCheckButton" id="automount_static_drives_cb">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">_Mount static drives on session start</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>
-+
-+ <child>
- <widget class="GtkCheckButton" id="automount_drives_cb">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">_Mount removable drives when hot-plugged</property>
-+ <property name="label" translatable="yes">Mount removable drives when hot-plugged</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-diff -ruN gnome-volume-manager-old/src/gvm.h gnome-volume-manager/src/gvm.h
---- gnome-volume-manager-old/src/gvm.h 2004-08-13 19:11:56.000000000 +0200
-+++ gnome-volume-manager/src/gvm.h 2004-11-17 15:54:17.594248558 +0100
-@@ -5,6 +5,7 @@
- struct gvm_configuration {
- GConfClient *client;
-
-+ gboolean automount_static_drives;
- gboolean automount_drives;
- gboolean automount_media;
- gboolean autobrowse;
diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c 2004-11-17 15:53:15.637551000 +0100
-+++ gnome-volume-manager/src/manager.c 2004-11-17 15:54:17.599248856 +0100
-@@ -66,6 +66,8 @@
- static void
- gvm_load_config (void)
- {
-+ config.automount_static_drives = gconf_client_get_bool (config.client,
-+ GCONF_ROOT "automount_static_drives", NULL);
- config.automount_drives = gconf_client_get_bool (config.client,
- GCONF_ROOT "automount_drives", NULL);
- config.automount_media = gconf_client_get_bool (config.client,
-@@ -1009,9 +1011,8 @@
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 16:18:28.644043000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 16:19:42.455455979 +0100
+@@ -1033,9 +1033,8 @@
char **volumes;
char *udi;
char *device_file;
@@ -88,8 +13,8 @@
volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
for (i = 0; i < num_volumes; i++) {
-@@ -1032,6 +1033,22 @@
- "filesystem") != 0)
+@@ -1059,6 +1058,20 @@
+ if (gvm_is_manual_mount(ctx, udi))
continue;
+ drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
@@ -101,9 +26,7 @@
+ hal_device_property_exists(ctx, drive_udi, "storage.removable") &&
+ hal_device_get_property_bool(ctx, drive_udi, "storage.removable")) {
+ do_mount = config.automount_media;
-+ } else {
-+ do_mount = config.automount_static_drives;
-+ }
++ }
+ hal_free_string(drive_udi);
+
+ if (!do_mount) continue;
@@ -111,68 +34,3 @@
device_file = hal_device_get_property_string (ctx, udi,
"block.device");
-diff -ruN gnome-volume-manager-old/src/properties.c gnome-volume-manager/src/properties.c
---- gnome-volume-manager-old/src/properties.c 2004-08-13 21:49:44.000000000 +0200
-+++ gnome-volume-manager/src/properties.c 2004-11-17 15:54:17.602249035 +0100
-@@ -33,6 +33,7 @@
- #endif
-
- GtkWidget *dialog;
-+GtkWidget *automount_static_drives_cb;
- GtkWidget *automount_drives_cb;
- GtkWidget *automount_media_cb;
- GtkWidget *autobrowse_cb;
-@@ -79,6 +80,8 @@
- static void
- write_config (void)
- {
-+ gconf_client_set_bool (config.client, GCONF_ROOT "automount_static_drives",
-+ config.automount_static_drives, NULL);
- gconf_client_set_bool (config.client, GCONF_ROOT "automount_drives",
- config.automount_drives, NULL);
- gconf_client_set_bool (config.client, GCONF_ROOT "automount_media",
-@@ -114,6 +117,8 @@
- static void
- signal_response (void)
- {
-+ config.automount_static_drives = GTK_TOGGLE_BUTTON
-+ (automount_static_drives_cb)->active;
- config.automount_drives = GTK_TOGGLE_BUTTON
- (automount_drives_cb)->active;
- config.automount_media = GTK_TOGGLE_BUTTON
-@@ -203,6 +208,8 @@
- {
- lock_config = TRUE;
-
-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (automount_static_drives_cb),
-+ config.automount_static_drives);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (automount_drives_cb),
- config.automount_drives);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (automount_media_cb),
-@@ -246,6 +253,8 @@
- static void
- read_config (void)
- {
-+ config.automount_static_drives = gconf_client_get_bool (config.client,
-+ GCONF_ROOT "automount_static_drives", NULL);
- config.automount_drives = gconf_client_get_bool (config.client,
- GCONF_ROOT "automount_drives", NULL);
- config.automount_media = gconf_client_get_bool (config.client,
-@@ -438,6 +447,8 @@
-
- g_object_unref (icon_theme);
-
-+ automount_static_drives_cb =
-+ glade_xml_get_widget (xml, "automount_static_drives_cb");
- 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");
-@@ -486,6 +497,8 @@
-
- read_config ();
-
-+ gtk_signal_connect (GTK_OBJECT (automount_static_drives_cb), "toggled",
-+ GTK_SIGNAL_FUNC (signal_response), NULL);
- gtk_signal_connect (GTK_OBJECT (automount_drives_cb), "toggled",
- GTK_SIGNAL_FUNC (signal_response), NULL);
- gtk_signal_connect (GTK_OBJECT (automount_media_cb), "toggled",