svn commit: samba r3722 - in branches/SAMBA_4_0/source/gtk: common
tools
metze at samba.org
metze at samba.org
Sat Nov 13 11:33:02 GMT 2004
Author: metze
Date: 2004-11-13 11:33:01 +0000 (Sat, 13 Nov 2004)
New Revision: 3722
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3722
Log:
- add userdomain in the binding dialog
- print samba_version_string() on Help->About
- some minor format fixes
metze
Modified:
branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
branches/SAMBA_4_0/source/gtk/common/gtk-smb.h
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-11-13 07:44:50 UTC (rev 3721)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-11-13 11:33:01 UTC (rev 3722)
@@ -26,10 +26,11 @@
void gtk_show_werror(GtkWidget *win, WERROR err)
{
GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(win),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "Windows error: %s\n", win_errstr(err));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "Windows error: %s\n",
+ win_errstr(err));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -37,10 +38,11 @@
void gtk_show_ntstatus(GtkWidget *win, NTSTATUS status)
{
GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(win),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "Windows error: %s\n", nt_errstr(status));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "Windows error: %s\n",
+ nt_errstr(status));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -81,6 +83,7 @@
GtkWidget *label3;
GtkWidget *table1;
GtkWidget *lbl_username;
+ GtkWidget *lbl_userdomain;
GtkWidget *lbl_password;
GtkWidget *btn_browse;
GtkWidget *label9;
@@ -170,42 +173,55 @@
gtk_rpc_binding_dialog->frame_credentials = gtk_frame_new (NULL);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), gtk_rpc_binding_dialog->frame_credentials, TRUE, TRUE, 0);
- table1 = gtk_table_new (3, 2, FALSE);
+ table1 = gtk_table_new (4, 2, FALSE);
gtk_container_add (GTK_CONTAINER (gtk_rpc_binding_dialog->frame_credentials), table1);
lbl_username = gtk_label_new ("Username:");
- gtk_table_attach (GTK_TABLE (table1), lbl_username, 0, 1, 0, 1,
+ gtk_table_attach (GTK_TABLE (table1), lbl_username, 0,1, 0,1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (lbl_username), 0, 0.5);
+ lbl_userdomain= gtk_label_new ("Domain:");
+ gtk_table_attach (GTK_TABLE (table1), lbl_userdomain, 0,1, 1,2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (lbl_userdomain), 0, 0.5);
+
lbl_password = gtk_label_new ("Password:");
- gtk_table_attach (GTK_TABLE (table1), lbl_password, 0, 1, 1, 2,
+ gtk_table_attach (GTK_TABLE (table1), lbl_password, 0,1, 2,3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (lbl_password), 0, 0.5);
label9 = gtk_label_new ("");
- gtk_table_attach (GTK_TABLE (table1), label9, 0, 1, 2, 3,
+ gtk_table_attach (GTK_TABLE (table1), label9, 0,1, 3,4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
- gtk_rpc_binding_dialog->entry_password = gtk_entry_new ();
- gtk_entry_set_visibility (GTK_ENTRY (gtk_rpc_binding_dialog->entry_password), FALSE);
- gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->entry_password, 1, 2, 1, 2,
+ gtk_rpc_binding_dialog->entry_username = gtk_entry_new ();
+ gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->entry_username, 1,2, 0,1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_rpc_binding_dialog->entry_username = gtk_entry_new ();
- gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->entry_username, 1, 2, 0, 1,
+ gtk_entry_set_text(GTK_ENTRY(gtk_rpc_binding_dialog->entry_username), getenv("LOGNAME"));
+
+ gtk_rpc_binding_dialog->entry_userdomain = gtk_entry_new ();
+ gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->entry_userdomain, 1,2, 1,2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_entry_set_text(GTK_ENTRY(gtk_rpc_binding_dialog->entry_username), getenv("LOGNAME"));
+ gtk_entry_set_text(GTK_ENTRY(gtk_rpc_binding_dialog->entry_userdomain), lp_workgroup());
+ gtk_rpc_binding_dialog->entry_password = gtk_entry_new ();
+ gtk_entry_set_visibility (GTK_ENTRY (gtk_rpc_binding_dialog->entry_password), FALSE);
+ gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->entry_password, 1,2, 2,3,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
gtk_rpc_binding_dialog->krb5_chk_button = gtk_check_button_new_with_mnemonic ("_Use kerberos");
- gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->krb5_chk_button, 1, 2, 2, 3,
+ gtk_table_attach (GTK_TABLE (table1), gtk_rpc_binding_dialog->krb5_chk_button, 1,2, 3,4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
@@ -286,6 +302,11 @@
return gtk_entry_get_text(GTK_ENTRY(d->entry_username));
}
+const char *gtk_rpc_binding_dialog_get_userdomain(GtkRpcBindingDialog *d)
+{
+ return gtk_entry_get_text(GTK_ENTRY(d->entry_userdomain));
+}
+
const char *gtk_rpc_binding_dialog_get_password(GtkRpcBindingDialog *d)
{
return gtk_entry_get_text(GTK_ENTRY(d->entry_password));
@@ -339,8 +360,9 @@
GtkWidget *samba_about_dialog;
GtkWidget *dialog_vbox1;
GtkWidget *label1;
+ GtkWidget *label2;
GtkWidget *label3;
- GtkWidget *label2;
+ GtkWidget *label4;
GtkWidget *dialog_action_area1;
GtkWidget *okbutton1;
@@ -355,11 +377,14 @@
label1 = gtk_label_new (appname);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), label1, FALSE, FALSE, 0);
+ label2 = gtk_label_new (samba_version_string());
+ gtk_box_pack_start (GTK_BOX (dialog_vbox1), label2, FALSE, FALSE, 0);
+
label3 = gtk_label_new_with_mnemonic ("Part of Samba <http://www.samba.org/>");
gtk_box_pack_start (GTK_BOX (dialog_vbox1), label3, FALSE, FALSE, 0);
- label2 = gtk_label_new ("\302\251 1992-2004 The Samba Team");
- gtk_box_pack_start (GTK_BOX (dialog_vbox1), label2, FALSE, FALSE, 0);
+ label4 = gtk_label_new ("\302\251 1992-2004 The Samba Team");
+ gtk_box_pack_start (GTK_BOX (dialog_vbox1), label4, FALSE, FALSE, 0);
dialog_action_area1 = GTK_DIALOG (samba_about_dialog)->action_area;
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.h
===================================================================
--- branches/SAMBA_4_0/source/gtk/common/gtk-smb.h 2004-11-13 07:44:50 UTC (rev 3721)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.h 2004-11-13 11:33:01 UTC (rev 3722)
@@ -39,6 +39,7 @@
GtkWidget *frame_host;
GtkWidget *entry_host;
GtkWidget *entry_username;
+ GtkWidget *entry_userdomain;
GtkWidget *entry_password;
GtkWidget *krb5_chk_button;
GtkWidget *frame_credentials;
@@ -71,6 +72,7 @@
void gtk_show_werror(GtkWidget *win, WERROR err);
const char *gtk_rpc_binding_dialog_get_binding_string(GtkRpcBindingDialog *d, TALLOC_CTX *mem_ctx);
const char *gtk_rpc_binding_dialog_get_username(GtkRpcBindingDialog *d);
+const char *gtk_rpc_binding_dialog_get_userdomain(GtkRpcBindingDialog *d);
const char *gtk_rpc_binding_dialog_get_password(GtkRpcBindingDialog *d);
const char *gtk_rpc_binding_dialog_get_host(GtkRpcBindingDialog *d);
GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe);
Modified: branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2004-11-13 07:44:50 UTC (rev 3721)
+++ branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2004-11-13 11:33:01 UTC (rev 3722)
@@ -91,7 +91,7 @@
TALLOC_CTX *mem_ctx;
d = GTK_RPC_BINDING_DIALOG(gtk_rpc_binding_dialog_new(FALSE, NULL));
- result = gtk_dialog_run(GTK_DIALOG(d));
+ result = gtk_dialog_run(GTK_DIALOG(d));
switch(result) {
case GTK_RESPONSE_ACCEPT:
break;
@@ -103,12 +103,18 @@
mem_ctx = talloc_init("gwcrontab_connect");
/* If connected, get list of jobs */
- 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));
-
+ status = dcerpc_pipe_connect_b(&at_pipe,
+ gtk_rpc_binding_dialog_get_binding(d, mem_ctx),
+ DCERPC_ATSVC_UUID,
+ DCERPC_ATSVC_VERSION,
+ gtk_rpc_binding_dialog_get_userdomain(d),
+ 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));
+ gtk_widget_destroy(GTK_WIDGET(d));
talloc_destroy(mem_ctx);
return;
}
Modified: branches/SAMBA_4_0/source/gtk/tools/gwsam.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/tools/gwsam.c 2004-11-13 07:44:50 UTC (rev 3721)
+++ branches/SAMBA_4_0/source/gtk/tools/gwsam.c 2004-11-13 11:33:01 UTC (rev 3722)
@@ -128,7 +128,12 @@
mem_ctx = talloc_init("gwsam_connect");
/* If connected, get list of jobs */
- status = dcerpc_pipe_connect_b(&sam_pipe, gtk_rpc_binding_dialog_get_binding(d, mem_ctx), DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION, lp_workgroup(), gtk_rpc_binding_dialog_get_username(d), gtk_rpc_binding_dialog_get_password(d));
+ status = dcerpc_pipe_connect_b(&sam_pipe,
+ gtk_rpc_binding_dialog_get_binding(d, mem_ctx),
+ DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION,
+ gtk_rpc_binding_dialog_get_userdomain(d),
+ 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);
More information about the samba-cvs
mailing list