Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2012-04-20 15:15:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-session (Old) and /work/SRC/openSUSE:Factory/.gnome-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-session", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2012-04-11 12:56:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2012-04-20 15:15:44.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 16 12:41:39 UTC 2012 - [email protected] + +- 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 + <[email protected]>: + + Support suspend with KDM + + Fix crash when cancelling log out + +------------------------------------------------------------------- Old: ---- gnome-session-3.4.0.tar.xz New: ---- gnome-session-3.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.Xaq17O/_old 2012-04-20 15:15:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Xaq17O/_new 2012-04-20 15:15:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnome-session -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: Session Tools for the GNOME Desktop License: GPL-2.0+ ++++++ gnome-session-kdm-support.patch ++++++ --- /var/tmp/diff_new_pack.Xaq17O/_old 2012-04-20 15:15:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Xaq17O/_new 2012-04-20 15:15:47.000000000 +0200 @@ -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 ---- 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 +Index: gnome-session-3.4.1/gnome-session/gdm.c +=================================================================== +--- gnome-session-3.4.1.orig/gnome-session/gdm.c ++++ gnome-session-3.4.1/gnome-session/gdm.c @@ -58,6 +58,8 @@ #define GDM_ACTION_STR_REBOOT "REBOOT" #define GDM_ACTION_STR_SUSPEND "SUSPEND" @@ -10,7 +11,7 @@ typedef struct { int fd; char *auth_cookie; -@@ -66,6 +68,8 @@ +@@ -66,6 +68,8 @@ typedef struct { GdmLogoutAction current_actions; time_t last_update; @@ -19,7 +20,7 @@ } GdmProtocolData; static GdmProtocolData gdm_protocol_data = { -@@ -73,12 +77,13 @@ +@@ -73,12 +77,13 @@ static GdmProtocolData gdm_protocol_data NULL, GDM_LOGOUT_ACTION_NONE, GDM_LOGOUT_ACTION_NONE, @@ -36,7 +37,7 @@ { GString *retval; char buf[256]; -@@ -90,7 +95,7 @@ +@@ -90,7 +95,7 @@ gdm_send_protocol_msg (GdmProtocolData * if (write (data->fd, p, strlen (p)) < 0) { g_free (p); @@ -45,7 +46,7 @@ g_strerror (errno)); return NULL; -@@ -169,7 +174,7 @@ +@@ -169,7 +174,7 @@ gdm_authenticate_connection (GdmProtocol msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", data->auth_cookie); @@ -54,7 +55,7 @@ g_free (msg); if (response && !strcmp (response, "OK")) { -@@ -214,7 +219,7 @@ +@@ -214,7 +219,7 @@ gdm_authenticate_connection (GdmProtocol XauDisposeAuth (xau); msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer); @@ -63,7 +64,7 @@ g_free (msg); if (response && !strcmp (response, "OK")) { -@@ -237,7 +242,7 @@ +@@ -237,7 +242,7 @@ gdm_authenticate_connection (GdmProtocol } static void @@ -72,7 +73,7 @@ { if (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_strerror (errno)); @@ -81,7 +82,7 @@ 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_strerror (errno)); @@ -103,7 +104,7 @@ return FALSE; } -@@ -299,13 +304,76 @@ +@@ -299,13 +304,76 @@ gdm_init_protocol_connection (GdmProtoco if (!gdm_authenticate_connection (data)) { g_warning ("Failed to authenticate with GDM"); @@ -181,7 +182,7 @@ static void gdm_parse_query_response (GdmProtocolData *data, const char *response) -@@ -360,7 +428,21 @@ +@@ -360,7 +428,23 @@ gdm_parse_query_response (GdmProtocolDat } static void @@ -197,6 +198,8 @@ + + if (strstr (response, "\tshutdown")) + data->available_actions |= GDM_LOGOUT_ACTION_SHUTDOWN | GDM_LOGOUT_ACTION_REBOOT; ++ if (strstr (response, "\tsuspend")) ++ data->available_actions |= GDM_LOGOUT_ACTION_SUSPEND; +} + +static void @@ -204,7 +207,7 @@ { time_t current_time; char *response; -@@ -373,26 +455,35 @@ +@@ -373,26 +457,35 @@ gdm_update_logout_actions (GdmProtocolDa data->last_update = current_time; @@ -247,7 +250,7 @@ return TRUE; } -@@ -400,7 +491,7 @@ +@@ -400,7 +493,7 @@ gdm_is_available (void) gboolean gdm_supports_logout_action (GdmLogoutAction action) { @@ -256,7 +259,7 @@ return (gdm_protocol_data.available_actions & action) != 0; } -@@ -408,21 +499,15 @@ +@@ -408,21 +501,15 @@ gdm_supports_logout_action (GdmLogoutAct GdmLogoutAction gdm_get_logout_action (void) { @@ -281,7 +284,7 @@ switch (action) { case GDM_LOGOUT_ACTION_NONE: -@@ -439,16 +524,45 @@ +@@ -439,16 +526,58 @@ gdm_set_logout_action (GdmLogoutAction a break; } @@ -294,10 +297,23 @@ +{ + 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"); -+ else if (action == GDM_LOGOUT_ACTION_REBOOT) ++ break; ++ case GDM_LOGOUT_ACTION_REBOOT: + msg = g_strdup ("shutdown\treboot\task"); ++ break; ++ case GDM_LOGOUT_ACTION_SUSPEND: ++ msg = g_strdup ("suspend"); ++ break; ++ default: ++ msg = g_strdup (""); ++ break; ++ } + + return msg; +} @@ -330,7 +346,7 @@ } void -@@ -456,16 +570,16 @@ +@@ -456,16 +585,16 @@ gdm_new_login (void) { char *response; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
