r25191 - in /desktop/unstable/gdm3/debian: changelog patches/13_gdmsetup.patch

Thu Sep 23 20:58:39 UTC 2010

Author: lethalman-guest
Date: Thu Sep 23 20:58:38 2010
New Revision: 25191

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25191
Log:
  * 13_gdmsetup.patch: refresh and fix user-manager loading according
    to upstream changes.


Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25191&op=diff
==============================================================================

--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Thu Sep 23 20:58:38 2010
@@ -1,9 +1,14 @@
 gdm3 (2.30.5-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * pt_BR.po: new Brazilian Portuguese translation by Sérgio Cipolla.
     Closes: #597669.
 
- -- Josselin Mouette <joss at debian.org>  Wed, 22 Sep 2010 09:38:44 +0200
+  [ Luca Bruno ]
+  * 13_gdmsetup.patch: refresh and fix user-manager loading according
+    to upstream changes.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Thu, 23 Sep 2010 22:55:13 +0200
 
 gdm3 (2.30.5-2) unstable; urgency=low
 

Modified: desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch?rev=25191&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Thu Sep 23 20:58:38 2010
@@ -12,11 +12,9 @@
 # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=587750
 #
-Index: gdm-2.30.5/configure.ac
-===================================================================
---- gdm-2.30.5.orig/configure.ac	2010-09-05 21:59:30.960650360 +0200
-+++ gdm-2.30.5/configure.ac	2010-09-05 22:12:24.384647214 +0200
-@@ -41,6 +41,7 @@ dnl ------------------------------------
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,6 +41,7 @@
  
  DBUS_GLIB_REQUIRED_VERSION=0.74
  POLKIT_GOBJECT_REQUIRED_VERSION=0.92
@@ -24,7 +22,7 @@
  GLIB_REQUIRED_VERSION=2.22.0
  GTK_REQUIRED_VERSION=2.12.0
  PANGO_REQUIRED_VERSION=1.3.0
-@@ -118,6 +119,14 @@ AC_SUBST(HAVE_DEVICEKIT_POWER)
+@@ -118,6 +119,14 @@
  AC_SUBST(DEVKIT_POWER_CFLAGS)
  AC_SUBST(DEVKIT_POWER_LIBS)
  
@@ -39,7 +37,7 @@
  PKG_CHECK_MODULES(SIMPLE_GREETER,
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
          gtk+-2.0 >= $GTK_REQUIRED_VERSION
-@@ -1396,6 +1405,7 @@ Makefile
+@@ -1396,6 +1405,7 @@
  daemon/Makefile
  docs/Makefile
  gui/Makefile
@@ -47,11 +45,9 @@
  gui/simple-greeter/Makefile
  gui/simple-greeter/libnotificationarea/Makefile
  gui/simple-chooser/Makefile
-Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c	2010-09-05 22:12:23.528645184 +0200
-@@ -0,0 +1,370 @@
+--- /dev/null
++++ b/gui/gdmsetup/gdmsetup.c
+@@ -0,0 +1,371 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 +#endif
@@ -308,7 +304,7 @@
 +
 +
 +static void
-+users_loaded_cb(GdmUserManager *manager)
++manager_loaded_cb(GdmUserManager *manager)
 +{
 +    GSList *users, *item;
 +
@@ -410,8 +406,9 @@
 +    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "text", 0);
 +
 +    user_manager = gdm_user_manager_ref_default ();
-+    g_signal_connect (user_manager, "users-loaded", G_CALLBACK (users_loaded_cb), NULL);
++    g_signal_connect (user_manager, "notify::is-loaded", G_CALLBACK (manager_loaded_cb), NULL);
 +    g_signal_connect (user_manager, "user-added", G_CALLBACK (user_added_cb), NULL);
++    gdm_user_manager_queue_load (user_manager);
 +
 +    gtk_widget_hide (user_entry);
 +
@@ -422,10 +419,8 @@
 +
 +    return 0;
 +}
-Index: gdm-2.30.5/gui/gdmsetup/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/gui/gdmsetup/Makefile.am	2010-09-05 21:59:59.973145728 +0200
+--- /dev/null
++++ b/gui/gdmsetup/Makefile.am
 @@ -0,0 +1,42 @@
 +NULL =
 +
@@ -469,11 +464,9 @@
 +	$(ui_DATA)		\
 +	$(System_in_files)	\
 +	$(NULL)
-Index: gdm-2.30.5/gui/Makefile.am
-===================================================================
---- gdm-2.30.5.orig/gui/Makefile.am	2010-09-05 21:59:30.888648755 +0200
-+++ gdm-2.30.5/gui/Makefile.am	2010-09-05 22:12:39.824647593 +0200
-@@ -3,6 +3,7 @@ NULL =
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -3,6 +3,7 @@
  SUBDIRS =			\
  	simple-greeter		\
  	user-switch-applet	\
@@ -481,17 +474,15 @@
  	$(NULL)
  
  if XDMCP_SUPPORT
-@@ -13,4 +14,5 @@ DIST_SUBDIRS =			\
+@@ -13,4 +14,5 @@
  	simple-chooser		\
  	simple-greeter		\
  	user-switch-applet	\
 +	gdmsetup		\
  	$(NULL)
-Index: gdm-2.30.5/po/POTFILES.in
-===================================================================
---- gdm-2.30.5.orig/po/POTFILES.in	2010-09-05 21:59:30.856649996 +0200
-+++ gdm-2.30.5/po/POTFILES.in	2010-09-05 21:59:59.973145728 +0200
-@@ -60,6 +60,9 @@ data/greeter-autostart/gok.desktop.in
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -60,6 +60,9 @@
  data/greeter-autostart/metacity.desktop.in
  data/greeter-autostart/orca-screen-reader.desktop.in
  data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in


