[gnome-system-tools/users-ui-redesign] Remove all handling of policy widget and locked states

[Milan Bouchet-Valat <milanbv src gnome org>]

commit 21df19af7f3ada93d1aa6a5de9c26f3774ec25d0
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Sat Nov 28 16:09:40 2009 +0100

    Remove all handling of policy widget and locked states

 src/users/callbacks.c     |   52 ++++----------------------------------------
 src/users/main.c          |   22 -------------------
 src/users/user-settings.c |    3 +-
 src/users/users-table.c   |    9 +------
 src/users/users-table.h   |    1 -
 src/users/users-tool.c    |    3 --
 6 files changed, 8 insertions(+), 82 deletions(-)
---
diff --git a/src/users/callbacks.c b/src/users/callbacks.c
index ecc2ed5..c4d0874 100644
--- a/src/users/callbacks.c
+++ b/src/users/callbacks.c
@@ -37,50 +37,11 @@
 
 extern GstTool *tool;
 
-/* PolkitLockButton state has changed, reflect this in the UI */
-void
-on_lock_changed (GstDialog *dialog)
-{
-	GtkWidget *users_table;
-	GtkTreeModel *model, *store;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	OobsUser *self, *user;
-	gboolean valid;
-	gboolean is_authenticated;
-
-	users_table = gst_dialog_get_widget (dialog, "users_table");
-
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (users_table));
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (users_table));
-	store = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-
-	is_authenticated = gst_dialog_is_authenticated (tool->main_dialog);
-	self = oobs_self_config_get_user (OOBS_SELF_CONFIG (GST_USERS_TOOL (tool)->self_config));
-
-	valid = gtk_tree_model_get_iter_first (store, &iter);
-
-	while (valid) {
-		gtk_tree_model_get (store, &iter,
-				    COL_USER_OBJECT, &user,
-				    -1);
-
-		gtk_list_store_set (GTK_LIST_STORE (store), &iter,
-				    COL_USER_SENSITIVE, is_authenticated | (user == self),
-				    -1);
-
-		g_object_unref (user);
-		valid = gtk_tree_model_iter_next (store, &iter);
-	}
-
-	/* Update the status depending on the selected user */
-	on_table_selection_changed (selection, NULL);
-}
 
 /* Common stuff to users and groups tables */
 
 static void
-actions_set_sensitive (gint table, gint count, OobsUser *user)
+actions_set_sensitive (gint table, gint count)
 {
 	OobsObject *object = GST_USERS_TOOL (tool)->self_config;
 	gboolean sensitive;
@@ -93,9 +54,6 @@ actions_set_sensitive (gint table, gint count, OobsUser *user)
 		gst_dialog_try_set_sensitive (tool->main_dialog,
 					      gst_dialog_get_widget (tool->main_dialog, "user_delete"),
 					      (count > 0));
-
-		sensitive = count == 1 && gst_dialog_is_authenticated (tool->main_dialog)
-				       || (user == oobs_self_config_get_user (OOBS_SELF_CONFIG (object)));
 		break;
 	case TABLE_GROUPS:
 		gst_dialog_try_set_sensitive (tool->main_dialog,
@@ -132,7 +90,7 @@ on_table_selection_changed (GtkTreeSelection *selection, gpointer data)
 	if (!user)
 		return;
 
-	actions_set_sensitive (table, count, user);
+	actions_set_sensitive (table, count);
 
 	/* Show the settings for the selected user */
 	user_settings_set (user);
@@ -163,11 +121,11 @@ do_popup_menu (GtkTreeView *treeview, GdkEventButton *event)
 	ui_manager = g_object_get_data (G_OBJECT (treeview), "ui-manager");
 
 	gtk_widget_set_sensitive (gtk_ui_manager_get_widget (ui_manager, "/MainMenu/Add"),
-				  cont == 1 && (gst_dialog_is_authenticated (tool->main_dialog)));
+				  cont == 1);
 	gtk_widget_set_sensitive (gtk_ui_manager_get_widget (ui_manager, "/MainMenu/Properties"),
-				  cont == 1 && (gst_dialog_is_authenticated (tool->main_dialog)));
+				  cont == 1);
 	gtk_widget_set_sensitive (gtk_ui_manager_get_widget (ui_manager, "/MainMenu/Delete"),
-				  cont > 0 && gst_dialog_is_authenticated (tool->main_dialog));
+				  cont > 0);
 
 	gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
 			button, event_time);
diff --git a/src/users/main.c b/src/users/main.c
index 9d196a7..f877ae2 100644
--- a/src/users/main.c
+++ b/src/users/main.c
@@ -57,27 +57,6 @@ static GstDialogSignal signals[] = {
 	{ "groups_dialog_help",                 "clicked",              G_CALLBACK (on_groups_dialog_show_help) },
 	{ NULL }};
 
-const gchar *policy_widgets [] = {
-	"user_new",
-	"user_delete",
-	"groups_table",
-	"group_new",
-	"group_delete",
-	"group_settings",
-	"profile_new",
-	"profile_delete",
-	"profile_settings",
-	"user_passwd_no_check",
-	"user_privileges",
-	"user_settings_home",
-	"user_settings_shell",
-	"user_settings_uid",
-	"user_passwd_max",
-	"user_passwd_min",
-	"user_passwd_days",
-	"user_settings_group",
-	NULL
-};
 
 static void
 main_window_prepare (GstUsersTool *tool)
@@ -97,7 +76,6 @@ main (int argc, char *argv[])
 	gst_init_tool ("users-admin", argc, argv, NULL);
 	tool = GST_TOOL (gst_users_tool_new ());
 
-	gst_dialog_require_authentication_for_widgets (tool->main_dialog, policy_widgets);
 	gst_dialog_connect_signals (tool->main_dialog, signals);
 	main_window_prepare (GST_USERS_TOOL (tool));
 
diff --git a/src/users/user-settings.c b/src/users/user-settings.c
index 6c198f6..9b1ea71 100644
--- a/src/users/user-settings.c
+++ b/src/users/user-settings.c
@@ -494,8 +494,7 @@ user_settings_set (OobsUser *user)
 			gst_dialog_try_set_sensitive (tool->main_dialog, widget, FALSE);
 			gtk_widget_hide (notice);
 		}
-		else if (oobs_user_get_active (user) &&
-			 gst_dialog_is_authenticated (tool->main_dialog)) {
+		else if (oobs_user_get_active (user)) {
 			gst_dialog_try_set_sensitive (tool->main_dialog, widget, FALSE);
 			gtk_widget_show (notice);
 		}
diff --git a/src/users/users-table.c b/src/users/users-table.c
index b5b272d..ff51cb0 100644
--- a/src/users/users-table.c
+++ b/src/users/users-table.c
@@ -45,7 +45,6 @@ add_user_columns (GtkTreeView *treeview)
 	gtk_tree_view_column_pack_start (column, renderer, FALSE);
 	gtk_tree_view_column_set_attributes (column, renderer,
 					     "pixbuf", COL_USER_FACE,
-					     "sensitive", COL_USER_SENSITIVE,
 					     NULL);
 	g_object_set (G_OBJECT (renderer),
 		      "xpad", 3,
@@ -93,10 +92,9 @@ create_users_model (GstUsersTool *tool)
 	                            G_TYPE_STRING,
 	                            G_TYPE_STRING,
 				    G_TYPE_INT,
-				    G_TYPE_BOOLEAN,
+	                            G_TYPE_BOOLEAN,
 				    G_TYPE_OBJECT,
-				    OOBS_TYPE_LIST_ITER,
-				    G_TYPE_BOOLEAN);
+				    OOBS_TYPE_LIST_ITER);
 	filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
 
 	gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
@@ -155,8 +153,6 @@ users_table_set_user (OobsUser *user, OobsListIter *list_iter, GtkTreeIter *iter
 	name = oobs_user_get_full_name (user);
 	login = oobs_user_get_login_name (user);
 	label = g_strdup_printf ("<big><b>%s</b>\n<span color=\'dark grey\'><i>%s</i></span></big>", name, login);
-	sensitive = gst_dialog_is_authenticated (tool->main_dialog) ||
-	            (user == oobs_self_config_get_user (OOBS_SELF_CONFIG (object)));
 
 	gtk_list_store_set (GTK_LIST_STORE (model), iter,
 			    COL_USER_FACE, face,
@@ -167,7 +163,6 @@ users_table_set_user (OobsUser *user, OobsListIter *list_iter, GtkTreeIter *iter
 			    COL_USER_ID, oobs_user_get_uid (user),
 			    COL_USER_OBJECT, user,
 			    COL_USER_ITER, list_iter,
-			    COL_USER_SENSITIVE, sensitive,
 			    -1);
 	g_free (label);
 	if (face)
diff --git a/src/users/users-table.h b/src/users/users-table.h
index 0047b59..13f2f54 100644
--- a/src/users/users-table.h
+++ b/src/users/users-table.h
@@ -36,7 +36,6 @@ enum {
 	COL_USER_MEMBER, /* used in group members dialog */
 	COL_USER_OBJECT,
 	COL_USER_ITER,
-	COL_USER_SENSITIVE,
 	COL_USER_LAST
 };
 
diff --git a/src/users/users-tool.c b/src/users/users-tool.c
index 93cd208..94ceeda 100644
--- a/src/users/users-tool.c
+++ b/src/users/users-tool.c
@@ -105,9 +105,6 @@ gst_users_tool_constructor (GType                  type,
 	gst_conf_add_notify (GST_TOOL (tool), "showall",
 			     on_showall_changed, tool);
 
-	g_signal_connect (G_OBJECT (tool->main_dialog), "lock_changed",
-			  G_CALLBACK (on_lock_changed), NULL);
-
 	return object;
 }