[gnome-system-tools] Remove cruft in users management

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

commit a3a984465cafc5c0605ffd7cf9307b7ed9178829
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Mon Jan 11 12:08:13 2010 +0100

    Remove cruft in users management
    
    In users table, COL_USER_ITER is not used anymore, remove it, and update functions that took an OobsListIter for parameter. on_user_settings_clicked() is also a remnant from the old UID, get rid of it.

 src/users/callbacks.c     |   91 ---------------------------------------------
 src/users/user-settings.c |    5 +--
 src/users/users-table.c   |    7 +--
 src/users/users-table.h   |    5 +--
 src/users/users-tool.c    |    2 +-
 5 files changed, 6 insertions(+), 104 deletions(-)
---
diff --git a/src/users/callbacks.c b/src/users/callbacks.c
index fb616ed..25d2261 100644
--- a/src/users/callbacks.c
+++ b/src/users/callbacks.c
@@ -191,8 +191,6 @@ on_popup_settings_activate (GtkAction *action, gpointer data)
 
 	if (table == TABLE_GROUPS)
 		on_group_settings_clicked (NULL, NULL);
-	else if (table == TABLE_USERS)
-		on_user_settings_clicked (NULL, NULL);
 }
 
 void
@@ -206,72 +204,6 @@ on_popup_delete_activate (GtkAction *action, gpointer data)
 		on_user_delete_clicked (NULL, NULL);
 }
 
-/* Users Tab */
-
-void
-on_user_settings_clicked (GtkButton *button, gpointer user_data)
-{
-	GtkWidget *table;
-	GtkTreePath *path;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	OobsUser *user;
-	OobsListIter *list_iter;
-
-	table = gst_dialog_get_widget (tool->main_dialog, "users_table");
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW (table));
-        gtk_tree_view_get_cursor (GTK_TREE_VIEW (table), &path, NULL);
-
-	if (!path)
-		return;
-
-	if (!gtk_tree_model_get_iter (model, &iter, path))
-		return;
-
-	gtk_tree_model_get (model, &iter,
-			    COL_USER_OBJECT, &user,
-			    COL_USER_ITER, &list_iter,
-			    -1);
-#if 0 /* FIXME: adapt this code to work when applying changes */
-	dialog = user_settings_dialog_new (user);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (tool->main_dialog));
-	response = user_settings_dialog_run (dialog);
-	g_object_unref (user);
-
-	if (response == GTK_RESPONSE_OK) {
-		gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-								  &filter_iter, &iter);
-		user = user_settings_dialog_get_data (dialog);
-
-		if (!user) /* Means an error has already occurred and been displayed, stop here */
-			return;
-
-		if (gst_dialog_is_authenticated (tool->main_dialog)) {
-			/* change users/groups configuration */
-			if (gst_tool_commit (tool, GST_USERS_TOOL (tool)->users_config) == OOBS_RESULT_OK) {
-				gst_tool_commit (tool, GST_USERS_TOOL (tool)->groups_config);
-				users_table_set_user (user, list_iter, &filter_iter);
-			}
-#ifdef HAVE_POLKIT
-		/* With PolicyKit1, we don't have to check for authorizations: just try to commit,
-		 * the backend will trigger authentication if possible, or fail */
-		} else {
-			OobsObject *object = GST_USERS_TOOL (tool)->self_config;
-
-			/* change self, only if it is the modified user */
-			if (user == oobs_self_config_get_user (OOBS_SELF_CONFIG (object)) &&
-			    gst_tool_commit (tool, GST_USERS_TOOL (tool)->self_config) == OOBS_RESULT_OK) {
-				gst_tool_commit (tool, GST_USERS_TOOL (tool)->groups_config);
-				users_table_set_user (user, list_iter, &filter_iter);
-			}
-#endif
-		}
-	}
-#endif
-
-	oobs_list_iter_free (list_iter);
-}
-
 void
 on_manage_groups_clicked (GtkWidget *widget, gpointer user_data)
 {
@@ -422,29 +354,6 @@ on_user_settings_passwd_toggled (GtkToggleButton *toggle, gpointer data)
 }
 
 void
-on_user_settings_login_changed (GtkEditable *editable,
-				gpointer     data)
-{
-	gchar *home, *base_dir;
-	GtkWidget *home_entry;
-
-	home_entry = gst_dialog_get_widget (tool->main_dialog, "user_settings_home");
-	base_dir = g_object_get_data (G_OBJECT (home_entry), "default-home");
-
-	if (!base_dir)
-		g_object_get (GST_USERS_TOOL (tool)->users_config,
-			      "default-home", &base_dir, NULL);
-
-	home = g_build_path (G_DIR_SEPARATOR_S,
-			     base_dir,
-			     gtk_entry_get_text (GTK_ENTRY (editable)),
-			     NULL);
-
-	gtk_entry_set_text (GTK_ENTRY (home_entry), home);
-	g_free (home);
-}
-
-void
 on_groups_dialog_show_help (GtkWidget *widget, gpointer data)
 {
 	GstDialog *dialog = GST_DIALOG (data);
diff --git a/src/users/user-settings.c b/src/users/user-settings.c
index a315f3f..10bb7a6 100644
--- a/src/users/user-settings.c
+++ b/src/users/user-settings.c
@@ -145,7 +145,6 @@ user_delete (GtkTreeModel *model, GtkTreePath *path)
 	GtkTreeIter iter;
 	OobsUsersConfig *config;
 	OobsUser *user;
-	OobsListIter *list_iter;
 	OobsResult result;
 	gboolean retval = FALSE;
 
@@ -154,7 +153,6 @@ user_delete (GtkTreeModel *model, GtkTreePath *path)
 
 	gtk_tree_model_get (model, &iter,
 			    COL_USER_OBJECT, &user,
-			    COL_USER_ITER, &list_iter,
 			    -1);
 
 	if (check_user_delete (user)) {
@@ -171,7 +169,6 @@ user_delete (GtkTreeModel *model, GtkTreePath *path)
 	}
 
 	g_object_unref (user);
-	oobs_list_iter_free (list_iter);
 
 	return retval;
 }
@@ -974,7 +971,7 @@ on_user_new (GtkButton *button, gpointer user_data)
 	result = oobs_users_config_add_user (users_config, user);
 	if (result == OOBS_RESULT_OK) {
 		gst_tool_commit (tool, GST_USERS_TOOL (tool)->groups_config);
-		user_path = users_table_add_user (user, NULL);
+		user_path = users_table_add_user (user);
 		users_table_select_path (user_path);
 		gtk_tree_path_free (user_path);
 
diff --git a/src/users/users-table.c b/src/users/users-table.c
index 998afd7..f39c5ff 100644
--- a/src/users/users-table.c
+++ b/src/users/users-table.c
@@ -147,7 +147,7 @@ create_users_table (GstUsersTool *tool)
 }
 
 void
-users_table_set_user (OobsUser *user, OobsListIter *list_iter, GtkTreeIter *iter)
+users_table_set_user (OobsUser *user, GtkTreeIter *iter)
 {
 	GtkWidget *users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table");
 	GtkTreeModel *filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (users_table));
@@ -170,7 +170,6 @@ users_table_set_user (OobsUser *user, OobsListIter *list_iter, GtkTreeIter *iter
 			    COL_USER_HOME, oobs_user_get_home_directory (user),
 			    COL_USER_ID, oobs_user_get_uid (user),
 			    COL_USER_OBJECT, user,
-			    COL_USER_ITER, list_iter,
 			    -1);
 	g_free (label);
 	if (face)
@@ -184,7 +183,7 @@ users_table_set_user (OobsUser *user, OobsListIter *list_iter, GtkTreeIter *iter
  * Returns: the path to the new item
  */
 GtkTreePath *
-users_table_add_user (OobsUser *user, OobsListIter *list_iter)
+users_table_add_user (OobsUser *user)
 {
 	GtkWidget *users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table");
 	GtkTreeModel *filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (users_table));
@@ -192,7 +191,7 @@ users_table_add_user (OobsUser *user, OobsListIter *list_iter)
 	GtkTreeIter iter;
 
 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-	users_table_set_user (user, list_iter, &iter);
+	users_table_set_user (user, &iter);
 
 	return gtk_tree_model_get_path (model, &iter);
 }
diff --git a/src/users/users-table.h b/src/users/users-table.h
index 13f2f54..5ae45d7 100644
--- a/src/users/users-table.h
+++ b/src/users/users-table.h
@@ -35,7 +35,6 @@ enum {
 	COL_USER_ID,
 	COL_USER_MEMBER, /* used in group members dialog */
 	COL_USER_OBJECT,
-	COL_USER_ITER,
 	COL_USER_LAST
 };
 
@@ -44,11 +43,9 @@ void         create_users_table	               (GstUsersTool *tool);
 void         users_table_clear                 (void);
 
 void         users_table_set_user              (OobsUser     *user,
-                                                OobsListIter *list_iter,
                                                 GtkTreeIter  *iter);
 
-GtkTreePath *users_table_add_user              (OobsUser     *user,
-                                                OobsListIter *list_iter);
+GtkTreePath *users_table_add_user              (OobsUser     *user);
 
 void         users_table_select_path           (GtkTreePath *path);
 
diff --git a/src/users/users-tool.c b/src/users/users-tool.c
index d543767..0678827 100644
--- a/src/users/users-tool.c
+++ b/src/users/users-tool.c
@@ -137,7 +137,7 @@ update_users (GstUsersTool *tool)
 
 	while (valid) {
 		user = oobs_list_get (list, &iter);
-		users_table_add_user (OOBS_USER (user), &iter);
+		users_table_add_user (OOBS_USER (user));
 
 		g_object_unref (user);
 		valid = oobs_list_iter_next (list, &iter);