Author: jelmer
Date: 2004-10-24 17:34:48 +0000 (Sun, 24 Oct 2004)
New Revision: 3166
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/gtk&rev=3166&nolog=1
Log:
Bunch of small GUI updates. gwcrontab works again, as does selecting a
domain in gwsam
Modified:
branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
branches/SAMBA_4_0/source/gtk/tools/gwsam.c
Changeset:
Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-10-24 17:06:35 UTC (rev 3165)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-10-24 17:34:48 UTC (rev 3166)
@@ -109,6 +109,13 @@
gtk_widget_show (vbox6);
gtk_container_add (GTK_CONTAINER (frame_transport), vbox6);
+ gtk_rpc_binding_dialog->transport_ncalrpc = gtk_radio_button_new_with_mnemonic (NULL, "Local Host");
+ gtk_widget_show (gtk_rpc_binding_dialog->transport_ncalrpc);
+ gtk_box_pack_start (GTK_BOX (vbox6), gtk_rpc_binding_dialog->transport_ncalrpc, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_ncalrpc), transport_smb_group);
+ transport_smb_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_ncalrpc));
+
+
gtk_rpc_binding_dialog->transport_smb = gtk_radio_button_new_with_mnemonic (NULL, "RPC over SMB over TCP/IP");
gtk_widget_show (gtk_rpc_binding_dialog->transport_smb);
gtk_box_pack_start (GTK_BOX (vbox6), gtk_rpc_binding_dialog->transport_smb, FALSE, FALSE, 0);
@@ -122,15 +129,7 @@
gtk_radio_button_set_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_tcp_ip), transport_smb_group);
transport_smb_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_tcp_ip));
- gtk_rpc_binding_dialog->transport_ncalrpc = gtk_radio_button_new_with_mnemonic (NULL, "Local Host");
- gtk_widget_show (gtk_rpc_binding_dialog->transport_ncalrpc);
- gtk_box_pack_start (GTK_BOX (vbox6), gtk_rpc_binding_dialog->transport_ncalrpc, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_ncalrpc), transport_smb_group);
- transport_smb_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (gtk_rpc_binding_dialog->transport_ncalrpc));
- g_signal_connect ((gpointer) gtk_rpc_binding_dialog->transport_ncalrpc, "toggled",
- G_CALLBACK (on_ncalrpc_toggled),
- gtk_rpc_binding_dialog);
label1 = gtk_label_new ("Transport");
gtk_widget_show (label1);
@@ -265,6 +264,13 @@
gtk_container_set_border_width (GTK_CONTAINER (btn_connect), 1);
GTK_WIDGET_SET_FLAGS (btn_connect, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) gtk_rpc_binding_dialog->transport_ncalrpc, "toggled",
+ G_CALLBACK (on_ncalrpc_toggled),
+ gtk_rpc_binding_dialog);
+
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gtk_rpc_binding_dialog->transport_ncalrpc), TRUE);
+
gtk_widget_grab_focus (btn_connect);
gtk_widget_grab_default (btn_connect);
}
Modified: branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2004-10-24 17:06:35 UTC (rev 3165)
+++ branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2004-10-24 17:34:48 UTC (rev 3166)
@@ -85,6 +85,7 @@
GtkRpcBindingDialog *d;
NTSTATUS status;
gint result;
+ TALLOC_CTX *mem_ctx;
d = GTK_RPC_BINDING_DIALOG(gtk_rpc_binding_dialog_new(FALSE, NULL));
result = gtk_dialog_run(GTK_DIALOG(d));
@@ -96,16 +97,21 @@
return;
}
+ mem_ctx = talloc_init("gwcrontab_connect");
/* If connected, get list of jobs */
- status = dcerpc_pipe_connect(&at_pipe, gtk_rpc_binding_dialog_get_binding(d, DCERPC_ATSVC_NAME), DCERPC_ATSVC_UUID, DCERPC_ATSVC_VERSION, lp_workgroup(), gtk_rpc_binding_dialog_get_username(d), gtk_rpc_binding_dialog_get_password(d));
+
+ status = dcerpc_pipe_connect_b(&at_pipe, gtk_rpc_binding_dialog_get_binding(d, mem_ctx), DCERPC_ATSVC_UUID, DCERPC_ATSVC_VERSION, lp_workgroup(), gtk_rpc_binding_dialog_get_username(d), gtk_rpc_binding_dialog_get_password(d));
+
if(!NT_STATUS_IS_OK(status)) {
gtk_show_ntstatus(mainwin, status);
at_pipe = NULL;
gtk_widget_destroy(GTK_WIDGET(d));
+ talloc_destroy(mem_ctx);
return;
}
gtk_widget_destroy(GTK_WIDGET(d));
+ talloc_destroy(mem_ctx);
update_joblist();
}
Modified: branches/SAMBA_4_0/source/gtk/tools/gwsam.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/tools/gwsam.c 2004-10-24 17:06:35 UTC (rev 3165)
+++ branches/SAMBA_4_0/source/gtk/tools/gwsam.c 2004-10-24 17:34:48 UTC (rev 3166)
@@ -91,7 +91,7 @@
d = GTK_SELECT_DOMAIN_DIALOG(gtk_select_domain_dialog_new(sam_pipe));
result = gtk_dialog_run(GTK_DIALOG(d));
switch(result) {
- case GTK_RESPONSE_ACCEPT:
+ case GTK_RESPONSE_OK:
break;
default:
gtk_widget_destroy(GTK_WIDGET(d));
@@ -105,7 +105,7 @@
gtk_widget_destroy(GTK_WIDGET(d));
}
-void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
+static void connect_sam(void)
{
GtkRpcBindingDialog *d;
NTSTATUS status;
@@ -153,8 +153,14 @@
gtk_window_set_title (GTK_WINDOW (mainwin), talloc_asprintf(mem_ctx, "User Manager - Connected to %s", gtk_rpc_binding_dialog_get_host(d)));
gtk_widget_destroy(GTK_WIDGET(d));
talloc_destroy(mem_ctx);
+
}
+void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+ connect_sam();
+}
+
void on_disconnect_activate (GtkMenuItem *menuitem, gpointer user_data)
{
gtk_widget_set_sensitive (mnu_disconnect, FALSE);
@@ -431,9 +437,11 @@
{
lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
+ setup_logging("gwsam", True);
gtk_init(&argc, &argv);
mainwin = create_mainwindow();
+ connect_sam();
gtk_widget_show(mainwin);
gtk_main();