← Back to branch summary

~ricotz/gdm/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/30_don_t_save_failsafe_session.patch

  • Committer: Rico Tzschichholz
  • Date: 2011-10-06 13:11:22 UTC
  • Revision ID: ricotz@t-online.de-20111006131122-u7ktmaf5klp7c8b7
* New upstream release
* debian/control.in:
  - Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
    gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
  - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev,
    libgdmsimplegreeter1, libgdmsimplegreeter-dev packages
* debian/patches:
  - Drop 00git_use_new_power_interface.patch,
    00git_xsession-errors_symlink.patch and 29_grep_path.patch
    which are upstream
  - refreshed as needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_don_t_save_failsafe_session.patch
2
2
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607703
3
3
Bug-Ubuntu: https://launchpad.net/bugs/509182
4
4
 
5
 
Index: gdm-3.0.0/daemon/gdm-session-direct.c
 
5
Index: gdm-3.1.2/daemon/gdm-session-direct.c
6
6
===================================================================
7
 
--- gdm-3.0.0.orig/daemon/gdm-session-direct.c  2011-06-07 11:15:40.317629201 +0200
8
 
+++ gdm-3.0.0/daemon/gdm-session-direct.c       2011-06-07 11:17:21.647629249 +0200
9
 
@@ -175,6 +175,32 @@
 
7
--- gdm-3.1.2.orig/daemon/gdm-session-direct.c
 
8
+++ gdm-3.1.2/daemon/gdm-session-direct.c
 
9
@@ -160,6 +160,32 @@
10
10
 }
11
11
 
12
12
 static void
13
 
+send_dbus_bool_signal (GdmSessionDirect *session,
 
13
+send_dbus_bool_signal (GdmSessionConversation *conversation,
14
14
+                       const char *name,
15
15
+                       const gboolean value)
16
16
+{
17
17
+        DBusMessage    *message;
18
18
+        DBusMessageIter iter;
19
19
+
20
 
+        g_return_if_fail (session != NULL);
 
20
+        g_return_if_fail (conversation != NULL);
21
21
+
22
22
+        message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
23
23
+                                           GDM_SESSION_DBUS_INTERFACE,
26
26
+        dbus_message_iter_init_append (message, &iter);
27
27
+        dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &value);
28
28
+
29
 
+        if (! send_dbus_message (session->priv->worker_connection, message)) {
 
29
+        if (! send_dbus_message (conversation, message)) {
30
30
+                g_debug ("GdmSessionDirect: Could not send %s signal",
31
31
+                         name ? name : "(null)");
32
32
+        }
36
36
+
37
37
+
38
38
+static void
39
 
 send_dbus_void_signal (GdmSessionDirect *session,
40
 
                        const char       *name)
41
 
 {
42
 
@@ -605,6 +631,61 @@
 
39
 send_dbus_string_signal (GdmSessionConversation *conversation,
 
40
                          const char *name,
 
41
                          const char *text)
 
42
@@ -667,6 +693,61 @@
43
43
         return res;
44
44
 }
45
45
 
101
101
 static const char *
102
102
 get_default_language_name (GdmSessionDirect *session)
103
103
 {
104
 
@@ -1373,6 +1454,9 @@
 
104
@@ -1439,6 +1520,9 @@
105
105
                                "    <signal name=\"SetSessionName\">\n"
106
106
                                "      <arg name=\"session_name\" type=\"s\"/>\n"
107
107
                                "    </signal>\n"
111
111
                                "    <signal name=\"StartProgram\">\n"
112
112
                                "      <arg name=\"command\" type=\"s\"/>\n"
113
113
                                "    </signal>\n"
114
 
@@ -1949,6 +2033,32 @@
 
114
@@ -2198,6 +2282,32 @@
115
115
         return get_default_session_name (session);
116
116
 }
117
117
 
144
144
 static char *
145
145
 get_session_command (GdmSessionDirect *session)
146
146
 {
147
 
@@ -2211,6 +2321,9 @@
 
147
@@ -2539,6 +2649,9 @@
148
148
 
149
 
         send_dbus_string_signal (impl, "SetSessionName",
150
 
                                  get_session_name (impl));
 
149
                 send_dbus_string_signal (conversation, "SetSessionName",
 
150
                                          get_session_name (impl));
151
151
+
152
 
+        send_dbus_bool_signal (impl, "SetIsFailsafe",
153
 
+                                 get_is_session_failsafe(impl));
 
152
+                send_dbus_bool_signal (conversation, "SetIsFailsafe",
 
153
+                                         get_is_session_failsafe(impl));
 
154
         }
154
155
 }
155
156
 
156
 
 static void
157
 
Index: gdm-3.0.0/daemon/gdm-session-settings.c
 
157
Index: gdm-3.1.2/daemon/gdm-session-settings.c
158
158
===================================================================
159
 
--- gdm-3.0.0.orig/daemon/gdm-session-settings.c        2011-04-04 16:37:16.000000000 +0200
160
 
+++ gdm-3.0.0/daemon/gdm-session-settings.c     2011-06-07 11:15:40.487629201 +0200
 
159
--- gdm-3.1.2.orig/daemon/gdm-session-settings.c
 
160
+++ gdm-3.1.2/daemon/gdm-session-settings.c
161
161
@@ -40,6 +40,7 @@
162
162
         ActUser *user;
163
163
         char *session_name;
260
260
 
261
261
         if (!act_user_is_loaded (user)) {
262
262
                 g_object_unref (user);
263
 
Index: gdm-3.0.0/daemon/gdm-session-settings.h
 
263
Index: gdm-3.1.2/daemon/gdm-session-settings.h
264
264
===================================================================
265
 
--- gdm-3.0.0.orig/daemon/gdm-session-settings.h        2011-04-04 16:37:16.000000000 +0200
266
 
+++ gdm-3.0.0/daemon/gdm-session-settings.h     2011-06-07 11:15:40.497629201 +0200
 
265
--- gdm-3.1.2.orig/daemon/gdm-session-settings.h
 
266
+++ gdm-3.1.2/daemon/gdm-session-settings.h
267
267
@@ -60,10 +60,13 @@
268
268
 gboolean            gdm_session_settings_is_loaded          (GdmSessionSettings  *settings);
269
269
 char               *gdm_session_settings_get_language_name  (GdmSessionSettings *settings);
278
278
 
279
279
 G_END_DECLS
280
280
 #endif /* GDM_SESSION_SETTINGS_H */
281
 
Index: gdm-3.0.0/daemon/gdm-session-worker.c
 
281
Index: gdm-3.1.2/daemon/gdm-session-worker.c
282
282
===================================================================
283
 
--- gdm-3.0.0.orig/daemon/gdm-session-worker.c  2011-04-04 16:37:16.000000000 +0200
284
 
+++ gdm-3.0.0/daemon/gdm-session-worker.c       2011-06-07 11:15:40.497629201 +0200
285
 
@@ -1899,6 +1899,14 @@
 
283
--- gdm-3.1.2.orig/daemon/gdm-session-worker.c
 
284
+++ gdm-3.1.2/daemon/gdm-session-worker.c
 
285
@@ -1912,6 +1912,14 @@
286
286
 }
287
287
 
288
288
 static void
297
297
 on_set_session_name (GdmSessionWorker *worker,
298
298
                      DBusMessage      *message)
299
299
 {
300
 
@@ -1921,6 +1929,28 @@
 
300
@@ -1934,6 +1942,28 @@
301
301
 }
302
302
 
303
303
 static void
326
326
 gdm_session_worker_set_language_name (GdmSessionWorker *worker,
327
327
                                       const char       *language_name)
328
328
 {
329
 
@@ -2552,6 +2582,8 @@
 
329
@@ -2592,6 +2622,8 @@
330
330
                 on_set_language_name (worker, message);
331
331
         } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) {
332
332
                 on_set_session_name (worker, message);