- Enable sound by default, without looking at the prefs

This commit is contained in:
Bastien Nocera 2007-10-30 17:02:09 +00:00
parent 94d9fc9089
commit 3181e04050
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,33 @@
Index: gnome-session/gsm-sound.c
===================================================================
--- gnome-session/gsm-sound.c (revision 4457)
+++ gnome-session/gsm-sound.c (working copy)
@@ -12,27 +12,12 @@
#include <libgnome/gnome-sound.h>
#include <libgnome/gnome-triggers.h>
-#define ENABLE_SOUND_KEY "/desktop/gnome/sound/enable_esd"
#define ENABLE_EVENT_SOUNDS_KEY "/desktop/gnome/sound/event_sounds"
static gboolean
sound_enabled (void)
{
- GConfClient *client;
- GError *error = NULL;
- gboolean retval;
-
- client = gsm_get_conf_client ();
-
- retval = gconf_client_get_bool (client, ENABLE_SOUND_KEY, &error);
- if (error)
- {
- g_warning ("Error getting value of " ENABLE_SOUND_KEY ": %s", error->message);
- g_error_free (error);
- return FALSE; /* Fallback value */
- }
-
- return retval;
+ return TRUE;
}
static gboolean

View File

@ -12,7 +12,7 @@
Summary: GNOME session manager
Name: gnome-session
Version: 2.20.1
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
Source1: redhat-default-session
@ -39,6 +39,9 @@ Conflicts: gdm < 1:2.6.0.8-5
Patch1: gnome-session-2.2.2-icons.patch
# Launch "esd" (really pulseaudio) all the time
Patch2: gnome-session-enable-sound-by-default.patch
# Launch gnome-user-share on login if enabled
Patch7: gnome-session-2.13.92-user-share.patch
@ -98,6 +101,7 @@ GNOME components and handles logout and saving the session.
%setup -q
%patch1 -p1 -b .icons
%patch2 -p0 -b .sound
%patch7 -p1 -b .user-share
%patch9 -p1 -b .no-crashes
%patch13 -p1 -b .window-manager
@ -188,6 +192,9 @@ fi
%doc %{_datadir}/man/man*/*
%changelog
* Tue Oct 30 2007 - Bastien Nocera <bnocera@redhat.com> - 2.20.1-2
- Enable sound by default, without looking at the prefs
* Mon Oct 15 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-1
- Update to 2.20.1 (translation updates)