[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-847-g84608e1

Günther Deschner gd at samba.org
Sat Apr 12 22:48:55 GMT 2008


The branch, v3-2-test has been updated
       via  84608e165e24c68c12d40086f81684ef37f69159 (commit)
      from  b62dd61cc56ec33601289fd4e23058c7f9ad3f0d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 84608e165e24c68c12d40086f81684ef37f69159
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 23:12:53 2008 +0200

    Fix ou handling in netdomjoin-gui.
    
    The ou list was concatenated again and again...
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index fa1bafd..a7b2079 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -84,6 +84,7 @@ typedef struct join_state {
 	uint16_t server_role;
 	gboolean settings_changed;
 	gboolean hostname_changed;
+	uint32_t stored_num_ous;
 } join_state;
 
 static void debug(const char *format, ...)
@@ -932,11 +933,15 @@ static void callback_do_getous(GtkWidget *widget,
 		return;
 	}
 
+	for (i=0; i<state->stored_num_ous; i++) {
+		gtk_combo_box_remove_text(GTK_COMBO_BOX(state->entry_ou_list), 0);
+	}
 	for (i=0; i<num_ous && ous[i] != NULL; i++) {
 		gtk_combo_box_append_text(GTK_COMBO_BOX(state->entry_ou_list),
 					  ous[i]);
 	}
 	NetApiBufferFree(ous);
+	state->stored_num_ous = num_ous;
 	gtk_combo_box_set_active(GTK_COMBO_BOX(state->entry_ou_list), num_ous-1);
 }
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list