Merge lp:~thomas-noel/fast-user-switch-applet/never-even-max-users into lp:~ted/fast-user-switch-applet/max-users

[Thomas NOEL]

[Thomas NOEL (thomas-noel)]

When a system is network managed with libnss-mysql or ldap, it is common to
have 200 users or more...

But for such a system, if I want to set "/apps/fusa/show_screen_item" to
"never" (do not show "Switch User"), it doesn't work because we are in a
"password_overload" case.

So my proposition is to modify the function reset_login_screen_item() in
src/applet.c : it checks if "show_screen_item=never" first.

[Jean Christophe André (progfou)]

I second this... It's important to be able to switch this functionnality off when required!

Unmerged revisions

473. By Thomas NOEL <thomas@thomas-pc> on 2009-05-05

show_screen_item : "never" should precede "always"

=== modified file 'src/applet.c'
--- src/applet.c	2008-10-31 19:55:16 +0000
+++ src/applet.c	2009-05-05 18:09:00 +0000
@@ -1946,11 +1946,12 @@
 			 const gchar *pref_value,
 			 FusaManager * manager)
 {
-  if (!pref_value || strcmp (pref_value, "always") == 0 || fusa_manager_get_passwd_overload(manager))
+  if (pref_value && strcmp (pref_value, "never") == 0)
+    gtk_widget_hide (widget);
+  else if (!pref_value || strcmp (pref_value, "always") == 0 ||
+           fusa_manager_get_passwd_overload(manager))
     gtk_widget_show (widget);
-  else if (pref_value && strcmp (pref_value, "never") == 0)
-    gtk_widget_hide (widget);
-  else if (use_xnest_value)
+  else if (use_xnest_value) /* "auto" */
     gtk_widget_hide (widget);
   else
     gtk_widget_show (widget);