diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
| commit | ff615f232968979f57a31f43a4f668c2c4fd20df (patch) | |
| tree | 8e4d6e1181001dd35e32008a3401020c013e288b /source3/lib/netapi/examples | |
| parent | 09caab9f37d6ecd4fd6fe9ce3c284730b232651a (diff) | |
| parent | 0db7aba8af80a01150d1061a4192ab814e4234b7 (diff) | |
| download | samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.gz samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.bz2 samba-ff615f232968979f57a31f43a4f668c2c4fd20df.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a)
Diffstat (limited to 'source3/lib/netapi/examples')
| -rw-r--r-- | source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index a7b2079f95..5ce4ca2c87 100644 --- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c +++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c @@ -650,6 +650,9 @@ static void callback_do_join(GtkWidget *widget, err_str = libnetapi_get_error_string(state->ctx, status); g_print("callback_do_join: failed to unjoin (%s)\n", err_str); +#if 0 + + /* in fact we shouldn't annoy the user with an error message here */ dialog = gtk_message_dialog_new(GTK_WINDOW(state->window_parent), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -662,6 +665,7 @@ static void callback_do_join(GtkWidget *widget, gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); +#endif } } @@ -1306,7 +1310,7 @@ static int draw_main_window(struct join_state *state) { /* Label */ label = gtk_label_new("Computer description:"); -/* gtk_misc_set_alignment(GTK_MISC(label), 0, 0); */ + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_widget_show(label); |