![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gnome-session checked in at Thu Aug 14 01:14:48 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-07-21 06:44:44.000000000 +0200 +++ gnome-session/gnome-session.changes 2008-08-11 20:02:05.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Aug 11 11:35:02 CDT 2008 - maw@suse.de + +- Update to version 2.23.6: + + This release merges the D-Bus based branch in GNOME SVN into + the mainline + + Isolate old XSMP code as much as possible, and change + gnome-session's design to not be based upon the XSMP lifecycle + + Add a native D-Bus session management interface + + Provide an adapter interface for legacy XSMP clients + + Autostart changes: + * Improved integration + * New functionality to provide future extensibility + + Provide an "inhibit" API for clients to proactively inform + session management that they're busy + + Provide an improved logout experience +- Respin gnome-session-bnc389137-splash-layout.patch, + gnome-session-kde-support.patch, + gnome-session-ice-auth-for-suid.patch, and + gnome-session-wm-switch.patch (thanks, Vincent). + +------------------------------------------------------------------- +Fri Aug 1 12:10:38 EDT 2008 - mauro@suse.de + +- gnome-session-lang added to the gnome-session package + + This fixes bnc#412155 + +------------------------------------------------------------------- Old: ---- gnome-session-2.23.4.1.tar.bz2 New: ---- gnome-session-2.23.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.D12777/_old 2008-08-14 01:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.D12777/_new 2008-08-14 01:13:20.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package gnome-session (Version 2.23.4.1) +# spec file for package gnome-session (Version 2.23.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,8 +22,8 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libgnomekbd libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.23.4.1 -Release: 14 +Version: 2.23.6 +Release: 1 Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Source: %{name}-%{version}.tar.bz2 @@ -30,9 +37,9 @@ Source5: suse-help.svg #PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse.svg bnc388735 sbrabec@suse.cz Source6: suse.svg -#PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var. +# PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var. Patch0: gnome-session-ice-auth-for-suid.patch -#PATCH-FIX-UPSTREAM gnome-session-kdm-support.patch hpj@novell.com -- Adds support for KDM logout commands. +# PATCH-FIX-UPSTREAM gnome-session-kdm-support.patch hpj@novell.com -- Adds support for KDM logout commands. Patch1: gnome-session-kdm-support.patch #PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Patch2: gnome-session-wm-switch.patch @@ -48,6 +55,7 @@ Obsoletes: gnome-core Requires: hicolor-icon-theme Requires: %{name}-branding +Requires: %{name}-lang = %{version} Suggests: rsh # bug-buddy is required for GTK_MODULES=gnomebreakpad: Requires: bug-buddy @@ -157,7 +165,7 @@ %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %{_datadir}/gnome/autostart/* -%{_datadir}/gnome-session/session-properties.glade +%{_datadir}/gnome-session/*.glade %{_libdir}/gnome-session/helpers/* %{_datadir}/gnome/shutdown/* %dir %{_datadir}/pixmaps/splash @@ -174,6 +182,27 @@ %files lang -f %{name}-2.0.lang %changelog +* Mon Aug 11 2008 maw@suse.de +- Update to version 2.23.6: + + This release merges the D-Bus based branch in GNOME SVN into + the mainline + + Isolate old XSMP code as much as possible, and change + gnome-session's design to not be based upon the XSMP lifecycle + + Add a native D-Bus session management interface + + Provide an adapter interface for legacy XSMP clients + + Autostart changes: + * Improved integration + * New functionality to provide future extensibility + + Provide an "inhibit" API for clients to proactively inform + session management that they're busy + + Provide an improved logout experience +- Respin gnome-session-bnc389137-splash-layout.patch, + gnome-session-kde-support.patch, + gnome-session-ice-auth-for-suid.patch, and + gnome-session-wm-switch.patch (thanks, Vincent). +* Fri Aug 01 2008 mauro@suse.de +- gnome-session-lang added to the gnome-session package + + This fixes bnc#412155 * Mon Jul 21 2008 hpj@suse.de - gnome-session-suspend.patch removed; no longer needed and code changed radically. @@ -283,7 +312,7 @@ * Fri Mar 28 2008 rodrigo@suse.de - Added gnome-session-parse-autostart-command-line.patch to deal correctly with placeholders in command lines (bnc#180126) -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Remove hard esound dependency + Don't start the sound server, and play the login sound when @@ -353,7 +382,7 @@ - Ensure ~/Desktop exists before copying to it (#310363) * Thu Sep 13 2007 sbrabec@suse.cz - Fixed background resetting in /usr/bin/gnome (#309946). -* Wed Sep 12 2007 cgaisford@novell.com +* Thu Sep 13 2007 cgaisford@novell.com - Fixed up kdm-support patch to support gnome sessions in KDM Novell Bug #308022 * Mon Sep 10 2007 maw@suse.de @@ -714,7 +743,7 @@ expected (#117491) * Wed Feb 15 2006 rodrigo@suse.de - Added MOTD on login, as requested by customer. -* Sun Feb 12 2006 hpj@suse.de +* Mon Feb 13 2006 hpj@suse.de - Added patch to support KDM's logout options. * Fri Feb 10 2006 joeshaw@suse.de - Remove the beagled invocation from the /usr/X11R6/bin/gnome @@ -864,7 +893,7 @@ - Fixed gnome-session-desktop-file.patch (#73047). * Mon Mar 14 2005 clahey@suse.de - Update gnome splash from artists. -* Wed Mar 09 2005 gekker@suse.de +* Thu Mar 10 2005 gekker@suse.de - Update to version 2.10.0 (GNOME 2.10). * Mon Mar 07 2005 gekker@suse.de - mv suseplugger to default-apps patch ++++++ gnome-session-2.23.4.1.tar.bz2 -> gnome-session-2.23.6.tar.bz2 ++++++ ++++ 56931 lines of diff (skipped) ++++++ gnome-session-bnc389137-splash-layout.patch ++++++ --- /var/tmp/diff_new_pack.D12777/_old 2008-08-14 01:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.D12777/_new 2008-08-14 01:13:22.000000000 +0200 @@ -1,6 +1,8 @@ ---- gnome-session-2.23.4.1-pre/splash/splash-window.c 2008-04-21 17:38:11.000000000 -0500 -+++ gnome-session-2.23.4.1-work/splash/splash-window.c 2008-07-20 23:07:28.000000000 -0500 -@@ -40,7 +40,7 @@ G_DEFINE_TYPE (GsmSplashWindow, gsm_spla +Index: gnome-session-2.23.6/splash/splash-window.c +=================================================================== +--- gnome-session-2.23.6.orig/splash/splash-window.c ++++ gnome-session-2.23.6/splash/splash-window.c +@@ -41,7 +41,7 @@ G_DEFINE_TYPE (GsmSplashWindow, gsm_spla #define SPLASH_ICON_BORDER 26 #define SPLASH_ICON_SPACING 4 #define SPLASH_ICON_V_OFFSET 28 @@ -9,21 +11,21 @@ #define SPLASH_BASE_ICON_ROWS 1 static gboolean update_trans_effect (gpointer); -@@ -330,7 +330,7 @@ layout_icon (GsmSplashWindow *splash, Sp - { - if (gdk_pixbuf_get_width (si->unscaled) == splash->icon_size && - gdk_pixbuf_get_height (si->unscaled) == splash->icon_size) -- si->scaled = g_object_ref (si->unscaled); -+ si->scaled = gdk_pixbuf_copy (si->unscaled); - else - { - si->scaled = gdk_pixbuf_scale_simple (si->unscaled, splash->icon_size, -@@ -470,7 +470,7 @@ gsm_splash_window_start (GsmSplashWindow - return; +@@ -340,7 +340,7 @@ layout_icon (GsmSplashWindow *splash, + if (!si->scaled) { + if (gdk_pixbuf_get_width (si->unscaled) == splash->icon_size && + gdk_pixbuf_get_height (si->unscaled) == splash->icon_size) { +- si->scaled = g_object_ref (si->unscaled); ++ si->scaled = gdk_pixbuf_copy (si->unscaled); + } else { + si->scaled = gdk_pixbuf_scale_simple (si->unscaled, splash->icon_size, + splash->icon_size, +@@ -469,7 +469,7 @@ gsm_splash_window_start (GsmSplashWindow - pb = gtk_icon_theme_load_icon (splash->icon_theme, icon_name, -- 48, /* icon size */ -+ 22, /* icon size */ - 0 /* flags */, NULL); - if (!pb) - return; + pb = gtk_icon_theme_load_icon (splash->icon_theme, + icon_name, +- 48, /* icon size */ ++ 22, /* icon size */ + 0 /* flags */, + NULL); + if (!pb) { ++++++ gnome-session-ice-auth-for-suid.patch ++++++ --- /var/tmp/diff_new_pack.D12777/_old 2008-08-14 01:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.D12777/_new 2008-08-14 01:13:22.000000000 +0200 @@ -1,14 +1,13 @@ -diff -upr gnome-session-2.23.4.1-pre/gnome-session/xsmp.c gnome-session-2.23.4.1-post/gnome-session/xsmp.c ---- gnome-session-2.23.4.1-pre/gnome-session/xsmp.c 2008-06-03 10:38:18.000000000 -0500 -+++ gnome-session-2.23.4.1-post/gnome-session/xsmp.c 2008-07-20 17:35:00.000000000 -0500 -@@ -481,6 +481,9 @@ update_iceauthority (gboolean adding) - fclose (fp); - ok = TRUE; +diff -aur gnome-session-2.23.5.orig/gnome-session/gsm-xsmp-server.c gnome-session-2.23.5/gnome-session/gsm-xsmp-server.c +--- gnome-session-2.23.5.orig/gnome-session/gsm-xsmp-server.c 2008-07-29 20:02:33.000000000 +0200 ++++ gnome-session-2.23.5/gnome-session/gsm-xsmp-server.c 2008-07-29 20:24:58.000000000 +0200 +@@ -421,6 +421,9 @@ + fclose (fp); + ok = TRUE; -+ /* Lets programs auth with the session even if running as another user ID */ -+ putenv (g_strconcat ("ICEAUTHORITY=", filename, NULL)); ++ /* Lets programs auth with the session even if running as another user ID */ ++ putenv (g_strconcat ("ICEAUTHORITY=", filename, NULL)); + cleanup: - IceUnlockAuthFile (filename); - for (i = 0; i < num_local_xsmp_sockets; i++) -Only in gnome-session-2.23.4.1-post/gnome-session: xsmp.c~ + IceUnlockAuthFile (filename); + for (i = 0; i < server->priv->num_local_xsmp_sockets; i++) { ++++++ gnome-session-kdm-support.patch ++++++ ++++ 621 lines (skipped) ++++ between GNOME/gnome-session/gnome-session-kdm-support.patch ++++ and gnome-session/gnome-session-kdm-support.patch ++++++ gnome-session-wm-switch.patch ++++++ --- /var/tmp/diff_new_pack.D12777/_old 2008-08-14 01:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.D12777/_new 2008-08-14 01:13:22.000000000 +0200 @@ -1,45 +1,41 @@ ---- gnome-session-2.23.4.1-pre/gnome-session/session.c 2008-06-17 08:24:45.000000000 -0500 -+++ gnome-session-2.23.4.1-work/gnome-session/session.c 2008-07-20 22:32:00.000000000 -0500 -@@ -347,6 +347,8 @@ append_legacy_session_apps (GsmSession * - { - GKeyFile *saved; - int num_clients, i; -+ gchar *compiz_enable_path; -+ gboolean compiz_enabled = FALSE; - - saved = g_key_file_new (); - if (!g_key_file_load_from_file (saved, session_filename, 0, NULL)) -@@ -356,12 +358,33 @@ append_legacy_session_apps (GsmSession * - return; - } - -+ /* See if compiz is enabled; if it is, we have to replace legacy metacity/compiz -+ * entries with gnome-wm */ -+ compiz_enable_path = g_build_filename (g_get_user_config_dir (), "compiz", "enable-compiz", NULL); -+ compiz_enabled = compiz_enable_path && g_file_test (compiz_enable_path, G_FILE_TEST_IS_REGULAR); -+ g_free (compiz_enable_path); +diff -aur gnome-session-2.23.5.orig/gnome-session/gsm-resumed-app.c gnome-session-2.23.5/gnome-session/gsm-resumed-app.c +--- gnome-session-2.23.5.orig/gnome-session/gsm-resumed-app.c 2008-07-22 12:34:41.000000000 +0200 ++++ gnome-session-2.23.5/gnome-session/gsm-resumed-app.c 2008-07-29 23:23:58.000000000 +0200 +@@ -213,6 +213,22 @@ + char *key; + char *id; + char *val; ++ static gboolean compiz_enabled = FALSE; ++ static gboolean compiz_init = FALSE; + - num_clients = g_key_file_get_integer (saved, "Default", "num_clients", NULL); - for (i = 0; i < num_clients; i++) - { - GsmApp *app = gsm_app_resumed_new_from_legacy_session (saved, i); - if (app) -+ { -+ GsmAppResumed *app_resumed = (GsmAppResumed *) app; ++ if (!compiz_init) { ++ gchar *compiz_enable_path; + -+ /* Maybe replace legacy metacity/compiz with gnome-wm */ -+ if (app_resumed->restart_command && -+ (((!strcmp (app_resumed->restart_command, "metacity") || -+ !strcmp (app_resumed->restart_command, "/usr/bin/metacity")) && compiz_enabled) || -+ (!strcmp (app_resumed->restart_command, "compiz") || -+ !strcmp (app_resumed->restart_command, "/usr/bin/compiz")))) -+ { -+ g_free (app_resumed->restart_command); -+ app_resumed->restart_command = g_strdup ("gnome-wm"); ++ /* See if compiz is enabled; if it is, we have to replace ++ * legacy metacity/compiz entries with gnome-wm */ ++ compiz_enable_path = g_build_filename (g_get_user_config_dir (), ++ "compiz", "enable-compiz", ++ NULL); ++ compiz_enabled = compiz_enable_path && ++ g_file_test (compiz_enable_path, ++ G_FILE_TEST_IS_REGULAR); ++ g_free (compiz_enable_path); + } + + key = g_strdup_printf ("%d,id", n); + id = g_key_file_get_string (session_file, "Default", key, NULL); +@@ -242,6 +258,14 @@ + g_free (key); + + if (val) { ++ if (((!strcmp (val, "metacity") || ++ !strcmp (val, "/usr/bin/metacity")) && compiz_enabled) || ++ (!strcmp (val, "compiz") || ++ !strcmp (val, "/usr/bin/compiz"))) { ++ g_free (val); ++ val = g_strdup ("gnome-wm"); ++ } + - append_app (session, app); -+ } - } + app->priv->restart_command = val; + } - g_key_file_free (saved); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org