~gnome3-team/gdm/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/29_switch_user.patch

  • Committer: Robert Ancell
  • Date: 2011-04-08 06:42:13 UTC
  • Revision ID: robert.ancell@canonical.com-20110408064213-yox738b5g12v1j1c
Tags: 2.32.1-0ubuntu1
releasing version 2.32.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
Subject: [PATCH] Add SwitchToUser() method which automatically selects that user in the greeter or switches to an already open session
5
5
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606923
6
6
 
7
 
Index: gdm-2.32.0/daemon/gdm-display.c
 
7
Index: gdm-2.32.1/daemon/gdm-display.c
8
8
===================================================================
9
 
--- gdm-2.32.0.orig/daemon/gdm-display.c        2010-08-27 16:54:37.000000000 +0200
10
 
+++ gdm-2.32.0/daemon/gdm-display.c     2010-12-07 15:21:14.997502001 +0100
 
9
--- gdm-2.32.1.orig/daemon/gdm-display.c        2011-02-18 14:27:53.000000000 +1100
 
10
+++ gdm-2.32.1/daemon/gdm-display.c     2011-04-08 16:33:17.011921338 +1000
11
11
@@ -60,6 +60,7 @@
12
12
         time_t                creation_time;
13
13
         GTimer               *slave_timer;
94
94
                                          PROP_STATUS,
95
95
                                          g_param_spec_int ("status",
96
96
                                                            "status",
97
 
Index: gdm-2.32.0/daemon/gdm-greeter-server.c
 
97
Index: gdm-2.32.1/daemon/gdm-greeter-server.c
98
98
===================================================================
99
 
--- gdm-2.32.0.orig/daemon/gdm-greeter-server.c 2010-09-15 20:58:10.000000000 +0200
100
 
+++ gdm-2.32.0/daemon/gdm-greeter-server.c      2010-12-07 15:21:14.997502001 +0100
 
99
--- gdm-2.32.1.orig/daemon/gdm-greeter-server.c 2011-03-29 03:48:50.000000000 +1100
 
100
+++ gdm-2.32.1/daemon/gdm-greeter-server.c      2011-04-08 16:33:17.011921338 +1000
101
101
@@ -289,6 +289,14 @@
102
102
 }
103
103
 
132
132
                                          PROP_USER_NAME,
133
133
                                          g_param_spec_string ("user-name",
134
134
                                                               "user name",
135
 
Index: gdm-2.32.0/daemon/gdm-greeter-server.h
 
135
Index: gdm-2.32.1/daemon/gdm-greeter-server.h
136
136
===================================================================
137
 
--- gdm-2.32.0.orig/daemon/gdm-greeter-server.h 2010-09-15 20:58:10.000000000 +0200
138
 
+++ gdm-2.32.0/daemon/gdm-greeter-server.h      2010-12-07 15:21:14.997502001 +0100
 
137
--- gdm-2.32.1.orig/daemon/gdm-greeter-server.h 2011-03-29 03:48:50.000000000 +1100
 
138
+++ gdm-2.32.1/daemon/gdm-greeter-server.h      2011-04-08 16:33:17.011921338 +1000
139
139
@@ -96,6 +96,8 @@
140
140
 void                gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server,
141
141
                                                                      const char       *text);
145
145
 void                gdm_greeter_server_request_timed_login   (GdmGreeterServer *greeter_server,
146
146
                                                               const char       *username,
147
147
                                                               int               delay);
148
 
Index: gdm-2.32.0/daemon/gdm-local-display-factory.c
 
148
Index: gdm-2.32.1/daemon/gdm-local-display-factory.c
149
149
===================================================================
150
 
--- gdm-2.32.0.orig/daemon/gdm-local-display-factory.c  2010-12-07 15:19:56.807502001 +0100
151
 
+++ gdm-2.32.0/daemon/gdm-local-display-factory.c       2010-12-07 15:21:14.997502001 +0100
 
150
--- gdm-2.32.1.orig/daemon/gdm-local-display-factory.c  2011-04-08 16:32:13.671921308 +1000
 
151
+++ gdm-2.32.1/daemon/gdm-local-display-factory.c       2011-04-08 16:33:17.011921338 +1000
152
152
@@ -496,6 +496,121 @@
153
153
         }
154
154
 }
271
271
 gboolean
272
272
 gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory,
273
273
                                                   const char             *parent_display_id,
274
 
Index: gdm-2.32.0/daemon/gdm-local-display-factory.h
 
274
Index: gdm-2.32.1/daemon/gdm-local-display-factory.h
275
275
===================================================================
276
 
--- gdm-2.32.0.orig/daemon/gdm-local-display-factory.h  2010-12-07 15:19:56.807502001 +0100
277
 
+++ gdm-2.32.0/daemon/gdm-local-display-factory.h       2010-12-07 15:21:14.997502001 +0100
 
276
--- gdm-2.32.1.orig/daemon/gdm-local-display-factory.h  2011-04-08 16:32:13.671921308 +1000
 
277
+++ gdm-2.32.1/daemon/gdm-local-display-factory.h       2011-04-08 16:33:17.011921338 +1000
278
278
@@ -64,6 +64,10 @@
279
279
 gboolean                   gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *factory,
280
280
                                                                                char                  **id,
286
286
 
287
287
 gboolean                   gdm_local_display_factory_start_guest_session       (GdmLocalDisplayFactory *factory,
288
288
                                                                                 const char             *current_user_session,
289
 
Index: gdm-2.32.0/daemon/gdm-local-display-factory.xml
 
289
Index: gdm-2.32.1/daemon/gdm-local-display-factory.xml
290
290
===================================================================
291
 
--- gdm-2.32.0.orig/daemon/gdm-local-display-factory.xml        2010-12-07 15:19:56.807502001 +0100
292
 
+++ gdm-2.32.0/daemon/gdm-local-display-factory.xml     2010-12-07 15:21:14.997502001 +0100
 
291
--- gdm-2.32.1.orig/daemon/gdm-local-display-factory.xml        2011-04-08 16:32:13.671921308 +1000
 
292
+++ gdm-2.32.1/daemon/gdm-local-display-factory.xml     2011-04-08 16:33:17.011921338 +1000
293
293
@@ -13,5 +13,9 @@
294
294
       <arg name="current_user_session" direction="in" type="s"/>
295
295
       <arg name="id" direction="out" type="o"/>
300
300
+    </method>
301
301
   </interface>
302
302
 </node>
303
 
Index: gdm-2.32.0/daemon/gdm-simple-slave.c
 
303
Index: gdm-2.32.1/daemon/gdm-simple-slave.c
304
304
===================================================================
305
 
--- gdm-2.32.0.orig/daemon/gdm-simple-slave.c   2010-12-07 15:21:10.877502001 +0100
306
 
+++ gdm-2.32.0/daemon/gdm-simple-slave.c        2010-12-07 15:21:15.007502001 +0100
307
 
@@ -85,10 +85,13 @@
308
 
         guint              start_session_when_ready : 1;
309
 
         guint              waiting_to_start_session : 1;
 
305
--- gdm-2.32.1.orig/daemon/gdm-simple-slave.c   2011-04-08 16:33:12.701921336 +1000
 
306
+++ gdm-2.32.1/daemon/gdm-simple-slave.c        2011-04-08 16:33:17.011921338 +1000
 
307
@@ -92,10 +92,13 @@
 
308
         gboolean           use_logindevperm;
 
309
 #endif
310
310
         guint              plymouth_is_running : 1;
311
311
+  
312
312
+        gchar             *username;
318
318
 };
319
319
 
320
320
 static void     gdm_simple_slave_class_init     (GdmSimpleSlaveClass *klass);
321
 
@@ -555,6 +558,16 @@
 
321
@@ -626,6 +629,16 @@
322
322
 }
323
323
 
324
324
 static void
335
335
 on_session_conversation_started (GdmSession     *session,
336
336
                                  GdmSimpleSlave *slave)
337
337
 {
338
 
@@ -571,6 +584,19 @@
 
338
@@ -642,6 +655,19 @@
339
339
                 }
340
340
         }
341
341
 
355
355
         enabled = FALSE;
356
356
         gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
357
357
         if (! enabled) {
358
 
@@ -1383,7 +1409,14 @@
 
358
@@ -1469,7 +1495,14 @@
359
359
                                const GValue *value,
360
360
                                GParamSpec   *pspec)
361
361
 {
370
370
         default:
371
371
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
372
372
                 break;
373
 
@@ -1396,7 +1429,14 @@
 
373
@@ -1482,7 +1515,14 @@
374
374
                                GValue      *value,
375
375
                                GParamSpec *pspec)
376
376
 {
385
385
         default:
386
386
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
387
387
                 break;
388
 
@@ -1433,6 +1473,14 @@
 
388
@@ -1519,6 +1559,14 @@
389
389
 
390
390
         g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate));
391
391
 
400
400
         dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info);
401
401
 }
402
402
 
403
 
@@ -1465,12 +1513,13 @@
 
403
@@ -1554,12 +1602,13 @@
404
404
 }
405
405
 
406
406
 GdmSlave *
415
415
                                NULL);
416
416
 
417
417
         return GDM_SLAVE (object);
418
 
Index: gdm-2.32.0/daemon/gdm-simple-slave.h
 
418
Index: gdm-2.32.1/daemon/gdm-simple-slave.h
419
419
===================================================================
420
 
--- gdm-2.32.0.orig/daemon/gdm-simple-slave.h   2010-08-27 16:54:37.000000000 +0200
421
 
+++ gdm-2.32.0/daemon/gdm-simple-slave.h        2010-12-07 15:21:15.007502001 +0100
 
420
--- gdm-2.32.1.orig/daemon/gdm-simple-slave.h   2011-02-18 14:27:53.000000000 +1100
 
421
+++ gdm-2.32.1/daemon/gdm-simple-slave.h        2011-04-08 16:33:17.011921338 +1000
422
422
@@ -48,7 +48,8 @@
423
423
 } GdmSimpleSlaveClass;
424
424
 
429
429
 
430
430
 G_END_DECLS
431
431
 
432
 
Index: gdm-2.32.0/daemon/simple-slave-main.c
 
432
Index: gdm-2.32.1/daemon/simple-slave-main.c
433
433
===================================================================
434
 
--- gdm-2.32.0.orig/daemon/simple-slave-main.c  2010-12-07 15:19:56.787502001 +0100
435
 
+++ gdm-2.32.0/daemon/simple-slave-main.c       2010-12-07 15:21:15.007502001 +0100
 
434
--- gdm-2.32.1.orig/daemon/simple-slave-main.c  2011-04-08 16:32:12.881921306 +1000
 
435
+++ gdm-2.32.1/daemon/simple-slave-main.c       2011-04-08 16:33:17.011921338 +1000
436
436
@@ -45,6 +45,7 @@
437
437
 #include "gdm-common.h"
438
438
 #include "gdm-simple-slave.h"
462
462
         if (slave == NULL) {
463
463
                 goto out;
464
464
         }
465
 
Index: gdm-2.32.0/data/gdm.conf.in
 
465
Index: gdm-2.32.1/data/gdm.conf.in
466
466
===================================================================
467
 
--- gdm-2.32.0.orig/data/gdm.conf.in    2010-12-07 15:19:56.887502001 +0100
468
 
+++ gdm-2.32.0/data/gdm.conf.in 2010-12-07 15:21:15.007502001 +0100
 
467
--- gdm-2.32.1.orig/data/gdm.conf.in    2011-04-08 16:32:15.051921308 +1000
 
468
+++ gdm-2.32.1/data/gdm.conf.in 2011-04-08 16:33:17.011921338 +1000
469
469
@@ -74,6 +74,9 @@
470
470
            send_member="CreateTransientDisplay"/>
471
471
     <allow send_destination="org.gnome.DisplayManager"
476
476
            send_member="StartGuestSession"/>
477
477
           
478
478
     <allow send_destination="org.gnome.DisplayManager"
479
 
Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-client.c
 
479
Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.c
480
480
===================================================================
481
 
--- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-client.c     2010-09-15 20:58:11.000000000 +0200
482
 
+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-client.c  2010-12-07 15:21:15.007502001 +0100
 
481
--- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-client.c     2011-03-29 03:48:50.000000000 +1100
 
482
+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.c  2011-04-08 16:33:17.011921338 +1000
483
483
@@ -70,6 +70,7 @@
484
484
         DEFAULT_LANGUAGE_NAME_CHANGED,
485
485
         DEFAULT_LAYOUT_NAME_CHANGED,
530
530
                               G_TYPE_NONE,
531
531
                               1, G_TYPE_STRING);
532
532
 
533
 
Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-client.h
 
533
Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.h
534
534
===================================================================
535
 
--- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-client.h     2010-09-15 20:58:11.000000000 +0200
536
 
+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-client.h  2010-12-07 15:21:15.007502001 +0100
 
535
--- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-client.h     2011-03-29 03:48:50.000000000 +1100
 
536
+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.h  2011-04-08 16:33:17.011921338 +1000
537
537
@@ -67,6 +67,8 @@
538
538
                                                 const char        *language_name);
539
539
         void (* default_layout_name_changed) (GdmGreeterClient  *client,
543
543
         void (* timed_login_requested)   (GdmGreeterClient  *client,
544
544
                                           const char        *username,
545
545
                                           int                delay);
546
 
Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.c
 
546
Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c
547
547
===================================================================
548
 
--- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-login-window.c       2010-09-15 20:58:52.000000000 +0200
549
 
+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.c    2010-12-07 15:21:15.017502001 +0100
 
548
--- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-login-window.c       2011-04-08 16:31:51.291921296 +1000
 
549
+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c    2011-04-08 16:33:17.011921338 +1000
550
550
@@ -128,6 +128,8 @@
551
551
 
552
552
         guint            login_button_handler_id;
556
556
 };
557
557
 
558
558
 enum {
559
 
@@ -793,6 +795,24 @@
 
559
@@ -795,6 +797,24 @@
560
560
         login_window->priv->timed_login_already_enabled = TRUE;
561
561
 }
562
562
 
581
581
 void
582
582
 gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
583
583
                                               const char            *username,
584
 
@@ -1007,6 +1027,10 @@
 
584
@@ -1009,6 +1029,10 @@
585
585
 
586
586
         if (!login_window->priv->user_list_disabled) {
587
587
                 gtk_widget_show (login_window->priv->user_chooser);
592
592
         }
593
593
 
594
594
         if (login_window->priv->timed_login_username != NULL
595
 
Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.h
 
595
Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h
596
596
===================================================================
597
 
--- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-login-window.h       2010-09-15 20:58:11.000000000 +0200
598
 
+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.h    2010-12-07 15:21:15.017502001 +0100
 
597
--- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-login-window.h       2011-03-29 03:48:50.000000000 +1100
 
598
+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h    2011-04-08 16:33:17.011921338 +1000
599
599
@@ -77,6 +77,8 @@
600
600
 gboolean            gdm_greeter_login_window_problem            (GdmGreeterLoginWindow *login_window,
601
601
                                                                  const char *text);
605
605
 void               gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
606
606
                                                                  const char            *username,
607
607
                                                                  int                    delay);
608
 
Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-session.c
 
608
Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c
609
609
===================================================================
610
 
--- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-session.c    2010-12-07 15:19:56.757502001 +0100
611
 
+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-session.c 2010-12-07 15:21:15.017502001 +0100
 
610
--- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-session.c    2011-04-08 16:32:10.791921306 +1000
 
611
+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c 2011-04-08 16:33:17.011921338 +1000
612
612
@@ -182,6 +182,15 @@
613
613
 }
614
614