rpms/gnome-volume-manager/devel icon-names.patch, NONE, 1.1 rh-defaults.patch, NONE, 1.1 gnome-volume-manager.spec, 1.77, 1.78

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Aug 1 14:05:45 UTC 2008 

Author: mclasen

Update of /cvs/extras/rpms/gnome-volume-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	icon-names.patch rh-defaults.patch 
Log Message:
use standard icon names


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up gnome-volume-manager-2.22.5/gnome-volume-manager.desktop.in.in.icon-names gnome-volume-manager-2.22.5/gnome-volume-manager.desktop.in.in
--- gnome-volume-manager-2.22.5/gnome-volume-manager.desktop.in.in.icon-names	2008-08-01 10:00:02.000000000 -0400
+++ gnome-volume-manager-2.22.5/gnome-volume-manager.desktop.in.in	2008-08-01 10:00:17.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Volume Manager
 _Comment=Volume manager for removable drives and media
-Icon=gnome-dev-cdrom
+Icon=drive-optical
 Exec=@libexecdir@/gnome-volume-manager --sm-disable
 Terminal=false
 Type=Application
diff -up gnome-volume-manager-2.22.5/src/properties.c.icon-names gnome-volume-manager-2.22.5/src/properties.c
--- gnome-volume-manager-2.22.5/src/properties.c.icon-names	2008-08-01 10:00:36.000000000 -0400
+++ gnome-volume-manager-2.22.5/src/properties.c	2008-08-01 10:00:55.000000000 -0400
@@ -382,7 +382,7 @@ show_props (void)
 	g_signal_connect (theme, "changed", G_CALLBACK (theme_changed_cb), xml);
 	theme_changed_cb (theme, xml);
 	
-	gtk_window_set_default_icon_name ("gnome-dev-cdrom");
+	gtk_window_set_default_icon_name ("drive-optical");
 	
 	gvm_settings_hash = g_hash_table_new (g_str_hash, g_str_equal);
 	for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) {

rh-defaults.patch:

--- NEW FILE rh-defaults.patch ---
diff -up gnome-volume-manager-2.22.5/gnome-volume-manager.schemas.in.rh-defaults gnome-volume-manager-2.22.5/gnome-volume-manager.schemas.in
--- gnome-volume-manager-2.22.5/gnome-volume-manager.schemas.in.rh-defaults	2007-11-01 21:55:30.000000000 -0400
+++ gnome-volume-manager-2.22.5/gnome-volume-manager.schemas.in	2008-08-01 09:58:35.000000000 -0400
@@ -166,7 +166,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd_command</key>
 	<applyto>/desktop/gnome/volume_manager/autoplay_dvd_command</applyto>
 	<type>string</type>
-	<default>totem %d</default>
+	<default>rhythmbox %d</default>
 	<locale name="C">
 	  <short>DVD play command</short>
 	  <long>Command to run when a video DVD is inserted.</long>
@@ -200,7 +200,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
 	<type>bool</type>
-	<default>false</default>
+	<default>true</default>
 	<locale name="C">
 	  <short>Run photo management command</short>
 	  <long>Whether, when a digital camera is connected or media from a
@@ -213,7 +213,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
 	<type>string</type>
-	<default></default>
+	<default>gthumb-import %h</default>
 	<locale name="C">
 	  <short>Photo management command</short>
 	  <long>Command to run when a digital camera is connected or media 
@@ -248,7 +248,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
 	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
 	<type>bool</type>
-	<default>true</default>
+	<default>false</default>
 	<locale name="C">
 	  <short>Run printer program</short>
 	  <long>Whether, when a printer is connected, gnome-volume-manager should run
@@ -260,7 +260,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
 	<type>string</type>
-	<default>gnome-printer-add hal://%h</default>
+	<default></default>
 	<locale name="C">
 	  <short>printer command</short>
 	  <long>Command to run when a printer is connected.</long>


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnome-volume-manager.spec	26 Apr 2008 18:46:17 -0000	1.77
+++ gnome-volume-manager.spec	1 Aug 2008 14:05:15 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 2.22.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 Source0: http://download.gnome.org/sources/gnome-volume-manager/2.22/gnome-volume-manager-%{version}.tar.gz
@@ -9,9 +9,11 @@
 Source2: gthumb-import
 Source3: gnome-cdda-handler
 Source4: cdda-url-handler.schemas
-Patch1: gnome-volume-manager-2.17.0-rh-defaults.patch
+Patch1: rh-defaults.patch
 Patch2: gnome-volume-manager-2.17.0-add-console-user-check.patch 
 Patch3: gnome-volume-manager-2.22.0-check-screensaver.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=545856
+Patch4: icon-names.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=509823
 #Patch4: gvm-nomedia.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -53,6 +55,7 @@
 %patch1 -p1 -b .rh-defaults
 %patch2 -p1 -b .add-console-user-check
 %patch3 -p1 -b .screensaver
+%patch4 -p1 -b .icon-names
 
 %build
 %configure --disable-automount
@@ -118,6 +121,9 @@
 %{_sysconfdir}/xdg/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Fri Aug  1 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.5-2
+- Use standard icon names
+
 * Sat Apr 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.5-1
 - Update to 2.22.5

More information about the fedora-extras-commits mailing list