Hello community, here is the log from the commit of package lightdm-gtk-greeter for openSUSE:13.1 checked in at 2013-10-02 20:30:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/lightdm-gtk-greeter (Old) and /work/SRC/openSUSE:13.1/.lightdm-gtk-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm-gtk-greeter" Changes: -------- --- /work/SRC/openSUSE:13.1/lightdm-gtk-greeter/lightdm-gtk-greeter.changes 2013-09-23 10:59:23.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.lightdm-gtk-greeter.new/lightdm-gtk-greeter.changes 2013-10-02 20:30:25.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 14:19:42 UTC 2013 - gber@opensuse.org + +- add lightdm-gtk-greeter-fix-login.patch in order to fix + login/unlock detection + +------------------------------------------------------------------- New: ---- lightdm-gtk-greeter-fix-login.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm-gtk-greeter.spec ++++++ --- /var/tmp/diff_new_pack.4R9AFd/_old 2013-10-02 20:30:25.000000000 +0200 +++ /var/tmp/diff_new_pack.4R9AFd/_new 2013-10-02 20:30:25.000000000 +0200 @@ -35,6 +35,8 @@ Patch3: lightdm-gtk-greeter-improve-background-scaling.patch # PATCH-FEATURE-UPSTREAM lightdm-gtk-greeter-fix-ui.patch gber@opensuse.org -- Various usability fixes, in particular switch back to a tree view inside a scrolled window in order make it usable with a lot of users Patch4: lightdm-gtk-greeter-fix-ui.patch +# PATCH-FIX-UPSTREAM lightdm-gtk-greeter-fix-login.patch gber@opensuse.org -- Fix login/unlock detection +Patch5: lightdm-gtk-greeter-fix-login.patch BuildRequires: gnome-common BuildRequires: gobject-introspection BuildRequires: intltool @@ -79,6 +81,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build autoreconf -fi ++++++ lightdm-gtk-greeter-fix-login.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -146,14 +146,14 @@ set_message_label (const gchar *text) } static void -set_login_button_label (const gchar *username) +set_login_button_label (LightDMGreeter *greeter, const gchar *username) { LightDMUser *user; gboolean logged_in = FALSE; user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); - /* Show 'Unlock' instead of 'Login' for an already logged in user */ - logged_in = user && lightdm_user_get_logged_in (user); + if (user && lightdm_greeter_get_lock_hint (greeter)) + logged_in = lightdm_user_get_logged_in (user); if (logged_in) gtk_button_set_label (login_button, _("Unlock")); else @@ -292,10 +292,10 @@ start_session (void) g_free (session); } -void user_treeview_selection_changed_cb (GtkTreeSelection *selection); +void user_treeview_selection_changed_cb (GtkTreeSelection *selection, LightDMGreeter *greeter); G_MODULE_EXPORT void -user_treeview_selection_changed_cb (GtkTreeSelection *selection) +user_treeview_selection_changed_cb (GtkTreeSelection *selection, LightDMGreeter *greeter) { GtkTreeModel *model; GtkTreeIter iter; @@ -311,7 +311,7 @@ user_treeview_selection_changed_cb (GtkT else gtk_widget_hide (GTK_WIDGET (cancel_button)); - set_login_button_label (user); + set_login_button_label (greeter, user); start_authentication (user); g_free (user); } @@ -474,18 +474,22 @@ shutdown_cb (GtkWidget *widget, LightDMG } static void -user_added_cb (LightDMUserList *user_list, LightDMUser *user) +user_added_cb (LightDMUserList *user_list, LightDMUser *user, LightDMGreeter *greeter) { GtkTreeModel *model; GtkTreeIter iter; + gboolean logged_in = FALSE; model = gtk_tree_view_get_model (user_view); + if (lightdm_greeter_get_lock_hint (greeter)) + logged_in = lightdm_user_get_logged_in (user); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, lightdm_user_get_name (user), 1, lightdm_user_get_display_name (user), - 2, lightdm_user_get_logged_in (user) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + 2, logged_in ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); } @@ -514,19 +518,23 @@ get_user_iter (const gchar *username, Gt } static void -user_changed_cb (LightDMUserList *user_list, LightDMUser *user) +user_changed_cb (LightDMUserList *user_list, LightDMUser *user, LightDMGreeter *greeter) { GtkTreeModel *model; GtkTreeIter iter; + gboolean logged_in = FALSE; if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; + if (lightdm_greeter_get_lock_hint (greeter)) + logged_in = lightdm_user_get_logged_in (user); + model = gtk_tree_view_get_model (user_view); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, lightdm_user_get_name (user), 1, lightdm_user_get_display_name (user), - 2, lightdm_user_get_logged_in (user) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + 2, logged_in ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); } @@ -606,9 +614,10 @@ load_user_list () GtkTreeIter iter; gchar *last_user; const gchar *selected_user; + gboolean logged_in = FALSE; - g_signal_connect (lightdm_user_list_get_instance (), "user-added", G_CALLBACK (user_added_cb), NULL); - g_signal_connect (lightdm_user_list_get_instance (), "user-changed", G_CALLBACK (user_changed_cb), NULL); + g_signal_connect (lightdm_user_list_get_instance (), "user-added", G_CALLBACK (user_added_cb), greeter); + g_signal_connect (lightdm_user_list_get_instance (), "user-changed", G_CALLBACK (user_changed_cb), greeter); g_signal_connect (lightdm_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), NULL); model = gtk_tree_view_get_model (user_view); @@ -616,12 +625,14 @@ load_user_list () for (item = items; item; item = item->next) { LightDMUser *user = item->data; + if (lightdm_greeter_get_lock_hint (greeter)) + logged_in = lightdm_user_get_logged_in (user); gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, lightdm_user_get_name (user), 1, lightdm_user_get_display_name (user), - 2, lightdm_user_get_logged_in (user) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + 2, logged_in ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); } if (lightdm_greeter_get_has_guest_account_hint (greeter)) @@ -664,7 +675,7 @@ load_user_list () if (matched) { gtk_tree_selection_select_iter (gtk_tree_view_get_selection (user_view), &iter); - set_login_button_label (selected_user); + set_login_button_label (greeter, selected_user); start_authentication (selected_user); break; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org