r1699: Formatting update, bugfixes

(This used to be commit d13d2068313680ade2c2fb986b6a5ea8ed8f2aef)

1 files changed, 179 insertions, 180 deletions

diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index a8cf3f2a45..2ca6363a6d 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -41,7 +41,7 @@ void update_userlist(void)
 	int i;
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
-	
+
 	if(!sam_pipe) return;
 
 	mem_ctx = talloc_init("update_userlist");
@@ -66,35 +66,35 @@ void update_userlist(void)
 	for (i=0;i<r.out.sam->count;i++) {
 		printf("Found: %s\n", r.out.sam->entries[i].name.name);
 		/* FIXME: Query user info */
-		
-//		if (!test_OpenUser(sam_pipe, mem_ctx, &sam_handle, r.out.sam->entries[i].idx)) {
-//			ret = False;
-//		}
+
+		//		if (!test_OpenUser(sam_pipe, mem_ctx, &sam_handle, r.out.sam->entries[i].idx)) {
+		//			ret = False;
+		//		}
 	}
 	talloc_destroy(mem_ctx);
 }
 
 void
 on_new1_activate                       (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 
 }
 
 void
 on_select_domain_activate                       (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+												 gpointer         user_data)
 {
 	GtkSelectDomainDialog *d;
 	gint result;
 	d = gtk_select_domain_dialog_new(sam_pipe);
 	result = gtk_dialog_run(GTK_DIALOG(d));
 	switch(result) {
-		case GTK_RESPONSE_ACCEPT:
+	case GTK_RESPONSE_ACCEPT:
 		break;
-		default:
-			gtk_widget_destroy(GTK_WIDGET(d));
-			return;
+	default:
+		gtk_widget_destroy(GTK_WIDGET(d));
+		return;
 	}
 	domain_handle = gtk_select_domain_dialog_get_handle(d);
 	gtk_widget_destroy(GTK_WIDGET(d));
@@ -104,18 +104,18 @@ void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	GtkRpcBindingDialog *d;
 	NTSTATUS status;
-        struct samr_Connect r;
+	struct samr_Connect r;
 	TALLOC_CTX *mem_ctx;
 	gint result;
 
 	d = GTK_RPC_BINDING_DIALOG(gtk_rpc_binding_dialog_new(FALSE));
 	result = gtk_dialog_run(GTK_DIALOG(d));
 	switch(result) {
-		case GTK_RESPONSE_ACCEPT:
-			break;
-		default:
-			gtk_widget_destroy(GTK_WIDGET(d));
-			return;
+	case GTK_RESPONSE_ACCEPT:
+		break;
+	default:
+		gtk_widget_destroy(GTK_WIDGET(d));
+		return;
 	}
 
 	/* If connected, get list of jobs */
@@ -127,19 +127,19 @@ void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
 		return;
 	}
 
-    	r.in.system_name = 0;
-        r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-        r.out.handle = &sam_handle;
-                            
+	r.in.system_name = 0;
+	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+	r.out.handle = &sam_handle;
+
 	mem_ctx = talloc_init("connect");                                                                                                 
-        status = dcerpc_samr_Connect(sam_pipe, mem_ctx, &r);
+	status = dcerpc_samr_Connect(sam_pipe, mem_ctx, &r);
 	talloc_destroy(mem_ctx);
-        if (!NT_STATUS_IS_OK(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(mainwin, status);
 		sam_pipe = NULL;
 		gtk_widget_destroy(GTK_WIDGET(d));
 		return;
-        }
+	}
 
 	gtk_widget_destroy(GTK_WIDGET(d));
 
@@ -149,7 +149,7 @@ void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
 
 void
 on_quit_activate                      (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+									   gpointer         user_data)
 {
 	if(sam_pipe)dcerpc_pipe_close(sam_pipe);
 	gtk_main_quit();
@@ -158,7 +158,7 @@ on_quit_activate                      (GtkMenuItem     *menuitem,
 
 void
 on_account_activate                    (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 	//FIXME
 }
@@ -166,7 +166,7 @@ on_account_activate                    (GtkMenuItem     *menuitem,
 
 void
 on_user_rights_activate                (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 	//FIXME
 }
@@ -174,7 +174,7 @@ on_user_rights_activate                (GtkMenuItem     *menuitem,
 
 void
 on_audit_activate                      (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 	//FIXME
 }
@@ -182,7 +182,7 @@ on_audit_activate                      (GtkMenuItem     *menuitem,
 
 void
 on_trust_relations_activate            (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 	//FIXME
 }
@@ -190,7 +190,7 @@ on_trust_relations_activate            (GtkMenuItem     *menuitem,
 
 void
 on_refresh_activate                    (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+										gpointer         user_data)
 {
 	update_userlist();
 	update_grouplist();
@@ -199,14 +199,14 @@ on_refresh_activate                    (GtkMenuItem     *menuitem,
 
 void
 on_about_activate                     (GtkMenuItem     *menuitem,
-		gpointer         user_data)
+									   gpointer         user_data)
 {
 	GtkDialog *aboutwin = GTK_DIALOG(create_gtk_samba_about_dialog("gwsam"));
 	gtk_dialog_run(aboutwin);
 	gtk_widget_destroy(GTK_WIDGET(aboutwin));
 }
 
-	GtkWidget*
+GtkWidget*
 create_mainwindow (void)
 {
 	GtkWidget *mainwin;
@@ -243,168 +243,167 @@ create_mainwindow (void)
 	GtkWidget *user_list;
 	GtkWidget *scrolledwindow2;
 	GtkWidget *group_list;
-  GtkWidget *statusbar;
-  GtkAccelGroup *accel_group;
+	GtkWidget *statusbar;
+	GtkAccelGroup *accel_group;
 
-  accel_group = gtk_accel_group_new ();
+	accel_group = gtk_accel_group_new ();
 
-  mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_default_size (GTK_WINDOW (mainwin), 642, 562);
-  gtk_window_set_title (GTK_WINDOW (mainwin), "User Manager");
+	mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size (GTK_WINDOW (mainwin), 642, 562);
+	gtk_window_set_title (GTK_WINDOW (mainwin), "User Manager");
 
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox1);
-  gtk_container_add (GTK_CONTAINER (mainwin), vbox1);
+	vbox1 = gtk_vbox_new (FALSE, 0);
+	gtk_widget_show (vbox1);
+	gtk_container_add (GTK_CONTAINER (mainwin), vbox1);
 
-  menubar = gtk_menu_bar_new ();
-  gtk_widget_show (menubar);
-  gtk_box_pack_start (GTK_BOX (vbox1), menubar, FALSE, FALSE, 0);
+	menubar = gtk_menu_bar_new ();
+	gtk_widget_show (menubar);
+	gtk_box_pack_start (GTK_BOX (vbox1), menubar, FALSE, FALSE, 0);
 
-  menuitem1 = gtk_menu_item_new_with_mnemonic ("_User");
-  gtk_widget_show (menuitem1);
-  gtk_container_add (GTK_CONTAINER (menubar), menuitem1);
+	menuitem1 = gtk_menu_item_new_with_mnemonic ("_User");
+	gtk_widget_show (menuitem1);
+	gtk_container_add (GTK_CONTAINER (menubar), menuitem1);
 
-  menuitem1_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu);
+	menuitem1_menu = gtk_menu_new ();
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu);
 
-  new1 = gtk_image_menu_item_new_from_stock ("gtk-new", accel_group);
-  gtk_widget_show (new1);
-  gtk_container_add (GTK_CONTAINER (menuitem1_menu), new1);
-
-  connect = gtk_menu_item_new_with_mnemonic ("_Connect");
-  gtk_widget_show (connect);
-  gtk_container_add (GTK_CONTAINER (menuitem1_menu), connect);
-
-  seldomain = gtk_menu_item_new_with_mnemonic("_Select Domain");
-  gtk_widget_show(seldomain);
-  gtk_container_add (GTK_CONTAINER (menuitem1_menu), seldomain);
-
-  separatormenuitem1 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separatormenuitem1);
-  gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1);
-  gtk_widget_set_sensitive (separatormenuitem1, FALSE);
-
-  quit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
-  gtk_widget_show (quit);
-  gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit);
-
-  policies = gtk_menu_item_new_with_mnemonic ("_Policies");
-  gtk_widget_show (policies);
-  gtk_container_add (GTK_CONTAINER (menubar), policies);
-
-  policies_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (policies), policies_menu);
-
-  account = gtk_menu_item_new_with_mnemonic ("_Account...");
-  gtk_widget_show (account);
-  gtk_container_add (GTK_CONTAINER (policies_menu), account);
-
-  user_rights = gtk_menu_item_new_with_mnemonic ("_User Rights...");
-  gtk_widget_show (user_rights);
-  gtk_container_add (GTK_CONTAINER (policies_menu), user_rights);
-
-  audit = gtk_menu_item_new_with_mnemonic ("A_udit...");
-  gtk_widget_show (audit);
-  gtk_container_add (GTK_CONTAINER (policies_menu), audit);
-
-  separator1 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator1);
-  gtk_container_add (GTK_CONTAINER (policies_menu), separator1);
-  gtk_widget_set_sensitive (separator1, FALSE);
-
-  trust_relations = gtk_menu_item_new_with_mnemonic ("_Trust relations");
-  gtk_widget_show (trust_relations);
-  gtk_container_add (GTK_CONTAINER (policies_menu), trust_relations);
-
-  menuitem3 = gtk_menu_item_new_with_mnemonic ("_View");
-  gtk_widget_show (menuitem3);
-  gtk_container_add (GTK_CONTAINER (menubar), menuitem3);
-
-  menuitem3_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem3), menuitem3_menu);
-
-  refresh = gtk_image_menu_item_new_from_stock ("gtk-refresh", accel_group);
-  gtk_widget_show (refresh);
-  gtk_container_add (GTK_CONTAINER (menuitem3_menu), refresh);
-
-  menuitem4 = gtk_menu_item_new_with_mnemonic ("_Help");
-  gtk_widget_show (menuitem4);
-  gtk_container_add (GTK_CONTAINER (menubar), menuitem4);
-
-  menuitem4_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu);
-
-  about = gtk_menu_item_new_with_mnemonic ("_About");
-  gtk_widget_show (about);
-  gtk_container_add (GTK_CONTAINER (menuitem4_menu), about);
-
-  vpaned = gtk_vpaned_new ();
-  gtk_widget_show (vpaned);
-  gtk_box_pack_start (GTK_BOX (vbox1), vpaned, TRUE, TRUE, 0);
-
-  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow1);
-  gtk_paned_pack1 (GTK_PANED (vpaned), scrolledwindow1, FALSE, TRUE);
-
-  user_list = gtk_tree_view_new ();
-  gtk_widget_show (user_list);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow1), user_list);
-
-  scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow2);
-  gtk_paned_pack2 (GTK_PANED (vpaned), scrolledwindow2, TRUE, TRUE);
-
-  group_list = gtk_tree_view_new ();
-  gtk_widget_show (group_list);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow2), group_list);
-
-  statusbar = gtk_statusbar_new ();
-  gtk_widget_show (statusbar);
-  gtk_box_pack_start (GTK_BOX (vbox1), statusbar, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) new1, "activate",
-                    G_CALLBACK (on_new1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) seldomain, "activate",
-                    G_CALLBACK (on_select_domain_activate),
-                    NULL);
-  g_signal_connect ((gpointer) connect, "activate",
-                    G_CALLBACK (on_connect_activate),
-                    NULL);
-  g_signal_connect ((gpointer) quit, "activate",
-                    G_CALLBACK (on_quit_activate),
-                    NULL);
-  g_signal_connect ((gpointer) account, "activate",
-                    G_CALLBACK (on_account_activate),
-                    NULL);
-  g_signal_connect ((gpointer) user_rights, "activate",
-                    G_CALLBACK (on_user_rights_activate),
-                    NULL);
-  g_signal_connect ((gpointer) audit, "activate",
-                    G_CALLBACK (on_audit_activate),
-                    NULL);
-  g_signal_connect ((gpointer) trust_relations, "activate",
-                    G_CALLBACK (on_trust_relations_activate),
-                    NULL);
-  g_signal_connect ((gpointer) refresh, "activate",
-                    G_CALLBACK (on_refresh_activate),
-                    NULL);
-  g_signal_connect ((gpointer) about, "activate",
-                    G_CALLBACK (on_about_activate),
-                    NULL);
-
-  gtk_window_add_accel_group (GTK_WINDOW (mainwin), accel_group);
-
-  return mainwin;
+	new1 = gtk_image_menu_item_new_from_stock ("gtk-new", accel_group);
+	gtk_widget_show (new1);
+	gtk_container_add (GTK_CONTAINER (menuitem1_menu), new1);
+
+	connect = gtk_menu_item_new_with_mnemonic ("_Connect");
+	gtk_widget_show (connect);
+	gtk_container_add (GTK_CONTAINER (menuitem1_menu), connect);
+
+	seldomain = gtk_menu_item_new_with_mnemonic("_Select Domain");
+	gtk_widget_show(seldomain);
+	gtk_container_add (GTK_CONTAINER (menuitem1_menu), seldomain);
+
+	separatormenuitem1 = gtk_separator_menu_item_new ();
+	gtk_widget_show (separatormenuitem1);
+	gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1);
+	gtk_widget_set_sensitive (separatormenuitem1, FALSE);
+
+	quit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
+	gtk_widget_show (quit);
+	gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit);
+
+	policies = gtk_menu_item_new_with_mnemonic ("_Policies");
+	gtk_widget_show (policies);
+	gtk_container_add (GTK_CONTAINER (menubar), policies);
+
+	policies_menu = gtk_menu_new ();
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (policies), policies_menu);
+
+	account = gtk_menu_item_new_with_mnemonic ("_Account...");
+	gtk_widget_show (account);
+	gtk_container_add (GTK_CONTAINER (policies_menu), account);
+
+	user_rights = gtk_menu_item_new_with_mnemonic ("_User Rights...");
+	gtk_widget_show (user_rights);
+	gtk_container_add (GTK_CONTAINER (policies_menu), user_rights);
+
+	audit = gtk_menu_item_new_with_mnemonic ("A_udit...");
+	gtk_widget_show (audit);
+	gtk_container_add (GTK_CONTAINER (policies_menu), audit);
+
+	separator1 = gtk_separator_menu_item_new ();
+	gtk_widget_show (separator1);
+	gtk_container_add (GTK_CONTAINER (policies_menu), separator1);
+	gtk_widget_set_sensitive (separator1, FALSE);
+
+	trust_relations = gtk_menu_item_new_with_mnemonic ("_Trust relations");
+	gtk_widget_show (trust_relations);
+	gtk_container_add (GTK_CONTAINER (policies_menu), trust_relations);
+
+	menuitem3 = gtk_menu_item_new_with_mnemonic ("_View");
+	gtk_widget_show (menuitem3);
+	gtk_container_add (GTK_CONTAINER (menubar), menuitem3);
+
+	menuitem3_menu = gtk_menu_new ();
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem3), menuitem3_menu);
+
+	refresh = gtk_image_menu_item_new_from_stock ("gtk-refresh", accel_group);
+	gtk_widget_show (refresh);
+	gtk_container_add (GTK_CONTAINER (menuitem3_menu), refresh);
+
+	menuitem4 = gtk_menu_item_new_with_mnemonic ("_Help");
+	gtk_widget_show (menuitem4);
+	gtk_container_add (GTK_CONTAINER (menubar), menuitem4);
+
+	menuitem4_menu = gtk_menu_new ();
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu);
+
+	about = gtk_menu_item_new_with_mnemonic ("_About");
+	gtk_widget_show (about);
+	gtk_container_add (GTK_CONTAINER (menuitem4_menu), about);
+
+	vpaned = gtk_vpaned_new ();
+	gtk_widget_show (vpaned);
+	gtk_box_pack_start (GTK_BOX (vbox1), vpaned, TRUE, TRUE, 0);
+
+	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+	gtk_widget_show (scrolledwindow1);
+	gtk_paned_pack1 (GTK_PANED (vpaned), scrolledwindow1, FALSE, TRUE);
+
+	user_list = gtk_tree_view_new ();
+	gtk_widget_show (user_list);
+	gtk_container_add (GTK_CONTAINER (scrolledwindow1), user_list);
+
+	scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
+	gtk_widget_show (scrolledwindow2);
+	gtk_paned_pack2 (GTK_PANED (vpaned), scrolledwindow2, TRUE, TRUE);
+
+	group_list = gtk_tree_view_new ();
+	gtk_widget_show (group_list);
+	gtk_container_add (GTK_CONTAINER (scrolledwindow2), group_list);
+
+	statusbar = gtk_statusbar_new ();
+	gtk_widget_show (statusbar);
+	gtk_box_pack_start (GTK_BOX (vbox1), statusbar, FALSE, FALSE, 0);
+
+	g_signal_connect ((gpointer) new1, "activate",
+					  G_CALLBACK (on_new1_activate),
+					  NULL);
+	g_signal_connect ((gpointer) seldomain, "activate",
+					  G_CALLBACK (on_select_domain_activate),
+					  NULL);
+	g_signal_connect ((gpointer) connect, "activate",
+					  G_CALLBACK (on_connect_activate),
+					  NULL);
+	g_signal_connect ((gpointer) quit, "activate",
+					  G_CALLBACK (on_quit_activate),
+					  NULL);
+	g_signal_connect ((gpointer) account, "activate",
+					  G_CALLBACK (on_account_activate),
+					  NULL);
+	g_signal_connect ((gpointer) user_rights, "activate",
+					  G_CALLBACK (on_user_rights_activate),
+					  NULL);
+	g_signal_connect ((gpointer) audit, "activate",
+					  G_CALLBACK (on_audit_activate),
+					  NULL);
+	g_signal_connect ((gpointer) trust_relations, "activate",
+					  G_CALLBACK (on_trust_relations_activate),
+					  NULL);
+	g_signal_connect ((gpointer) refresh, "activate",
+					  G_CALLBACK (on_refresh_activate),
+					  NULL);
+	g_signal_connect ((gpointer) about, "activate",
+					  G_CALLBACK (on_about_activate),
+					  NULL);
+
+	gtk_window_add_accel_group (GTK_WINDOW (mainwin), accel_group);
+
+	return mainwin;
 }
 
 
 
- int main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	gtk_init(&argc, &argv);
 	mainwin = create_mainwindow();
 	gtk_widget_show(mainwin);
 	gtk_main();
 }
-