r29747 - in /desktop/unstable/gnome-session/debian/patches: 10_session_save.patch 12_no_gdm_fallback.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Sep 26 13:36:08 UTC 2011


Author: biebl
Date: Mon Sep 26 13:36:07 2011
New Revision: 29747

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29747
Log:
Unfuzz patches

Modified:
    desktop/unstable/gnome-session/debian/patches/10_session_save.patch
    desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch

Modified: desktop/unstable/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/10_session_save.patch?rev=29747&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/10_session_save.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/10_session_save.patch [utf-8] Mon Sep 26 13:36:07 2011
@@ -1,10 +1,10 @@
 Based on the patch in GNOME #575544
 
-Index: gnome-session-2.30.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-manager.c	2010-04-13 22:43:50.193234971 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-manager.c	2010-04-13 22:45:09.769740854 +0200
-@@ -70,6 +70,7 @@
+Index: gnome-session-2.30.2/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-manager.c	2011-09-26 13:33:25.074965890 +0200
++++ gnome-session-2.30.2/gnome-session/gsm-manager.c	2011-09-26 13:33:25.854956084 +0200
+@@ -68,6 +68,7 @@
  #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
  
  #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
@@ -12,7 +12,7 @@
  
  #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
  #define GDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1171,6 +1172,69 @@ query_end_session_complete (GsmManager *
+@@ -1153,6 +1154,69 @@
  
  }
  
@@ -82,7 +82,7 @@
  static guint32
  generate_cookie (void)
  {
-@@ -1245,6 +1309,21 @@ _on_query_end_session_timeout (GsmManage
+@@ -1227,6 +1291,21 @@
          return FALSE;
  }
  
@@ -104,7 +104,7 @@
  static void
  do_phase_query_end_session (GsmManager *manager)
  {
-@@ -1881,13 +1960,32 @@ on_client_end_session_response (GsmClien
+@@ -1863,13 +1942,32 @@
                                  const char *reason,
                                  GsmManager *manager)
  {
@@ -139,7 +139,7 @@
          if (cancel) {
                  cancel_end_session (manager);
                  return;
-@@ -1986,6 +2084,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
+@@ -1968,6 +2066,15 @@
  }
  
  static void
@@ -155,7 +155,7 @@
  on_store_client_added (GsmStore   *store,
                         const char *id,
                         GsmManager *manager)
-@@ -2006,6 +2113,10 @@ on_store_client_added (GsmStore   *store
+@@ -1988,6 +2095,10 @@
                                    "logout-request",
                                    G_CALLBACK (on_xsmp_client_logout_request),
                                    manager);
@@ -166,7 +166,7 @@
          }
  
          g_signal_connect (client,
-@@ -2967,6 +3078,41 @@ gsm_manager_shutdown (GsmManager *manage
+@@ -2945,6 +3056,41 @@
  }
  
  gboolean
@@ -208,11 +208,11 @@
  gsm_manager_can_shutdown (GsmManager *manager,
                            gboolean   *shutdown_available,
                            GError    **error)
-Index: gnome-session-2.30.0/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-manager.h	2010-04-13 22:43:47.605735935 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-manager.h	2010-04-13 22:45:09.773737032 +0200
-@@ -152,6 +152,9 @@ gboolean            gsm_manager_is_inhib
+Index: gnome-session-2.30.2/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-manager.h	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-manager.h	2011-09-26 13:33:25.858956034 +0200
+@@ -152,6 +152,9 @@
  gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
                                                                  GError        **error);
  
@@ -222,11 +222,11 @@
  gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
                                                                  gboolean       *shutdown_available,
                                                                  GError        **error);
-Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.c	2010-04-13 22:43:47.593735178 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c	2010-04-13 22:45:09.773737032 +0200
-@@ -69,6 +69,7 @@ enum {
+Index: gnome-session-2.30.2/gnome-session/gsm-xsmp-client.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-xsmp-client.c	2010-03-30 01:46:51.000000000 +0200
++++ gnome-session-2.30.2/gnome-session/gsm-xsmp-client.c	2011-09-26 13:33:25.858956034 +0200
+@@ -69,6 +69,7 @@
  enum {
          REGISTER_REQUEST,
          LOGOUT_REQUEST,
@@ -234,7 +234,7 @@
          LAST_SIGNAL
  };
  
-@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *clie
+@@ -502,6 +503,30 @@
          return TRUE;
  }
  
@@ -265,7 +265,7 @@
  static char *
  get_desktop_file_path (GsmXSMPClient *client)
  {
-@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+@@ -976,6 +1001,7 @@
          object_class->get_property         = gsm_xsmp_client_get_property;
          object_class->set_property         = gsm_xsmp_client_set_property;
  
@@ -273,7 +273,7 @@
          client_class->impl_save                   = xsmp_save;
          client_class->impl_stop                   = xsmp_stop;
          client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1003,6 +1029,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+@@ -1003,6 +1029,17 @@
                                NULL,
                                NULL,
                                g_cclosure_marshal_VOID__BOOLEAN,
@@ -291,11 +291,11 @@
                                G_TYPE_NONE,
                                1, G_TYPE_BOOLEAN);
  
-Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.h	2010-04-13 22:43:47.581740287 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h	2010-04-13 22:45:09.773737032 +0200
-@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
+Index: gnome-session-2.30.2/gnome-session/gsm-xsmp-client.h
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-xsmp-client.h	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-xsmp-client.h	2011-09-26 13:33:25.858956034 +0200
+@@ -54,7 +54,8 @@
                                            char          **client_id);
          gboolean (*logout_request)       (GsmXSMPClient  *client,
                                            gboolean        prompt);
@@ -305,10 +305,10 @@
  
          void     (*saved_state)          (GsmXSMPClient  *client);
  
-Index: gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/org.gnome.SessionManager.xml	2010-04-13 22:43:47.573736685 +0200
-+++ gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml	2010-04-13 22:45:09.773737032 +0200
+Index: gnome-session-2.30.2/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/org.gnome.SessionManager.xml	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/org.gnome.SessionManager.xml	2011-09-26 13:33:25.858956034 +0200
 @@ -256,6 +256,14 @@
        </doc:doc>
      </method>
@@ -324,10 +324,10 @@
      <method name="CanShutdown">
        <arg name="is_available" direction="out" type="b">
          <doc:doc>
-Index: gnome-session-2.30.0/capplet/gsm-properties-dialog.c
-===================================================================
---- gnome-session-2.30.0.orig/capplet/gsm-properties-dialog.c	2010-04-13 22:43:47.513740722 +0200
-+++ gnome-session-2.30.0/capplet/gsm-properties-dialog.c	2010-04-13 22:45:09.773737032 +0200
+Index: gnome-session-2.30.2/capplet/gsm-properties-dialog.c
+===================================================================
+--- gnome-session-2.30.2.orig/capplet/gsm-properties-dialog.c	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/capplet/gsm-properties-dialog.c	2011-09-26 13:33:25.858956034 +0200
 @@ -35,6 +35,12 @@
  #include "gsm-util.h"
  #include "gsp-app.h"
@@ -349,7 +349,7 @@
  #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
  
  #define STARTUP_APP_ICON     "system-run"
-@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButt
+@@ -493,10 +500,64 @@
  }
  
  static void
@@ -415,11 +415,11 @@
  }
  
  static void
-Index: gnome-session-2.30.0/configure.in
-===================================================================
---- gnome-session-2.30.0.orig/configure.in	2010-04-13 22:43:50.193234971 +0200
-+++ gnome-session-2.30.0/configure.in	2010-04-13 22:45:09.773737032 +0200
-@@ -57,6 +57,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+Index: gnome-session-2.30.2/configure.in
+===================================================================
+--- gnome-session-2.30.2.orig/configure.in	2011-09-26 13:33:25.066965991 +0200
++++ gnome-session-2.30.2/configure.in	2011-09-26 13:33:25.862955984 +0200
+@@ -58,6 +58,7 @@
  PKG_CHECK_MODULES(SESSION_PROPERTIES,
          glib-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
@@ -427,11 +427,11 @@
  )
  
  PKG_CHECK_MODULES(SPLASH,
-Index: gnome-session-2.30.0/gnome-session/gsm-client.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-client.h	2010-04-13 22:43:47.561735927 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-client.h	2010-04-13 22:45:09.773737032 +0200
-@@ -92,6 +92,9 @@ struct _GsmClientClass
+Index: gnome-session-2.30.2/gnome-session/gsm-client.h
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-client.h	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-client.h	2011-09-26 13:33:25.862955984 +0200
+@@ -92,6 +92,9 @@
                                                                GError   **error);
          gboolean              (*impl_stop)                   (GsmClient *client,
                                                                GError   **error);
@@ -441,7 +441,7 @@
          GKeyFile *            (*impl_save)                   (GsmClient *client,
                                                                GError   **error);
  };
-@@ -137,6 +140,9 @@ gboolean              gsm_client_cancel_
+@@ -137,6 +140,9 @@
  
  void                  gsm_client_disconnected               (GsmClient  *client);
  
@@ -451,11 +451,11 @@
  GKeyFile             *gsm_client_save                       (GsmClient  *client,
                                                               GError    **error);
  /* exported to bus */
-Index: gnome-session-2.30.0/gnome-session/gsm-dbus-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-dbus-client.c	2010-04-13 22:43:47.549737125 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-dbus-client.c	2010-04-13 22:45:09.773737032 +0200
-@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *objec
+Index: gnome-session-2.30.2/gnome-session/gsm-dbus-client.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-dbus-client.c	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-dbus-client.c	2011-09-26 13:33:25.862955984 +0200
+@@ -413,6 +413,19 @@
          G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
  }
  
@@ -475,7 +475,7 @@
  static GKeyFile *
  dbus_client_save (GsmClient *client,
                    GError   **error)
-@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClien
+@@ -665,6 +678,7 @@
          object_class->set_property         = gsm_dbus_client_set_property;
          object_class->dispose              = gsm_dbus_client_dispose;
  
@@ -483,11 +483,11 @@
          client_class->impl_save                   = dbus_client_save;
          client_class->impl_stop                   = dbus_client_stop;
          client_class->impl_query_end_session      = dbus_client_query_end_session;
-Index: gnome-session-2.30.0/gnome-session/gsm-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-client.c	2010-04-13 22:43:47.537738813 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-client.c	2010-04-13 22:45:09.777736633 +0200
-@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
+Index: gnome-session-2.30.2/gnome-session/gsm-client.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-client.c	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-client.c	2011-09-26 13:33:25.862955984 +0200
+@@ -510,6 +510,16 @@
          g_signal_emit (client, signals[DISCONNECTED], 0);
  }
  
@@ -504,10 +504,10 @@
  GKeyFile *
  gsm_client_save (GsmClient *client,
                   GError   **error)
-Index: gnome-session-2.30.0/data/session-properties.ui
-===================================================================
---- gnome-session-2.30.0.orig/data/session-properties.ui	2010-04-13 22:43:47.461741519 +0200
-+++ gnome-session-2.30.0/data/session-properties.ui	2010-04-13 22:45:09.777736633 +0200
+Index: gnome-session-2.30.2/data/session-properties.ui
+===================================================================
+--- gnome-session-2.30.2.orig/data/session-properties.ui	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/data/session-properties.ui	2011-09-26 13:33:25.862955984 +0200
 @@ -148,6 +148,7 @@
              <property name="visible">True</property>
              <child>

Modified: desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch?rev=29747&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] Mon Sep 26 13:36:07 2011
@@ -3,11 +3,11 @@
 Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
 will not be attempted anyway.
 
-Index: gnome-session-2.28.0/gnome-session/gsm-manager.c
+Index: gnome-session-2.30.2/gnome-session/gsm-manager.c
 ===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-manager.c	2010-03-02 09:50:28.083214273 +0100
-+++ gnome-session-2.28.0/gnome-session/gsm-manager.c	2010-03-02 09:51:19.974714717 +0100
-@@ -424,7 +424,7 @@ gsm_manager_quit (GsmManager *manager)
+--- gnome-session-2.30.2.orig/gnome-session/gsm-manager.c	2011-09-26 13:33:25.854956084 +0200
++++ gnome-session-2.30.2/gnome-session/gsm-manager.c	2011-09-26 13:33:35.110839721 +0200
+@@ -420,7 +420,7 @@
                  g_signal_connect (consolekit,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
@@ -16,7 +16,7 @@
                  gsm_consolekit_attempt_restart (consolekit);
                  break;
          case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -439,7 +439,7 @@ gsm_manager_quit (GsmManager *manager)
+@@ -435,7 +435,7 @@
                  g_signal_connect (consolekit,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),




More information about the pkg-gnome-commits mailing list