rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.71, 1.72 gvm-nomedia.patch, 1.2, 1.3
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Mon Mar 31 15:17:25 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-volume-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826
Modified Files:
gnome-volume-manager.spec gvm-nomedia.patch
Log Message:
Fix some issues with the nomedia patch
Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-volume-manager.spec 9 Feb 2008 18:13:42 -0000 1.71
+++ gnome-volume-manager.spec 31 Mar 2008 15:16:07 -0000 1.72
@@ -1,7 +1,7 @@
Summary: The GNOME Volume Manager
Name: gnome-volume-manager
Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/System
Source0: http://download.gnome.org/sources/gnome-volume-manager/2.22/gnome-volume-manager-%{version}.tar.bz2
@@ -117,6 +117,10 @@
%{_datadir}/gnome/autostart/gnome-volume-manager.desktop
%changelog
+* Mon Mar 31 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
+- Fix https://bugs.launchpad.net/ubuntu/+source/gnome-volume-manager/+bug/202931
+- Fix http://bugzilla.gnome.org/show_bug.cgi?id=525345
+
* Sat Feb 09 2008 Colin Walters <walters at redhat.com> - 2.22.0-3
- BR libnotify so we get low disk space notifications
gvm-nomedia.patch:
Index: gvm-nomedia.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gvm-nomedia.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gvm-nomedia.patch 16 Jan 2008 05:18:13 -0000 1.2
+++ gvm-nomedia.patch 31 Mar 2008 15:16:07 -0000 1.3
@@ -1,71 +1,6 @@
---- gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in 2008-01-15 23:26:50.000000000 -0500
-+++ hacked/gnome-volume-manager.schemas.in 2008-01-15 23:26:29.000000000 -0500
-@@ -16,7 +16,7 @@
- <key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
- <applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Automount removable drives</short>
- <long>Whether gnome-volume-manager should automatically mount
-@@ -28,7 +28,7 @@
- <key>/schemas/desktop/gnome/volume_manager/automount_media</key>
- <applyto>/desktop/gnome/volume_manager/automount_media</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Automount removable media</short>
- <long>Whether gnome-volume-manager should automatically mount
-@@ -40,7 +40,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
- <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Autorun nautilus</short>
- <long>Open nautilus on removeable media insert.</long>
-@@ -97,7 +97,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autoplay_cda</key>
- <applyto>/desktop/gnome/volume_manager/autoplay_cda</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Play inserted audio CD's</short>
- <long>Whether, when an audio CD is inserted, gnome-volume-manager
-@@ -154,7 +154,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd</key>
- <applyto>/desktop/gnome/volume_manager/autoplay_dvd</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Play inserted video DVDs</short>
- <long>Whether, when a video DVD is inserted,
-@@ -177,7 +177,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd</key>
- <applyto>/desktop/gnome/volume_manager/autoplay_vcd</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Play inserted video VCDs</short>
- <long>Whether, when a video VCD is inserted,
-@@ -200,7 +200,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
- <applyto>/desktop/gnome/volume_manager/autophoto</applyto>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Run photo management command</short>
- <long>Whether, when a digital camera is connected or media from a
-diff -u -r gnome-volume-manager-2.22.0/gnome-volume-properties.glade hacked/gnome-volume-properties.glade
---- gnome-volume-manager-2.22.0/gnome-volume-properties.glade 2007-11-01 21:55:30.000000000 -0400
-+++ hacked/gnome-volume-properties.glade 2008-01-15 22:41:50.000000000 -0500
+diff -up gnome-volume-manager-2.22.0/gnome-volume-properties.glade.nomedia gnome-volume-manager-2.22.0/gnome-volume-properties.glade
+--- gnome-volume-manager-2.22.0/gnome-volume-properties.glade.nomedia 2007-11-01 21:55:30.000000000 -0400
++++ gnome-volume-manager-2.22.0/gnome-volume-properties.glade 2008-03-31 10:58:48.000000000 -0400
@@ -68,1197 +68,6 @@
<property name="enable_popup">False</property>
@@ -1264,99 +1199,10 @@
<widget class="GtkVBox" id="cameras_vbox">
<property name="border_width">12</property>
<property name="visible">True</property>
-Only in hacked: gnome-volume-properties.glade.bak
-Only in hacked: gnome-volume-properties.gladep
-Only in hacked: intltool-extract
-Only in hacked: intltool-merge
-Only in hacked: intltool-update
-Only in hacked: Makefile
-Only in hacked/po: ang.gmo
-Only in hacked/po: ar.gmo
-Only in hacked/po: az.gmo
-Only in hacked/po: be at latin.gmo
-Only in hacked/po: bg.gmo
-Only in hacked/po: bn.gmo
-Only in hacked/po: bn_IN.gmo
-Only in hacked/po: bs.gmo
-Only in hacked/po: ca.gmo
-Only in hacked/po: cs.gmo
-Only in hacked/po: cy.gmo
-Only in hacked/po: da.gmo
-Only in hacked/po: de.gmo
-Only in hacked/po: dz.gmo
-Only in hacked/po: el.gmo
-Only in hacked/po: en_CA.gmo
-Only in hacked/po: en_GB.gmo
-Only in hacked/po: es.gmo
-Only in hacked/po: et.gmo
-Only in hacked/po: eu.gmo
-Only in hacked/po: fa.gmo
-Only in hacked/po: fi.gmo
-Only in hacked/po: fr.gmo
-Only in hacked/po: gl.gmo
-Only in hacked/po: gu.gmo
-Only in hacked/po: he.gmo
-Only in hacked/po: hi.gmo
-Only in hacked/po: hr.gmo
-Only in hacked/po: hu.gmo
-Only in hacked/po: id.gmo
-Only in hacked/po: .intltool-merge-cache
-Only in hacked/po: is.gmo
-Only in hacked/po: it.gmo
-Only in hacked/po: ja.gmo
-Only in hacked/po: ka.gmo
-Only in hacked/po: ko.gmo
-Only in hacked/po: ku.gmo
-Only in hacked/po: lt.gmo
-Only in hacked/po: lv.gmo
-Only in hacked/po: Makefile
-Only in hacked/po: Makefile.in
-Only in hacked/po: mg.gmo
-Only in hacked/po: mk.gmo
-Only in hacked/po: ml.gmo
-Only in hacked/po: mn.gmo
-Only in hacked/po: ms.gmo
-Only in hacked/po: nb.gmo
-Only in hacked/po: ne.gmo
-Only in hacked/po: nl.gmo
-Only in hacked/po: nn.gmo
-Only in hacked/po: oc.gmo
-Only in hacked/po: or.gmo
-Only in hacked/po: pa.gmo
-Only in hacked/po: pl.gmo
-Only in hacked/po: POTFILES
-Only in hacked/po: pt_BR.gmo
-Only in hacked/po: pt.gmo
-Only in hacked/po: ro.gmo
-Only in hacked/po: ru.gmo
-Only in hacked/po: rw.gmo
-Only in hacked/po: si.gmo
-Only in hacked/po: sk.gmo
-Only in hacked/po: sl.gmo
-Only in hacked/po: sq.gmo
-Only in hacked/po: sr.gmo
-Only in hacked/po: sr at Latn.gmo
-Only in hacked/po: stamp-it
-Only in hacked/po: sv.gmo
-Only in hacked/po: ta.gmo
-Only in hacked/po: te.gmo
-Only in hacked/po: th.gmo
-Only in hacked/po: tr.gmo
-Only in hacked/po: uk.gmo
-Only in hacked/po: vi.gmo
-Only in hacked/po: xh.gmo
-Only in hacked/po: zh_CN.gmo
-Only in hacked/po: zh_HK.gmo
-Only in hacked/po: zh_TW.gmo
-Only in hacked/src: clipboard.o
-Only in hacked/src: .deps
-Only in hacked/src: gnome-volume-manager
-Only in hacked/src: gnome-volume-properties
-Only in hacked/src: Makefile
-diff -u -r gnome-volume-manager-2.22.0/src/properties.c hacked/src/properties.c
---- gnome-volume-manager-2.22.0/src/properties.c 2007-11-01 21:55:30.000000000 -0400
-+++ hacked/src/properties.c 2008-01-15 23:10:55.000000000 -0500
-@@ -36,77 +36,24 @@
+diff -up gnome-volume-manager-2.22.0/src/properties.c.nomedia gnome-volume-manager-2.22.0/src/properties.c
+--- gnome-volume-manager-2.22.0/src/properties.c.nomedia 2007-11-01 21:55:30.000000000 -0400
++++ gnome-volume-manager-2.22.0/src/properties.c 2008-03-31 11:09:41.000000000 -0400
+@@ -36,77 +36,24 @@ typedef enum {
TYPE_STRING,
} type_t;
@@ -1434,7 +1280,7 @@
{ GCONF_ROOT "autoscanner", TYPE_BOOL, NULL, TRUE },
{ GCONF_ROOT "autoscanner_command", TYPE_STRING, NULL, FALSE },
{ GCONF_ROOT "autotablet", TYPE_BOOL, NULL, TRUE },
-@@ -115,9 +62,6 @@
+@@ -115,9 +62,6 @@ static struct {
{ GCONF_ROOT "autovideocam_command", TYPE_STRING, NULL, FALSE },
{ GCONF_ROOT "autowebcam", TYPE_BOOL, NULL, TRUE },
{ GCONF_ROOT "autowebcam_command", TYPE_STRING, NULL, FALSE },
@@ -1444,7 +1290,7 @@
};
static GHashTable *gvm_settings_hash = NULL;
-@@ -151,17 +95,10 @@
+@@ -151,17 +95,10 @@ toggled_cb (GtkToggleButton *toggle, con
gconf_client_set_bool (gconf, key, bool, NULL);
name = strrchr (key, '/') + 1;
@@ -1466,7 +1312,7 @@
}
static void
-@@ -205,11 +142,6 @@
+@@ -205,11 +142,6 @@ set_sensitivity (void)
gboolean bool;
size_t i;
@@ -1478,7 +1324,7 @@
/* checkboxes can enable/disable the ability to change other settings */
for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) {
if (gvm_settings[i].type == TYPE_BOOL) {
-@@ -277,17 +209,12 @@
+@@ -277,17 +209,12 @@ static struct {
const char *icon;
const char *fallback;
} icons[] = {
@@ -1496,9 +1342,19 @@
{ "scanner_image", "scanner", NULL },
{ "tablet_image", "input-tablet", NULL },
{ "videocam_image", "camera-video", NULL },
---- gnome-volume-manager-2.22.0/src/manager.c 2008-01-15 23:26:50.000000000 -0500
-+++ hacked/src/manager.c 2008-01-15 23:59:14.000000000 -0500
-@@ -626,6 +626,28 @@
+diff -up gnome-volume-manager-2.22.0/src/manager.c.nomedia gnome-volume-manager-2.22.0/src/manager.c
+--- gnome-volume-manager-2.22.0/src/manager.c.nomedia 2008-03-31 10:58:48.000000000 -0400
++++ gnome-volume-manager-2.22.0/src/manager.c 2008-03-31 11:08:50.000000000 -0400
+@@ -122,6 +122,8 @@ enum {
+ AUTOBURN_DATA_CD_COMMAND,
+ AUTOIPOD,
+ AUTOIPOD_COMMAND,
++ AUTOKEYBOARD,
++ AUTOKEYBOARD_COMMAND,
+ AUTOMOUNT_DRIVES,
+ AUTOMOUNT_MEDIA,
+ AUTOOPEN,
+@@ -626,6 +628,28 @@ to_be_or_not_to_be (void)
}
}
@@ -1527,16 +1383,18 @@
/*
* gvm_load_config - synchronize gconf => config structure
*/
-@@ -640,7 +662,7 @@
- g_hash_table_insert (gvm_settings_hash, gvm_settings[i].key, GINT_TO_POINTER (i + 1));
- if (gvm_settings[i].type == TYPE_STRING) {
- *((char **) gvm_settings[i].var) =
-- gconf_client_get_string (config.client, gvm_settings[i].key, NULL);
-+ filter_out_media_handling (i, gconf_client_get_string (config.client, gvm_settings[i].key, NULL));
+@@ -644,8 +668,8 @@ gvm_load_config (void)
dbg ("setting[%d]: string: %s = %s\n", i, strrchr (gvm_settings[i].key, '/') + 1,
*((char **) gvm_settings[i].var) ? *((char **) gvm_settings[i].var): "NULL");
} else if (gvm_settings[i].type == TYPE_BOOL) {
-@@ -694,7 +716,7 @@
+- *((int *) gvm_settings[i].var) =
+- gconf_client_get_bool (config.client, gvm_settings[i].key, NULL);
++ *((int *) gvm_settings[i].var) =
++ filter_out_media_handling (i, gconf_client_get_bool (config.client, gvm_settings[i].key, NULL));
+ dbg ("setting[%d]: bool: %s = %d\n", i, strrchr (gvm_settings[i].key, '/') + 1,
+ *((int *) gvm_settings[i].var));
+ } else if (gvm_settings[i].type == TYPE_FLOAT) {
+@@ -694,7 +718,7 @@ gvm_config_changed (GConfClient *client
dbg ("setting changed: string: %s = %s\n", strrchr (gvm_settings[which].key, '/') + 1,
*((char **) gvm_settings[which].var));
} else if (gvm_settings[which].type == TYPE_BOOL) {
@@ -1545,3 +1403,96 @@
dbg ("setting changed: bool: %s = %d\n", strrchr (gvm_settings[which].key, '/') + 1,
*((int *) gvm_settings[which].var));
} else if (gvm_settings[which].type == TYPE_FLOAT) {
+@@ -3198,6 +3222,7 @@ gvm_device_eject (const char *udi)
+ libhal_free_string_array (volumes);
+ }
+
++#if 0
+ /** Invoked when a device in the GDL emits a condition that cannot be
+ * expressed in a property (like when the processor is overheating)
+ *
+@@ -3217,6 +3242,7 @@ hal_device_condition (LibHalContext *ctx
+ if (!strcmp (condition_name, "EjectPressed"))
+ gvm_device_eject (udi);
+ }
++#endif
+
+ static gboolean
+ reinit_dbus (gpointer user_data GNUC_UNUSED)
+@@ -3347,7 +3373,10 @@ gvm_hal_init (void)
+ libhal_ctx_set_device_new_capability (ctx, hal_device_new_capability);
+ libhal_ctx_set_device_lost_capability (ctx, hal_device_lost_capability);
+ libhal_ctx_set_device_property_modified (ctx, hal_property_modified);
++#if 0
++ /* only needed for eject ATM, which is done by nautilus; disable */
+ libhal_ctx_set_device_condition (ctx, hal_device_condition);
++#endif
+
+ dbus_error_init (&error);
+ if (!libhal_device_property_watch_all (ctx, &error)) {
+diff -up gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in.nomedia gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in
+--- gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in.nomedia 2008-03-31 10:58:48.000000000 -0400
++++ gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in 2008-03-31 10:58:48.000000000 -0400
+@@ -16,7 +16,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
+ <applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Automount removable drives</short>
+ <long>Whether gnome-volume-manager should automatically mount
+@@ -28,7 +28,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/automount_media</key>
+ <applyto>/desktop/gnome/volume_manager/automount_media</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Automount removable media</short>
+ <long>Whether gnome-volume-manager should automatically mount
+@@ -40,7 +40,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
+ <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Autorun nautilus</short>
+ <long>Open nautilus on removeable media insert.</long>
+@@ -97,7 +97,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autoplay_cda</key>
+ <applyto>/desktop/gnome/volume_manager/autoplay_cda</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Play inserted audio CD's</short>
+ <long>Whether, when an audio CD is inserted, gnome-volume-manager
+@@ -154,7 +154,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd</key>
+ <applyto>/desktop/gnome/volume_manager/autoplay_dvd</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Play inserted video DVDs</short>
+ <long>Whether, when a video DVD is inserted,
+@@ -177,7 +177,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd</key>
+ <applyto>/desktop/gnome/volume_manager/autoplay_vcd</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Play inserted video VCDs</short>
+ <long>Whether, when a video VCD is inserted,
+@@ -200,7 +200,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
+ <applyto>/desktop/gnome/volume_manager/autophoto</applyto>
+ <type>bool</type>
+- <default>true</default>
++ <default>false</default>
+ <locale name="C">
+ <short>Run photo management command</short>
+ <long>Whether, when a digital camera is connected or media from a
More information about the fedora-extras-commits
mailing list