This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
42b709560f
commit
2c9ef9e4ae
7
gnome
7
gnome
@ -71,6 +71,13 @@ else
|
||||
touch ~/.skel/sled10-run
|
||||
fi
|
||||
|
||||
# Install the online help desktop icon this way until there is
|
||||
# a better solution. The actual files reside in gnome2-SuSE
|
||||
if [ ! -e $HOME/.skel/.gnome2-run-10.3 ] ; then
|
||||
touch $HOME/.skel/.gnome2-run-10.3
|
||||
cp -u /usr/share/dist/desktop-files/GnomeOnlineHelp.desktop ~/Desktop
|
||||
fi
|
||||
|
||||
# Uncomment after SLED12, remove after SLED14:
|
||||
#rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run
|
||||
|
||||
|
||||
118
gnome-session-sound.patch
Normal file
118
gnome-session-sound.patch
Normal file
@ -0,0 +1,118 @@
|
||||
--- gnome-session/gsm-sound.c
|
||||
+++ gnome-session/gsm-sound.c
|
||||
@@ -11,6 +11,8 @@
|
||||
|
||||
#include <libgnome/gnome-sound.h>
|
||||
#include <libgnome/gnome-triggers.h>
|
||||
+#include <libgnome/gnome-util.h>
|
||||
+#include <libgnome/gnome-config.h>
|
||||
|
||||
#define ENABLE_SOUND_KEY "/desktop/gnome/sound/enable_esd"
|
||||
#define ENABLE_EVENT_SOUNDS_KEY "/desktop/gnome/sound/event_sounds"
|
||||
@@ -70,7 +72,7 @@
|
||||
static void
|
||||
start_esd (void)
|
||||
{
|
||||
- gchar *argv[] = {ESD_SERVER, "-nobeeps", NULL};
|
||||
+ gchar *argv[] = {ESD_SERVER, "-terminate", "-nobeeps", NULL};
|
||||
GError *err = NULL;
|
||||
time_t starttime;
|
||||
|
||||
@@ -94,6 +96,81 @@
|
||||
}
|
||||
}
|
||||
|
||||
+
|
||||
+static gboolean
|
||||
+load_login_sample_from (const char *file,
|
||||
+ gboolean *isset)
|
||||
+{
|
||||
+ char *key;
|
||||
+ char *sample_file;
|
||||
+ int sample_id;
|
||||
+
|
||||
+ if (!file)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ key = g_strconcat ("=", file, "=login/file", NULL);
|
||||
+ sample_file = gnome_config_get_string (key);
|
||||
+ g_free (key);
|
||||
+
|
||||
+ if (sample_file && isset)
|
||||
+ *isset = TRUE;
|
||||
+ else if (isset)
|
||||
+ *isset = FALSE;
|
||||
+
|
||||
+ if (sample_file && *sample_file && *sample_file != '/')
|
||||
+ {
|
||||
+ char *tmp_sample_file;
|
||||
+ tmp_sample_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_SOUND, sample_file, TRUE, NULL);
|
||||
+ g_free (sample_file);
|
||||
+ sample_file = tmp_sample_file;
|
||||
+ }
|
||||
+
|
||||
+ if (!(sample_file && *sample_file))
|
||||
+ {
|
||||
+ g_free (sample_file);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ sample_id = esd_sample_getid (gnome_sound_connection_get (), "gnome-2/login");
|
||||
+ if (sample_id >= 0)
|
||||
+ esd_sample_free (gnome_sound_connection_get (), sample_id);
|
||||
+
|
||||
+ sample_id = gnome_sound_sample_load ("gnome-2/login", sample_file);
|
||||
+
|
||||
+ if (sample_id < 0)
|
||||
+ {
|
||||
+ g_warning ("Couldn't load sound file %s\n", sample_file);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ g_free (sample_file);
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+#define SOUND_EVENT_FILE "sound/events/gnome-2.soundlist"
|
||||
+ static gboolean
|
||||
+load_login_sample (void)
|
||||
+{
|
||||
+ char *s;
|
||||
+ gboolean loaded;
|
||||
+ gboolean isset;
|
||||
+
|
||||
+ s = gnome_util_home_file (SOUND_EVENT_FILE);
|
||||
+ loaded = load_login_sample_from (s, &isset);
|
||||
+ g_free (s);
|
||||
+
|
||||
+ if (isset)
|
||||
+ return loaded;
|
||||
+
|
||||
+ s = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_CONFIG, SOUND_EVENT_FILE, TRUE, NULL);
|
||||
+ loaded = load_login_sample_from (s, NULL);
|
||||
+ g_free (s);
|
||||
+
|
||||
+ return loaded;
|
||||
+}
|
||||
+
|
||||
+
|
||||
static void
|
||||
stop_esd (void)
|
||||
{
|
||||
@@ -127,7 +204,7 @@
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- return TRUE;
|
||||
+ return load_login_sample();
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -159,6 +236,4 @@
|
||||
{
|
||||
if (sound_events_enabled ())
|
||||
play_sound_event ("logout");
|
||||
-
|
||||
- sound_shutdown ();
|
||||
}
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 7 22:34:21 CEST 2007 - lewing@suse.de
|
||||
|
||||
- Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
|
||||
runs. Part of bnc #300773
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 7 00:14:26 CEST 2007 - cgaisford@novell.com
|
||||
|
||||
- Created a patch to fix login and logout sounds in gnome-session
|
||||
Novell bug 294396 and bugzilla.gnome.org #466458
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 4 17:53:31 CEST 2007 - maw@suse.de
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ BuildRequires: CASA-devel control-center2-devel fdupes gnome-common gnome-deskt
|
||||
License: GPL v2 or later, LGPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.19.90
|
||||
Release: 4
|
||||
Release: 7
|
||||
Summary: Session Tools for the GNOME 2.x Desktop
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gnome
|
||||
@ -58,6 +58,7 @@ Patch12: gnome-session-wm-switch.patch
|
||||
Patch13: gnome-session-no-devel-fatals.patch
|
||||
Patch14: gnome-session-tile-ui.patch
|
||||
Patch15: gnome-session-main-init.patch
|
||||
Patch16: gnome-session-sound.patch
|
||||
URL: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Autoreqprov: on
|
||||
@ -107,6 +108,7 @@ gnome-patch-translation-prepare
|
||||
%patch13
|
||||
%patch14 -p1
|
||||
%patch15
|
||||
%patch16
|
||||
%endif
|
||||
gnome-patch-translation-update
|
||||
|
||||
@ -161,6 +163,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files lang -f %{name}-2.0.lang
|
||||
|
||||
%changelog
|
||||
* Fri Sep 07 2007 - lewing@suse.de
|
||||
- Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
|
||||
runs. Part of bnc #300773
|
||||
* Fri Sep 07 2007 - cgaisford@novell.com
|
||||
- Created a patch to fix login and logout sounds in gnome-session
|
||||
Novell bug 294396 and bugzilla.gnome.org #466458
|
||||
* Tue Sep 04 2007 - maw@suse.de
|
||||
- Update gnome-session-main-init.patch to use old-fashioned C
|
||||
style comments in lieu of C++ style comments, courtesy of Calvin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user