r19573 - in /desktop/experimental/gnome-session/debian: changelog patches/10_session_save.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Apr 14 08:06:21 UTC 2009
Author: joss
Date: Tue Apr 14 08:06:21 2009
New Revision: 19573
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19573
Log:
10_session_save.patch: fix bug that leads to saving the session
every time a SaveYourselfComplete request is received.
Modified:
desktop/experimental/gnome-session/debian/changelog
desktop/experimental/gnome-session/debian/patches/10_session_save.patch
Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=19573&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog (original)
+++ desktop/experimental/gnome-session/debian/changelog Tue Apr 14 08:06:21 2009
@@ -1,3 +1,10 @@
+gnome-session (2.26.0.90-2) UNRELEASED; urgency=low
+
+ * 10_session_save.patch: fix bug that leads to saving the session
+ every time a SaveYourselfComplete request is received.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 14 Apr 2009 10:05:33 +0200
+
gnome-session (2.26.0.90-1) experimental; urgency=low
* New upstream release.
Modified: desktop/experimental/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/10_session_save.patch?rev=19573&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/10_session_save.patch (original)
+++ desktop/experimental/gnome-session/debian/patches/10_session_save.patch Tue Apr 14 08:06:21 2009
@@ -2,8 +2,8 @@
Index: gnome-session-2.26.0.90/data/session-properties.glade
===================================================================
---- gnome-session-2.26.0.90.orig/data/session-properties.glade 2009-04-12 11:21:47.414477454 +0200
-+++ gnome-session-2.26.0.90/data/session-properties.glade 2009-04-12 18:39:21.470478635 +0200
+--- gnome-session-2.26.0.90.orig/data/session-properties.glade 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/data/session-properties.glade 2009-04-14 09:54:50.300632243 +0200
@@ -306,7 +306,7 @@
<property name="visible">True</property>
<child>
@@ -33,8 +33,8 @@
<property name="position">1</property>
Index: gnome-session-2.26.0.90/gnome-session/gsm-manager.c
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.c 2009-04-12 11:21:47.550484405 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-manager.c 2009-04-13 16:18:30.938481203 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.c 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-manager.c 2009-04-14 10:04:36.521137564 +0200
@@ -67,6 +67,7 @@
#define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
@@ -135,7 +135,7 @@
static void
do_phase_query_end_session (GsmManager *manager)
{
-@@ -1766,20 +1845,31 @@ on_client_end_session_response (GsmClien
+@@ -1766,13 +1845,32 @@ on_client_end_session_response (GsmClien
const char *reason,
GsmManager *manager)
{
@@ -148,13 +148,19 @@
g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason);
-+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
++ /* Ignore responses when no requests were sent */
++ if (manager->priv->query_clients == NULL) {
++ return;
++ }
++
++ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
++
+ if (do_last) {
+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
+ client);
+ }
++
+ if (manager->priv->query_clients == NULL) {
+ query_save_session_complete (manager);
+ }
@@ -164,14 +170,7 @@
if (cancel) {
cancel_end_session (manager);
return;
- }
-
-- manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
--
- if (! is_ok) {
- guint cookie;
- GsmInhibitor *inhibitor;
-@@ -1871,6 +1961,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
+@@ -1871,6 +1969,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
}
static void
@@ -187,7 +186,7 @@
on_store_client_added (GsmStore *store,
const char *id,
GsmManager *manager)
-@@ -1891,6 +1990,10 @@ on_store_client_added (GsmStore *store
+@@ -1891,6 +1998,10 @@ on_store_client_added (GsmStore *store
"logout-request",
G_CALLBACK (on_xsmp_client_logout_request),
manager);
@@ -198,7 +197,7 @@
}
g_signal_connect (client,
-@@ -2841,6 +2944,41 @@ gsm_manager_shutdown (GsmManager *manage
+@@ -2841,6 +2952,41 @@ gsm_manager_shutdown (GsmManager *manage
}
gboolean
@@ -242,8 +241,8 @@
GError **error)
Index: gnome-session-2.26.0.90/gnome-session/gsm-manager.h
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.h 2009-04-12 11:21:47.510481555 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-manager.h 2009-04-12 18:39:21.474478724 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.h 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-manager.h 2009-04-14 09:54:50.312631534 +0200
@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhib
gboolean gsm_manager_shutdown (GsmManager *manager,
GError **error);
@@ -256,8 +255,8 @@
GError **error);
Index: gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.c
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.c 2009-04-12 11:21:47.462481949 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.c 2009-04-13 15:58:12.365981974 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.c 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.c 2009-04-14 09:54:50.312631534 +0200
@@ -69,6 +69,7 @@ enum {
enum {
REGISTER_REQUEST,
@@ -325,8 +324,8 @@
g_param_spec_pointer ("ice-connection",
Index: gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.h
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.h 2009-04-12 11:21:47.434478390 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.h 2009-04-12 18:39:21.474478724 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.h 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.h 2009-04-14 09:54:50.316631624 +0200
@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
char **client_id);
gboolean (*logout_request) (GsmXSMPClient *client,
@@ -339,8 +338,8 @@
Index: gnome-session-2.26.0.90/gnome-session/org.gnome.SessionManager.xml
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/org.gnome.SessionManager.xml 2009-04-12 11:21:47.486481019 +0200
-+++ gnome-session-2.26.0.90/gnome-session/org.gnome.SessionManager.xml 2009-04-12 18:39:21.474478724 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/org.gnome.SessionManager.xml 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/org.gnome.SessionManager.xml 2009-04-14 09:54:50.316631624 +0200
@@ -256,6 +256,14 @@
</doc:doc>
</method>
@@ -358,8 +357,8 @@
<doc:doc>
Index: gnome-session-2.26.0.90/capplet/gsm-properties-dialog.c
===================================================================
---- gnome-session-2.26.0.90.orig/capplet/gsm-properties-dialog.c 2009-04-12 11:21:47.370481360 +0200
-+++ gnome-session-2.26.0.90/capplet/gsm-properties-dialog.c 2009-04-12 18:39:21.474478724 +0200
+--- gnome-session-2.26.0.90.orig/capplet/gsm-properties-dialog.c 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/capplet/gsm-properties-dialog.c 2009-04-14 09:54:50.316631624 +0200
@@ -41,6 +41,12 @@
#include "gsm-app-dialog.h"
#include "eggdesktopfile.h"
@@ -449,8 +448,8 @@
static void
Index: gnome-session-2.26.0.90/configure.in
===================================================================
---- gnome-session-2.26.0.90.orig/configure.in 2009-04-12 11:21:47.342482201 +0200
-+++ gnome-session-2.26.0.90/configure.in 2009-04-12 18:39:21.478478814 +0200
+--- gnome-session-2.26.0.90.orig/configure.in 2009-04-08 15:43:33.000000000 +0200
++++ gnome-session-2.26.0.90/configure.in 2009-04-14 09:54:50.316631624 +0200
@@ -67,6 +67,7 @@ PKG_CHECK_MODULES(SESSION_PROPERTIES,
glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
@@ -461,8 +460,8 @@
PKG_CHECK_MODULES(SPLASH,
Index: gnome-session-2.26.0.90/gnome-session/gsm-client.h
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-client.h 2009-04-13 10:23:56.085980746 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-client.h 2009-04-13 15:52:13.745978035 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-client.h 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-client.h 2009-04-14 09:54:50.316631624 +0200
@@ -92,6 +92,9 @@ struct _GsmClientClass
GError **error);
gboolean (*impl_stop) (GsmClient *client,
@@ -485,8 +484,8 @@
/* exported to bus */
Index: gnome-session-2.26.0.90/gnome-session/gsm-dbus-client.c
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-dbus-client.c 2009-04-13 10:32:28.393980156 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-dbus-client.c 2009-04-13 15:53:12.573979150 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-dbus-client.c 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-dbus-client.c 2009-04-14 09:54:50.316631624 +0200
@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *objec
G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
}
@@ -517,8 +516,8 @@
client_class->impl_query_end_session = dbus_client_query_end_session;
Index: gnome-session-2.26.0.90/gnome-session/gsm-client.c
===================================================================
---- gnome-session-2.26.0.90.orig/gnome-session/gsm-client.c 2009-04-13 10:23:55.981981355 +0200
-+++ gnome-session-2.26.0.90/gnome-session/gsm-client.c 2009-04-13 15:52:36.933978536 +0200
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-client.c 2009-04-08 15:42:58.000000000 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-client.c 2009-04-14 09:54:50.320631225 +0200
@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
g_signal_emit (client, signals[DISCONNECTED], 0);
}
More information about the pkg-gnome-commits
mailing list