r25090 - in /desktop/unstable/gdm3/debian: changelog patches/08_frequent-users_greeter.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Sep  5 21:54:11 2010
New Revision: 25090

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25090
Log:
08_frequent-users_greeter.patch: updated to not mark users as logged 
on if they are not logged on using GDM (e.g. console sessions).

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25090&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Sep  5 21:54:11 2010
@@ -14,6 +14,8 @@
     21_schemas_usr.patch, 24_show_user_other.patch: refreshed.
   * 14_bindv6only.patch, 25_xdmcpfill_length.patch, 
     26_xdmcpfill_length.patch: dropped, merged upstream.
+  * 08_frequent-users_greeter.patch: updated to not mark users as logged 
+    on if they are not logged on using GDM (e.g. console sessions).
   * 13_gdmsetup.patch: update gui/Makefile.am accordingly to upstream 
     changes.
   * 25_upower.patch: stolen from upstream git. Use directly upower-glib 

Modified: desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch?rev=25090&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch [utf-8] Sun Sep  5 21:54:11 2010
@@ -1,8 +1,55 @@
 Index: gdm-2.30.5/gui/simple-greeter/gdm-user-manager.c
 ===================================================================
---- gdm-2.30.5.orig/gui/simple-greeter/gdm-user-manager.c	2010-09-05 19:37:22.516370221 +0200
-+++ gdm-2.30.5/gui/simple-greeter/gdm-user-manager.c	2010-09-05 19:38:08.008370532 +0200
-@@ -1638,7 +1638,7 @@ load_ck_history (GdmUserManager *manager
+--- gdm-2.30.5.orig/gui/simple-greeter/gdm-user-manager.c	2010-09-05 21:59:25.088649662 +0200
++++ gdm-2.30.5/gui/simple-greeter/gdm-user-manager.c	2010-09-05 23:48:32.893144997 +0200
+@@ -275,8 +275,9 @@ activate_session_id (GdmUserManager *man
+ }
+ 
+ static gboolean
+-session_is_login_window (GdmUserManager *manager,
+-                         const char     *session_id)
++session_has_type (GdmUserManager *manager,
++                  const char     *session_id,
++                  const char     *request_type)
+ {
+         DBusGProxy      *proxy;
+         GError          *error;
+@@ -313,7 +314,7 @@ session_is_login_window (GdmUserManager
+                 goto out;
+         }
+ 
+-        if (session_type == NULL || session_type[0] == '\0' || strcmp (session_type, "LoginWindow") != 0) {
++        if (session_type == NULL || session_type[0] == '\0' || strcmp (session_type, request_type) != 0) {
+                 goto out;
+         }
+ 
+@@ -327,6 +328,13 @@ session_is_login_window (GdmUserManager
+         return ret;
+ }
+ 
++static gboolean
++session_is_login_window (GdmUserManager *manager,
++                         const char     *session_id)
++{
++        return session_has_type (manager, session_id, "LoginWindow");
++}
++
+ static char *
+ _get_login_window_session_id (GdmUserManager *manager)
+ {
+@@ -1058,6 +1066,11 @@ maybe_add_new_session (GdmUserManagerNew
+                 goto failed;
+         }
+ 
++        if (!session_has_type (manager, new_session->id, "gdm")) {
++                /* This is not a GDM session */
++                goto failed;
++        }
++
+         user = g_hash_table_lookup (manager->priv->users_by_name, pwent->pw_name);
+         if (user == NULL) {
+                 g_debug ("Creating new user");
+@@ -1638,7 +1651,7 @@ load_ck_history (GdmUserManager *manager
                  goto out;
          }
  
@@ -13,8 +60,8 @@
          error = NULL;
 Index: gdm-2.30.5/daemon/gdm-session-worker.c
 ===================================================================
---- gdm-2.30.5.orig/daemon/gdm-session-worker.c	2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-session-worker.c	2010-09-05 19:38:08.008370532 +0200
+--- gdm-2.30.5.orig/daemon/gdm-session-worker.c	2010-09-05 21:59:20.944645546 +0200
++++ gdm-2.30.5/daemon/gdm-session-worker.c	2010-09-05 21:59:25.188645546 +0200
 @@ -180,10 +180,13 @@ open_ck_session (GdmSessionWorker  *work
          const char     *display_name;
          const char     *display_device;