Hello community, here is the log from the commit of package gnome-session checked in at Wed Apr 2 23:59:31 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-03-14 05:36:27.000000000 +0100 +++ gnome-session/gnome-session.changes 2008-03-31 12:31:02.670473000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 28 15:38:26 CET 2008 - rodrigo@suse.de + +- Added gnome-session-parse-autostart-command-line.patch to deal + correctly with placeholders in command lines (bnc#180126) + +------------------------------------------------------------------- New: ---- gnome-session-parse-autostart-command-line.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.YQ3108/_old 2008-04-02 23:57:05.000000000 +0200 +++ /var/tmp/diff_new_pack.YQ3108/_new 2008-04-02 23:57:05.000000000 +0200 @@ -16,14 +16,14 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.0 -Release: 1 +Release: 13 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome Source2: gnome.desktop #PATCH-FIX-UPSTREAM gnome-session-suspend.patch bnc73000 rodrigo@novell.com Patch0: gnome-session-suspend.patch -#PATCH-FIX-SUSE gnome-session-DESKTOP_LAUNCH.patch -- What was the original motivation for this? +#PATCH-FIX-OPENSUSE gnome-session-DESKTOP_LAUNCH.patch -- What was the original motivation for this? Patch1: gnome-session-DESKTOP_LAUNCH.patch #PATCH-FIX-UPSTREAM gnome-session-remove-dns-warning.patch federico@novell.com -- Apparently a patch from Meeks, needs review Patch3: gnome-session-remove-dns-warning.patch @@ -33,23 +33,25 @@ Patch7: gnome-session-2.19.92-kdm-support.patch #PATCH-FEATURE-UPSTREAM gnome-session-motd.patch bgo159604 rodrigo@novell.com -- Needs to get upstream or be dropped Patch8: gnome-session-motd.patch -#PATCH-FIX-SUSE gnome-session-compiz.patch bnc170839 maw@novell.com +#PATCH-FIX-OPENSUSE gnome-session-compiz.patch bnc170839 maw@novell.com Patch10: gnome-session-compiz.patch -#PATCH-FIX-SUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com +#PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com # PATCH-NEEDS-REBASE gnome-session-wm-switch.patch Patch12: gnome-session-wm-switch.patch -#PATCH-FIX-SUSE gnome-session-no-devel-fatals.patch jpr@novell.com -- Prevents badly breaking factory for people +#PATCH-FIX-OPENSUSE gnome-session-no-devel-fatals.patch jpr@novell.com -- Prevents badly breaking factory for people Patch13: gnome-session-no-devel-fatals.patch -#PATCH-FEATURE-SUSE gnome-session-tile-ui.patch cgaisford@novell.com -- Feature from SLED 10 SP1 +#PATCH-FEATURE-OPENSUSE gnome-session-tile-ui.patch cgaisford@novell.com -- Feature from SLED 10 SP1 Patch14: gnome-session-tile-ui.patch #PATCH-FIX-UPSTREAM gnome-session-2.20.0-safe-a11y-startup.patch bnc302316 bgo469958 cgaisford@novell.com -- hpj@novell.com modified this for bnc332498 Patch15: gnome-session-2.20.0-safe-a11y-startup.patch #PATCH-FIX-UPSTREAM gnome-session-sound.patch bnc294396 bgo466458 cgaisford@novell.com -- there is a newer version upstream from mandriva #PATCH-NEEDS-REBASE gnome-session-sound.patch Patch16: gnome-session-sound.patch -#PATCH-FIX-SUSE gnome-session-sound.patch bnc294396 bgo466458 cgaisford@novell.com -- there is a newer version upstream from mandriva +#PATCH-FIX-OPENSUSE gnome-session-sound.patch bnc294396 bgo466458 cgaisford@novell.com -- there is a newer version upstream from mandriva Patch17: gnome-session-gcc4.3-fixes.patch Url: http://www.gnome.org +#PATCH-FIX-OPENSUSE gnome-session-parse-autostart-command-line.patch bnc180126 rodrigo@novell.com -- this is a temporary patch, remove when we update to the new gnome-session (2.23/2.24) +Patch18: gnome-session-parse-autostart-command-line.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: control-center2 Obsoletes: gnome-core @@ -80,6 +82,7 @@ %package branding-upstream +License: GPL v2 or later; LGPL v2.1 or later Summary: Session Tools for the GNOME 2.x Desktop Group: System/GUI/GNOME Provides: %{name}-branding = %{version} @@ -120,6 +123,7 @@ %patch15 -p1 #%patch16 %patch17 -p1 +%patch18 gnome-patch-translation-update %build @@ -174,6 +178,9 @@ %files lang -f %{name}-2.0.lang %changelog +* 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) * Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Remove hard esound dependency ++++++ gnome-session-parse-autostart-command-line.patch ++++++ Index: gnome-session/gsm-autostart.c =================================================================== --- gnome-session/gsm-autostart.c (revision 4626) +++ gnome-session/gsm-autostart.c (working copy) @@ -260,3 +260,25 @@ return list; } + +gchar * +gsm_autostart_parse_command_line (GKeyFile *keyfile) +{ + gchar *p, *result; + GString *gs; + gchar *exec = gsm_key_file_get_string (keyfile, "Exec"); + + gs = g_string_new (NULL); + for (p = exec; *p != '\0'; p++) + { + if (*p == '%' && p[1] == 'u') + p++; + else + g_string_append_c (gs, *p); + } + + result = gs->str; + g_string_free (gs, FALSE); + + return result; +} Index: gnome-session/gsm-autostart.h =================================================================== --- gnome-session/gsm-autostart.h (revision 4626) +++ gnome-session/gsm-autostart.h (working copy) @@ -43,6 +43,9 @@ GsmAutostartFreeFunc free_handler, gboolean enabled_only); +gchar * +gsm_autostart_parse_command_line (GKeyFile *keyfile); + G_END_DECLS #endif /* GSM_AUTOSTART_H */ Index: gnome-session/startup-programs.c =================================================================== --- gnome-session/startup-programs.c (revision 4626) +++ gnome-session/startup-programs.c (working copy) @@ -117,7 +117,7 @@ if (client->name == NULL) client->name = gsm_key_file_get_locale_string (keyfile, "GenericName"); - client->command = gsm_key_file_get_string (keyfile, "Exec"); + client->command = gsm_autostart_parse_command_line (keyfile); client->comment = gsm_key_file_get_locale_string (keyfile, "Comment"); client->enabled = gsm_key_file_get_boolean (keyfile, "X-GNOME-Autostart-enabled", Index: gnome-session/save.c =================================================================== --- gnome-session/save.c (revision 4626) +++ gnome-session/save.c (working copy) @@ -373,7 +373,7 @@ Client *client; SmProp *prop; - exec = gsm_key_file_get_string (keyfile, "Exec"); + exec = gsm_autostart_parse_command_line (keyfile); if (!g_shell_parse_argv (exec, &argc, &argv, NULL)) { g_free (exec); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org