r9772: Make credentials callbacks more consistant with the abstraction

[samba.git] / source / gtk / common / select.c

diff --git a/source/gtk/common/select.c b/source/gtk/common/select.c
index ad7b0ca1dbe4d2a954f889075d2b85d2e1d4004a..61b9649657cb6c40c7a084de5435a3475b67ad31 100644 (file)
--- a/source/gtk/common/select.c
+++ b/source/gtk/common/select.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
-#include "gtk-smb.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "gtk/common/select.h"
+#include "gtk/common/gtk-smb.h"
 
 /* GtkSelectDomainDialog */
 
@@ -29,7 +31,7 @@ const char *gtk_select_domain_dialog_get_domain(GtkSelectDomainDialog *d)
        return gtk_entry_get_text(GTK_ENTRY(d->entry_domain));
 }
 
-void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
+static void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
 {
        GtkWidget *dialog_vbox1;
        GtkWidget *hbox1;
@@ -44,26 +46,20 @@ void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
        gtk_window_set_title (GTK_WINDOW (select_domain_dialog), "Select Domain");
 
        dialog_vbox1 = GTK_DIALOG (select_domain_dialog)->vbox;
-       gtk_widget_show (dialog_vbox1);
 
        hbox1 = gtk_hbox_new (FALSE, 0);
-       gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox1, TRUE, TRUE, 0);
 
        label1 = gtk_label_new ("Domain:");
-       gtk_widget_show (label1);
        gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0);
 
        select_domain_dialog->entry_domain = gtk_entry_new ();
-       gtk_widget_show (select_domain_dialog->entry_domain);
        gtk_box_pack_start (GTK_BOX (hbox1), select_domain_dialog->entry_domain, TRUE, TRUE, 0);
 
        scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_show (scrolledwindow1);
        gtk_box_pack_start (GTK_BOX (dialog_vbox1), scrolledwindow1, TRUE, TRUE, 0);
 
        select_domain_dialog->list_domains = gtk_tree_view_new ();
-       gtk_widget_show (select_domain_dialog->list_domains);
        gtk_container_add (GTK_CONTAINER (scrolledwindow1), select_domain_dialog->list_domains);
 
        curcol = gtk_tree_view_column_new ();
@@ -78,17 +74,15 @@ void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
        g_object_unref(select_domain_dialog->store_domains);
 
        dialog_action_area1 = GTK_DIALOG (select_domain_dialog)->action_area;
-       gtk_widget_show (dialog_action_area1);
        gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
 
        cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-       gtk_widget_show (cancelbutton1);
        gtk_dialog_add_action_widget (GTK_DIALOG (select_domain_dialog), cancelbutton1, GTK_RESPONSE_CANCEL);
        GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
 
        okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-       gtk_widget_show (okbutton1);
        gtk_dialog_add_action_widget (GTK_DIALOG (select_domain_dialog), okbutton1, GTK_RESPONSE_OK);
+       gtk_widget_show_all(dialog_vbox1);
        GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
 }
 
@@ -129,7 +123,7 @@ GType gtk_select_domain_dialog_get_type (void)
                                                                                                                              
 GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe)
 {
-       GtkSelectDomainDialog *d = gtk_type_new (gtk_select_domain_dialog_get_type ());
+       GtkSelectDomainDialog *d = g_object_new(gtk_select_domain_dialog_get_type (), NULL);
        NTSTATUS status;
        struct samr_EnumDomains r;
        struct samr_Connect cr;
@@ -142,30 +136,29 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe)
        d->sam_pipe = sam_pipe;
 
        cr.in.system_name = 0;
-       cr.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       cr.out.handle = &handle;
+       cr.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       cr.out.connect_handle = &handle;
 
        status = dcerpc_samr_Connect(sam_pipe, mem_ctx, &cr);
        if (!NT_STATUS_IS_OK(status)) {
-               gtk_show_ntstatus(NULL, status);
-               talloc_destroy(mem_ctx);
+               gtk_show_ntstatus(NULL, "Running Connect on SAMR", status);
+               talloc_free(mem_ctx);
                return GTK_WIDGET(d);
        }
 
-       r.in.handle = &handle;
+       r.in.connect_handle = &handle;
        r.in.resume_handle = &resume_handle;
        r.in.buf_size = (uint32_t)-1;
        r.out.resume_handle = &resume_handle;
 
        status = dcerpc_samr_EnumDomains(sam_pipe, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               gtk_show_ntstatus(NULL, status);
+               gtk_show_ntstatus(NULL, "Enumerating domains", status);
        } else if (r.out.sam) {
                for (i=0;i<r.out.sam->count;i++) {
                        GtkTreeIter iter;
-                       printf("- %s\n", r.out.sam->entries[i].name.name);
                        gtk_list_store_append(d->store_domains, &iter);
-                       gtk_list_store_set (d->store_domains, &iter, 0, r.out.sam->entries[i].name.name, -1);
+                       gtk_list_store_set (d->store_domains, &iter, 0, r.out.sam->entries[i].name.string, -1);
                }
        }
 
@@ -174,12 +167,12 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe)
 
        status = dcerpc_samr_Close(sam_pipe, mem_ctx, &dr);
        if (!NT_STATUS_IS_OK(status)) {
-               gtk_show_ntstatus(NULL, status);
-               talloc_destroy(mem_ctx);
+               gtk_show_ntstatus(NULL, "Closing SAMR connection", status);
+               talloc_free(mem_ctx);
                return GTK_WIDGET ( d );
        }
 
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
 
        return GTK_WIDGET ( d );
 }
@@ -191,12 +184,11 @@ const char *gtk_select_host_dialog_get_host (GtkSelectHostDialog *d)
        return gtk_entry_get_text(GTK_ENTRY(d->entry_host));
 }
 
-void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
+static void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
 {
        GtkWidget *dialog_vbox2;
        GtkWidget *hbox2;
        GtkWidget *label2;
-       GtkWidget *entry_host;
        GtkWidget *scrolledwindow2;
        GtkWidget *dialog_action_area2;
        GtkWidget *cancelbutton2;
@@ -205,26 +197,20 @@ void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
        gtk_window_set_title (GTK_WINDOW (select_host_dialog), "Select Host");
 
        dialog_vbox2 = GTK_DIALOG (select_host_dialog)->vbox;
-       gtk_widget_show (dialog_vbox2);
 
        hbox2 = gtk_hbox_new (FALSE, 0);
-       gtk_widget_show (hbox2);
        gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox2, TRUE, TRUE, 0);
 
        label2 = gtk_label_new ("Host");
-       gtk_widget_show (label2);
        gtk_box_pack_start (GTK_BOX (hbox2), label2, FALSE, FALSE, 0);
 
        select_host_dialog->entry_host = gtk_entry_new ();
-       gtk_widget_show (select_host_dialog->entry_host);
        gtk_box_pack_start (GTK_BOX (hbox2), select_host_dialog->entry_host, TRUE, TRUE, 0);
 
        scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_show (scrolledwindow2);
        gtk_box_pack_start (GTK_BOX (dialog_vbox2), scrolledwindow2, TRUE, TRUE, 0);
 
        select_host_dialog->tree_host = gtk_tree_view_new ();
-       gtk_widget_show (select_host_dialog->tree_host);
        gtk_container_add (GTK_CONTAINER (scrolledwindow2), select_host_dialog->tree_host);
 
        select_host_dialog->store_host = gtk_tree_store_new(1, G_TYPE_STRING);
@@ -232,16 +218,14 @@ void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
        g_object_unref(select_host_dialog->store_host); 
 
        dialog_action_area2 = GTK_DIALOG (select_host_dialog)->action_area;
-       gtk_widget_show (dialog_action_area2);
        gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END);
 
        cancelbutton2 = gtk_button_new_from_stock ("gtk-cancel");
-       gtk_widget_show (cancelbutton2);
        gtk_dialog_add_action_widget (GTK_DIALOG (select_host_dialog), cancelbutton2, GTK_RESPONSE_CANCEL);
        GTK_WIDGET_SET_FLAGS (cancelbutton2, GTK_CAN_DEFAULT);
 
        okbutton2 = gtk_button_new_from_stock ("gtk-ok");
-       gtk_widget_show (okbutton2);
+       gtk_widget_show_all (dialog_vbox2);
        gtk_dialog_add_action_widget (GTK_DIALOG (select_host_dialog), okbutton2, GTK_RESPONSE_OK);
        GTK_WIDGET_SET_FLAGS (okbutton2, GTK_CAN_DEFAULT);
 }
@@ -272,7 +256,7 @@ GType gtk_select_host_dialog_get_type (void)
        return mytype;
 }
                                                                                                                              
-GtkWidget *gtk_select_host_dialog_new (BOOL nocredentials)
+GtkWidget *gtk_select_host_dialog_new (struct dcerpc_pipe *sam_pipe)
 {
-        return GTK_WIDGET ( gtk_type_new (gtk_select_host_dialog_get_type ()));
+        return GTK_WIDGET ( g_object_new (gtk_select_host_dialog_get_type (), NULL ));
 }