pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=49

Browse Source
This commit is contained in:
OBS User unknown 2008-05-17 00:26:14 +00:00 committed by Git OBS Bridge
parent f4b281f3aa
commit b11d7e7d64
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnome-session-wm-switch.patch
View File

@ -1,6 +1,6 @@
diff -aurp gnome-session-2.22.1.1/gnome-session/main.c gnome-session-2.22.1.1-patched/gnome-session/main.c
--- gnome-session-2.22.1.1/gnome-session/main.c 2008-04-10 16:32:20.000000000 +0200
+++ gnome-session-2.22.1.1-patched/gnome-session/main.c 2008-05-13 10:56:24.000221000 +0200
+++ gnome-session-2.22.1.1-patched/gnome-session/main.c 2008-05-16 15:28:42.777710000 +0200
@@ -47,6 +47,8 @@
#include "command.h"
#include "splash-widget.h"
@ -10,7 +10,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/main.c gnome-session-2.22.1.1-pa
#include "gsm-dbus.h"
#include "gsm-sound.h"
#include "gsm-gsd.h"
@@ -600,6 +602,71 @@ gsm_shutdown_gconfd (void)
@@ -600,6 +602,77 @@ gsm_shutdown_gconfd (void)
g_free (command);
}
@ -59,14 +59,20 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/main.c gnome-session-2.22.1.1-pa
+ prop = malloc (sizeof (SmProp));
+ prop->name = strdup (SmRestartCommand);
+ prop->type = strdup (SmLISTofARRAY8);
+ prop->num_vals = 3;
+ prop->vals = malloc (3 * sizeof (SmPropValue));
+ if (client->id)
+ prop->num_vals = 3;
+ else
+ prop->num_vals = 1;
+ prop->vals = malloc (prop->num_vals * sizeof (SmPropValue));
+ prop->vals[0].value = strdup ("gnome-wm");
+ prop->vals[0].length = strlen (prop->vals[0].value);
+ prop->vals[1].value = strdup ("--sm-client-id");
+ prop->vals[1].length = strlen (prop->vals[1].value);
+ prop->vals[2].value = strdup (client->id);
+ prop->vals[2].length = strlen (prop->vals[2].value);
+ if (client->id)
+ {
+ prop->vals[1].value = strdup ("--sm-client-id");
+ prop->vals[1].length = strlen (prop->vals[1].value);
+ prop->vals[2].value = strdup (client->id);
+ prop->vals[2].length = strlen (prop->vals[2].value);
+ }
+ client->properties = g_slist_prepend (client->properties, prop);
+
+ prop = malloc (sizeof (SmProp));
@ -82,7 +88,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/main.c gnome-session-2.22.1.1-pa
int
main (int argc, char *argv[])
{
@@ -777,6 +844,8 @@ main (int argc, char *argv[])
@@ -777,6 +850,8 @@ main (int argc, char *argv[])
g_setenv ("GNOME_DESKTOP_SESSION_ID", session_name, TRUE);
the_session = read_session (session_name);

6
gnome-session.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 16 15:43:50 CEST 2008 - vuntz@suse.de
- Fix a crash in gnome-session-wm-switch.patch when there's no
client id in the saved session. Fix bnc#391305
-------------------------------------------------------------------
Thu May 15 16:35:22 CEST 2008 - olh@suse.de

5
gnome-session.spec
View File

@ -16,7 +16,7 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gn
License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME
Version: 2.22.1.1
Release: 31
Release: 32
Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2
Source1: gnome
@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang
%changelog
* Fri May 16 2008 vuntz@suse.de
- Fix a crash in gnome-session-wm-switch.patch when there's no
client id in the saved session. Fix bnc#391305
* Thu May 15 2008 olh@suse.de
- remove unneeded Recommends: -64bit on ppc (bnc#390761)
* Thu May 15 2008 vuntz@suse.de