#! /bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/callbacks.c gnome-system-tools-2.20.0.new/src/users/callbacks.c
--- gnome-system-tools-2.20.0/src/users/callbacks.c	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/callbacks.c	2007-11-13 11:17:25.000000000 +0100
@@ -207,6 +207,9 @@
 		users_table_add_user (user, &list_iter);
 		oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
 		oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+		gst_tool_update_config (tool);
+		gst_tool_update_gui (tool);
 	}
 }
 
@@ -246,6 +249,9 @@
 		users_table_set_user (user, list_iter, &filter_iter);
 		oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
 		oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+		gst_tool_update_config (tool);
+		gst_tool_update_gui (tool);
 	}
 
 	g_object_unref (user);
@@ -274,6 +280,10 @@
 	g_list_free (list);
 
 	oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
+	oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+	gst_tool_update_config (tool);
+	gst_tool_update_gui (tool);
 }
 
 void
@@ -316,7 +326,11 @@
 		oobs_list_set (groups_list, &list_iter, group);
 
 		groups_table_add_group (group, &list_iter);
+		oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
 		oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+		gst_tool_update_config (tool);
+		gst_tool_update_gui (tool);
 	}
 }
 
@@ -356,7 +370,11 @@
 								  &filter_iter, &iter);
 		group_settings_dialog_get_data (group);
 		groups_table_set_group (group, list_iter, &filter_iter);
+		oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
 		oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+		gst_tool_update_config (tool);
+		gst_tool_update_gui (tool);
 	}
 
 	g_object_unref (group);
@@ -384,7 +402,11 @@
 	g_list_foreach (list, (GFunc) gtk_tree_row_reference_free, NULL);
 	g_list_free (list);
 
+	oobs_object_commit (GST_USERS_TOOL (tool)->users_config);
 	oobs_object_commit (GST_USERS_TOOL (tool)->groups_config);
+
+	gst_tool_update_config (tool);
+	gst_tool_update_gui (tool);
 }
 
 /* User settings callbacks */
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/privileges-table.c gnome-system-tools-2.20.0.new/src/users/privileges-table.c
--- gnome-system-tools-2.20.0/src/users/privileges-table.c	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/privileges-table.c	2007-11-13 11:17:33.000000000 +0100
@@ -80,7 +80,6 @@
 						       sizeof (PrivilegeDescription), compare_groups);
 }
 
-
 static void
 on_user_privilege_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
 {
@@ -261,3 +260,12 @@
 		valid = gtk_tree_model_iter_next (model, &iter);
 	}
 }
+
+void
+privileges_table_clear (void)
+{
+	GtkWidget *table = gst_dialog_get_widget (tool->main_dialog, "user_privileges");
+	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (table));
+
+	gtk_list_store_clear (GTK_LIST_STORE (model));
+}
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/privileges-table.h gnome-system-tools-2.20.0.new/src/users/privileges-table.h
--- gnome-system-tools-2.20.0/src/users/privileges-table.h	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/privileges-table.h	2007-11-13 11:17:32.000000000 +0100
@@ -24,11 +24,23 @@
 #ifndef __PRIVILEGES_TABLE_H
 #define __PRIVILEGES_TABLE_H
 
+#include "user-profiles.h"
+
 void     create_user_privileges_table      (void);
 void     create_profile_privileges_table   (void);
+void     privileges_table_clear            (void);
 
 void     populate_privileges_table         (GtkWidget*, gchar*);
 GList*   user_privileges_get_list          (GList*);
 
+void     privileges_table_add_group        (OobsGroup    *group,
+					    OobsListIter *list_iter);
+
+void     privileges_table_set_from_profile (GstUserProfile *profile);
+void     privileges_table_set_from_user    (OobsUser *user);
+
+void     privileges_table_save             (OobsUser *user);
+
+
 
 #endif /* __PRIVILEGES_TABLE_H */
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/users-table.c gnome-system-tools-2.20.0.new/src/users/users-table.c
--- gnome-system-tools-2.20.0/src/users/users-table.c	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/users-table.c	2007-11-13 11:17:41.000000000 +0100
@@ -194,3 +194,13 @@
 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 	users_table_set_user (user, list_iter, &iter);
 }
+
+void
+users_table_clear (void)
+{
+	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));
+	GtkTreeModel *model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+
+	gtk_list_store_clear (GTK_LIST_STORE (model));
+}
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/users-table.h gnome-system-tools-2.20.0.new/src/users/users-table.h
--- gnome-system-tools-2.20.0/src/users/users-table.h	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/users-table.h	2007-11-13 11:17:43.000000000 +0100
@@ -39,6 +39,7 @@
 };
 
 void	create_users_table	(GstUsersTool *tool);
+void    users_table_clear       (void);
 void    users_table_set_user    (OobsUser     *user,
 				 OobsListIter *list_iter,
 				 GtkTreeIter  *iter);
diff -Nur -x '*.orig' -x '*~' gnome-system-tools-2.20.0/src/users/users-tool.c gnome-system-tools-2.20.0.new/src/users/users-tool.c
--- gnome-system-tools-2.20.0/src/users/users-tool.c	2007-09-14 11:25:27.000000000 +0200
+++ gnome-system-tools-2.20.0.new/src/users/users-tool.c	2007-11-13 11:17:51.000000000 +0100
@@ -132,6 +132,7 @@
 	GObject *user;
 	gboolean valid;
 
+	users_table_clear ();
 	list = oobs_users_config_get_users (OOBS_USERS_CONFIG (tool->users_config));
 
 	valid = oobs_list_get_iter_first (list, &iter);
@@ -153,6 +154,7 @@
 	GObject *group;
 	gboolean valid;
 
+	privileges_table_clear ();
 	list = oobs_groups_config_get_groups (OOBS_GROUPS_CONFIG (tool->groups_config));
 
 	valid = oobs_list_get_iter_first (list, &iter);