rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.72, 1.73 gvm-nomedia.patch, 1.3, 1.4
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Mon Mar 31 17:02:38 UTC 2008
- Previous message (by thread): rpms/kernel/devel patch-2.6.25-rc7-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.795, 1.796 kernel.spec, 1.560, 1.561 linux-2.6-drm-git-mm.patch, 1.3, 1.4 linux-2.6-drm-i915-modeset.patch, 1.6, 1.7 sources, 1.754, 1.755 upstream, 1.675, 1.676 patch-2.6.25-rc7-git5.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/kgrab/devel kgrab.spec,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gnome-volume-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14372
Modified Files:
gnome-volume-manager.spec gvm-nomedia.patch
Log Message:
remove photo handling
Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gnome-volume-manager.spec 31 Mar 2008 15:16:07 -0000 1.72
+++ gnome-volume-manager.spec 31 Mar 2008 17:01:35 -0000 1.73
@@ -1,7 +1,7 @@
Summary: The GNOME Volume Manager
Name: gnome-volume-manager
Version: 2.22.0
-Release: 4%{?dist}
+Release: 5%{?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,9 @@
%{_datadir}/gnome/autostart/gnome-volume-manager.desktop
%changelog
+* Mon Mar 31 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-5
+- remove photo handling too, since nautilus does that
+
* 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
gvm-nomedia.patch:
Index: gvm-nomedia.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gvm-nomedia.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gvm-nomedia.patch 31 Mar 2008 15:16:07 -0000 1.3
+++ gvm-nomedia.patch 31 Mar 2008 17:01:36 -0000 1.4
@@ -1,6 +1,6 @@
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
++++ gnome-volume-manager-2.22.0/gnome-volume-properties.glade 2008-03-31 12:21:47.000000000 -0400
@@ -68,1197 +68,6 @@
<property name="enable_popup">False</property>
@@ -1199,10 +1199,250 @@
<widget class="GtkVBox" id="cameras_vbox">
<property name="border_width">12</property>
<property name="visible">True</property>
+@@ -1266,212 +75,6 @@
+ <property name="spacing">18</property>
+
+ <child>
+- <widget class="GtkVBox" id="digital_camera_vbox">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="digital_camera_label">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><b>Digital Camera</b></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="digital_camera_hbox">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">12</property>
+-
+- <child>
+- <widget class="GtkImage" id="digital_camera_image">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkVBox" id="digital_camera_options_vbox">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkCheckButton" id="autophoto">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Import digital photographs when connected</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="GtkHBox" id="hbox69">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label26">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"> </property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="autophoto_hbox">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">12</property>
+-
+- <child>
+- <widget class="GtkLabel" id="autophoto_command_label">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">C_ommand:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">autophoto_command</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GnomeFileEntry" id="autophoto_command_fileentry">
+- <property name="visible">True</property>
+- <property name="max_saved">10</property>
+- <property name="browse_dialog_title" translatable="yes">Select program to import photos</property>
+- <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="autophoto_command">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char">*</property>
+- <property name="activates_default">False</property>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+ <widget class="GtkVBox" id="videocam_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+@@ -1598,7 +201,7 @@
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+- <property name="mnemonic_widget">autophoto_command</property>
++ <property name="mnemonic_widget">autovideocam_command</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+@@ -1804,7 +407,7 @@
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+- <property name="mnemonic_widget">autophoto_command</property>
++ <property name="mnemonic_widget">autowebcam_command</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+@@ -1878,7 +481,7 @@
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+- <property name="expand">True</property>
++ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
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 {
++++ gnome-volume-manager-2.22.0/src/properties.c 2008-03-31 12:19:43.000000000 -0400
+@@ -36,77 +36,22 @@ typedef enum {
TYPE_STRING,
} type_t;
@@ -1264,8 +1504,8 @@
{ GCONF_ROOT "automouse", TYPE_BOOL, NULL, TRUE },
{ GCONF_ROOT "automouse_command", TYPE_STRING, NULL, FALSE },
- { GCONF_ROOT "autoopen", TYPE_BOOL, NULL, TRUE },
- { GCONF_ROOT "autophoto", TYPE_BOOL, NULL, TRUE },
- { GCONF_ROOT "autophoto_command", TYPE_STRING, NULL, FALSE },
+- { GCONF_ROOT "autophoto", TYPE_BOOL, NULL, TRUE },
+- { GCONF_ROOT "autophoto_command", TYPE_STRING, NULL, FALSE },
{ GCONF_ROOT "autopalmsync", TYPE_BOOL, NULL, TRUE },
{ GCONF_ROOT "autopalmsync_command", TYPE_STRING, NULL, FALSE },
- { GCONF_ROOT "autoplay_cda", TYPE_BOOL, NULL, TRUE },
@@ -1280,7 +1520,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 @@ static struct {
+@@ -115,9 +60,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 },
@@ -1290,7 +1530,7 @@
};
static GHashTable *gvm_settings_hash = NULL;
-@@ -151,17 +95,10 @@ toggled_cb (GtkToggleButton *toggle, con
+@@ -151,17 +93,10 @@ toggled_cb (GtkToggleButton *toggle, con
gconf_client_set_bool (gconf, key, bool, NULL);
name = strrchr (key, '/') + 1;
@@ -1312,7 +1552,7 @@
}
static void
-@@ -205,11 +142,6 @@ set_sensitivity (void)
+@@ -205,11 +140,6 @@ set_sensitivity (void)
gboolean bool;
size_t i;
@@ -1324,7 +1564,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 @@ static struct {
+@@ -277,17 +207,12 @@ static struct {
const char *icon;
const char *fallback;
} icons[] = {
@@ -1343,8 +1583,8 @@
{ "tablet_image", "input-tablet", NULL },
{ "videocam_image", "camera-video", NULL },
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
+--- gnome-volume-manager-2.22.0/src/manager.c.nomedia 2008-03-31 12:02:44.000000000 -0400
++++ gnome-volume-manager-2.22.0/src/manager.c 2008-03-31 12:11:44.000000000 -0400
@@ -122,6 +122,8 @@ enum {
AUTOBURN_DATA_CD_COMMAND,
AUTOIPOD,
@@ -1354,7 +1594,7 @@
AUTOMOUNT_DRIVES,
AUTOMOUNT_MEDIA,
AUTOOPEN,
-@@ -626,6 +628,28 @@ to_be_or_not_to_be (void)
+@@ -626,6 +628,29 @@ to_be_or_not_to_be (void)
}
}
@@ -1374,6 +1614,7 @@
+ case AUTOPLAY_DVD:
+ case AUTOPLAY_VCD:
+ case AUTORUN:
++ case AUTOPHOTO:
+ return FALSE;
+ default:
+ return value;
@@ -1383,7 +1624,7 @@
/*
* gvm_load_config - synchronize gconf => config structure
*/
-@@ -644,8 +668,8 @@ gvm_load_config (void)
+@@ -644,8 +669,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) {
@@ -1394,7 +1635,7 @@
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
+@@ -694,7 +719,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) {
@@ -1403,7 +1644,7 @@
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)
+@@ -3198,6 +3223,7 @@ gvm_device_eject (const char *udi)
libhal_free_string_array (volumes);
}
@@ -1411,7 +1652,7 @@
/** 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
+@@ -3217,6 +3243,7 @@ hal_device_condition (LibHalContext *ctx
if (!strcmp (condition_name, "EjectPressed"))
gvm_device_eject (udi);
}
@@ -1419,7 +1660,7 @@
static gboolean
reinit_dbus (gpointer user_data GNUC_UNUSED)
-@@ -3347,7 +3373,10 @@ gvm_hal_init (void)
+@@ -3347,7 +3374,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);
@@ -1431,8 +1672,8 @@
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
+--- gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in.nomedia 2008-03-31 12:02:44.000000000 -0400
++++ gnome-volume-manager-2.22.0/gnome-volume-manager.schemas.in 2008-03-31 12:02:44.000000000 -0400
@@ -16,7 +16,7 @@
<key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
<applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
- Previous message (by thread): rpms/kernel/devel patch-2.6.25-rc7-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.795, 1.796 kernel.spec, 1.560, 1.561 linux-2.6-drm-git-mm.patch, 1.3, 1.4 linux-2.6-drm-i915-modeset.patch, 1.6, 1.7 sources, 1.754, 1.755 upstream, 1.675, 1.676 patch-2.6.25-rc7-git5.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/kgrab/devel kgrab.spec,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list