rpms/control-center/devel gcc-set-sound-theme-dir.patch, NONE, 1.1 control-center.spec, 1.400, 1.401

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12032

Modified Files:
	control-center.spec 
Added Files:
	gcc-set-sound-theme-dir.patch 
Log Message:
* Fri Oct 10 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-6
- When a sound is selected with the file chooser in g-s-p, make
  sure to default to /usr/share/sounds if that dir exists
  (#456919)


gcc-set-sound-theme-dir.patch:

--- NEW FILE gcc-set-sound-theme-dir.patch ---
Index: capplets/sound/sound-theme.c
===================================================================
--- capplets/sound/sound-theme.c	(revision 9054)
+++ capplets/sound/sound-theme.c	(working copy)
@@ -509,6 +509,9 @@
 	if (data_dir != NULL)
 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), data_dir, NULL);
 
+#define SOUND_DATA_DIR "/usr/share/sounds/"
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), SOUND_DATA_DIR);
+
 	response = gtk_dialog_run (GTK_DIALOG (chooser));
 	filename = NULL;
 	if (response == GTK_RESPONSE_ACCEPT)


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- control-center.spec	8 Oct 2008 18:46:53 -0000	1.400
+++ control-center.spec	10 Oct 2008 09:20:33 -0000	1.401
@@ -34,6 +34,9 @@
 # minor build breakage in gtk, will be fixed in the next gtk release
 Patch8: gtkmarshal.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=456919
+Patch9: gcc-set-sound-theme-dir.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -172,6 +175,7 @@
 
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
+%patch9 -p0 -b .default-dir
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch28 -p1 -b .capplet-help
@@ -346,6 +350,11 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Oct 10 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-6
+- When a sound is selected with the file chooser in g-s-p, make
+  sure to default to /usr/share/sounds if that dir exists
+  (#456919)
+
 * Wed Oct  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-5
 - Change the default key combination to change keyboard layouts
   to shift-capslock, since alt-alt doesn't work (#465403)