Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit gnome-session
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 10 Sep 2007 12:19:32 +0200
- Message-id: <20070910101932.4A3B267817A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gnome-session
checked in at Mon Sep 10 12:19:32 CEST 2007.
--------
--- GNOME/gnome-session/gnome-session.changes 2007-09-04 17:54:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2007-09-07 22:35:51.865477000 +0200
@@ -1,0 +2,12 @@
+Fri Sep 7 22:34:21 CEST 2007 - lewing@xxxxxxx
+
+- Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
+ runs. Part of bnc #300773
+
+-------------------------------------------------------------------
+Fri Sep 7 00:14:26 CEST 2007 - cgaisford@xxxxxxxxxx
+
+- Created a patch to fix login and logout sounds in gnome-session
+ Novell bug 294396 and bugzilla.gnome.org #466458
+
+-------------------------------------------------------------------
New:
----
gnome-session-sound.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.J25818/_old 2007-09-10 12:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.J25818/_new 2007-09-10 12:19:09.000000000 +0200
@@ -16,7 +16,7 @@
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 @@
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 @@
%patch13
%patch14 -p1
%patch15
+%patch16
%endif
gnome-patch-translation-update
@@ -161,6 +163,12 @@
%files lang -f %{name}-2.0.lang
%changelog
+* Fri Sep 07 2007 - lewing@xxxxxxx
+- Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
+ runs. Part of bnc #300773
+* Fri Sep 07 2007 - cgaisford@xxxxxxxxxx
+- 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@xxxxxxx
- Update gnome-session-main-init.patch to use old-fashioned C
style comments in lieu of C++ style comments, courtesy of Calvin
++++++ gnome ++++++
--- GNOME/gnome-session/gnome 2007-04-04 15:01:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-session/gnome 2007-09-07 22:36:16.728589000 +0200
@@ -71,6 +71,13 @@
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
++++++ gnome-session-sound.patch ++++++
--- 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 ();
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |