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

Accepting request 113921 from home:vuntz:branches:GNOME:Factory

Browse Source 
Update to 3.4.1

OBS-URL: https://build.opensuse.org/request/show/113921
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=150
This commit is contained in:
Vincent Untz 2012-04-18 15:21:43 +00:00 committed by Git OBS Bridge
parent fd52ebe8fa
commit 7acc896748
5 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-3.4.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf8ba2ba9d61ad680df9e66ca38f05d6e3bf00c65634bb0dc5e41690862608e1
size 708924

3
gnome-session-3.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ad29c2c3158b9e0109d3463e587fe09f312b810a9db51775750b9af8ce457aa
size 710692

56
gnome-session-kdm-support.patch
View File

@ -1,6 +1,7 @@
diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gnome-session/gdm.c Index: gnome-session-3.4.1/gnome-session/gdm.c
--- gnome-session-2.23.5.orig/gnome-session/gdm.c 2008-07-22 12:34:41.000000000 +0200 ===================================================================
+++ gnome-session-2.23.5/gnome-session/gdm.c 2008-07-29 23:45:19.000000000 +0200 --- gnome-session-3.4.1.orig/gnome-session/gdm.c
+++ gnome-session-3.4.1/gnome-session/gdm.c
@@ -58,6 +58,8 @@ @@ -58,6 +58,8 @@
#define GDM_ACTION_STR_REBOOT "REBOOT" #define GDM_ACTION_STR_REBOOT "REBOOT"
#define GDM_ACTION_STR_SUSPEND "SUSPEND" #define GDM_ACTION_STR_SUSPEND "SUSPEND"
@ -10,7 +11,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
typedef struct { typedef struct {
int fd; int fd;
char *auth_cookie; char *auth_cookie;
@@ -66,6 +68,8 @@ @@ -66,6 +68,8 @@ typedef struct {
GdmLogoutAction current_actions; GdmLogoutAction current_actions;
time_t last_update; time_t last_update;
@ -19,7 +20,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
} GdmProtocolData; } GdmProtocolData;
static GdmProtocolData gdm_protocol_data = { static GdmProtocolData gdm_protocol_data = {
@@ -73,12 +77,13 @@ @@ -73,12 +77,13 @@ static GdmProtocolData gdm_protocol_data
NULL, NULL,
GDM_LOGOUT_ACTION_NONE, GDM_LOGOUT_ACTION_NONE,
GDM_LOGOUT_ACTION_NONE, GDM_LOGOUT_ACTION_NONE,
@ -36,7 +37,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
{ {
GString *retval; GString *retval;
char buf[256]; char buf[256];
@@ -90,7 +95,7 @@ @@ -90,7 +95,7 @@ gdm_send_protocol_msg (GdmProtocolData *
if (write (data->fd, p, strlen (p)) < 0) { if (write (data->fd, p, strlen (p)) < 0) {
g_free (p); g_free (p);
@ -45,7 +46,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
g_strerror (errno)); g_strerror (errno));
return NULL; return NULL;
@@ -169,7 +174,7 @@ @@ -169,7 +174,7 @@ gdm_authenticate_connection (GdmProtocol
msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s",
data->auth_cookie); data->auth_cookie);
@ -54,7 +55,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
g_free (msg); g_free (msg);
if (response && !strcmp (response, "OK")) { if (response && !strcmp (response, "OK")) {
@@ -214,7 +219,7 @@ @@ -214,7 +219,7 @@ gdm_authenticate_connection (GdmProtocol
XauDisposeAuth (xau); XauDisposeAuth (xau);
msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer); msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer);
@ -63,7 +64,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
g_free (msg); g_free (msg);
if (response && !strcmp (response, "OK")) { if (response && !strcmp (response, "OK")) {
@@ -237,7 +242,7 @@ @@ -237,7 +242,7 @@ gdm_authenticate_connection (GdmProtocol
} }
static void static void
@ -72,7 +73,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
{ {
if (data->fd) { if (data->fd) {
close (data->fd); close (data->fd);
@@ -268,7 +273,7 @@ @@ -268,7 +273,7 @@ gdm_init_protocol_connection (GdmProtoco
g_warning ("Failed to create GDM socket: %s", g_warning ("Failed to create GDM socket: %s",
g_strerror (errno)); g_strerror (errno));
@ -81,7 +82,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
return FALSE; return FALSE;
} }
@@ -279,18 +284,18 @@ @@ -279,18 +284,18 @@ gdm_init_protocol_connection (GdmProtoco
g_warning ("Failed to establish a connection with GDM: %s", g_warning ("Failed to establish a connection with GDM: %s",
g_strerror (errno)); g_strerror (errno));
@ -103,7 +104,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
return FALSE; return FALSE;
} }
@@ -299,13 +304,76 @@ @@ -299,13 +304,76 @@ gdm_init_protocol_connection (GdmProtoco
if (!gdm_authenticate_connection (data)) { if (!gdm_authenticate_connection (data)) {
g_warning ("Failed to authenticate with GDM"); g_warning ("Failed to authenticate with GDM");
@ -181,7 +182,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
static void static void
gdm_parse_query_response (GdmProtocolData *data, gdm_parse_query_response (GdmProtocolData *data,
const char *response) const char *response)
@@ -360,7 +428,21 @@ @@ -360,7 +428,23 @@ gdm_parse_query_response (GdmProtocolDat
} }
static void static void
@ -197,6 +198,8 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
+ +
+ if (strstr (response, "\tshutdown")) + if (strstr (response, "\tshutdown"))
+ data->available_actions |= GDM_LOGOUT_ACTION_SHUTDOWN | GDM_LOGOUT_ACTION_REBOOT; + data->available_actions |= GDM_LOGOUT_ACTION_SHUTDOWN | GDM_LOGOUT_ACTION_REBOOT;
+ if (strstr (response, "\tsuspend"))
+ data->available_actions |= GDM_LOGOUT_ACTION_SUSPEND;
+} +}
+ +
+static void +static void
@ -204,7 +207,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
{ {
time_t current_time; time_t current_time;
char *response; char *response;
@@ -373,26 +455,35 @@ @@ -373,26 +457,35 @@ gdm_update_logout_actions (GdmProtocolDa
data->last_update = current_time; data->last_update = current_time;
@ -247,7 +250,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
return TRUE; return TRUE;
} }
@@ -400,7 +491,7 @@ @@ -400,7 +493,7 @@ gdm_is_available (void)
gboolean gboolean
gdm_supports_logout_action (GdmLogoutAction action) gdm_supports_logout_action (GdmLogoutAction action)
{ {
@ -256,7 +259,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
return (gdm_protocol_data.available_actions & action) != 0; return (gdm_protocol_data.available_actions & action) != 0;
} }
@@ -408,21 +499,15 @@ @@ -408,21 +501,15 @@ gdm_supports_logout_action (GdmLogoutAct
GdmLogoutAction GdmLogoutAction
gdm_get_logout_action (void) gdm_get_logout_action (void)
{ {
@ -281,7 +284,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
switch (action) { switch (action) {
case GDM_LOGOUT_ACTION_NONE: case GDM_LOGOUT_ACTION_NONE:
@@ -439,16 +524,45 @@ @@ -439,16 +526,58 @@ gdm_set_logout_action (GdmLogoutAction a
break; break;
} }
@ -294,10 +297,23 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
+{ +{
+ char *msg = NULL; + char *msg = NULL;
+ +
+ if (action == GDM_LOGOUT_ACTION_SHUTDOWN) + switch (action) {
+ case GDM_LOGOUT_ACTION_NONE:
+ msg = g_strdup ("shutdown\tcancel");
+ break;
+ case GDM_LOGOUT_ACTION_SHUTDOWN:
+ msg = g_strdup ("shutdown\thalt\task"); + msg = g_strdup ("shutdown\thalt\task");
+ else if (action == GDM_LOGOUT_ACTION_REBOOT) + break;
+ case GDM_LOGOUT_ACTION_REBOOT:
+ msg = g_strdup ("shutdown\treboot\task"); + msg = g_strdup ("shutdown\treboot\task");
+ break;
+ case GDM_LOGOUT_ACTION_SUSPEND:
+ msg = g_strdup ("suspend");
+ break;
+ default:
+ msg = g_strdup ("");
+ break;
+ }
+ +
+ return msg; + return msg;
+} +}
@ -330,7 +346,7 @@ diff -aur gnome-session-2.23.5.orig/gnome-session/gdm.c gnome-session-2.23.5/gno
} }
void void
@@ -456,16 +570,16 @@ @@ -456,16 +585,16 @@ gdm_new_login (void)
{ {
char *response; char *response;

13
gnome-session.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Apr 16 12:41:39 UTC 2012 - vuntz@opensuse.org
- Update to version 3.4.1:
+ Properly move to next phase if an app dies on startup
+ Fix some restart/poweroff problems in the systemd code
+ Cleanups
+ Updated translations.
- Update gnome-session-kdm-support.patch, from Stefan Bruens
<stefan.bruens@rwth-aachen.de>:
+ Support suspend with KDM
+ Fix crash when cancelling log out
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 2 16:25:06 UTC 2012 - jhernandez@emergya.es Mon Apr 2 16:25:06 UTC 2012 - jhernandez@emergya.es

2
gnome-session.spec
View File

@ -17,7 +17,7 @@
Name: gnome-session Name: gnome-session
Version: 3.4.0 Version: 3.4.1
Release: 0 Release: 0
Summary: Session Tools for the GNOME Desktop Summary: Session Tools for the GNOME Desktop
License: GPL-2.0+ License: GPL-2.0+