sync with sylpheed 0.6.3 release

[claws.git] / src / editldap_basedn.c

diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 2758d7deb38b930f6f93f6e27301c1d92e2fdec5..a2aa21c34b95035b78c4b5ec0b7de04acf4c4b86 100644 (file)
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -97,10 +97,11 @@ static void edit_ldap_bdn_cancel( GtkWidget *widget, gboolean *cancelled ) {
 }
 
 static void edit_ldap_bdn_list_select( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
-       gchar **text = NULL;
-       if( gtk_clist_get_text( clist, row, 0, text ) ) {
-               if( *text ) {
-                       gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), *text );
+       gchar *text = NULL;
+
+       if( gtk_clist_get_text( clist, row, 0, &text ) ) {
+               if( text ) {
+                       gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), text );
                }
        }
 }
@@ -122,18 +123,14 @@ static void edit_ldap_bdn_create(void) {
        GtkWidget *label;
        GtkWidget *host_label;
        GtkWidget *port_label;
-       /* GtkWidget *basedn_label; */
        GtkWidget *basedn_list;
        GtkWidget *vlbox;
        GtkWidget *lwindow;
        GtkWidget *basedn_entry;
-       /* GtkWidget *hlbox; */
        GtkWidget *hbbox;
        GtkWidget *hsep;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
-       /* GtkWidget *check_btn; */
-       /* GtkWidget *file_btn; */
        GtkWidget *hsbox;
        GtkWidget *statusbar;
        gint top;
@@ -266,17 +263,16 @@ void edit_ldap_bdn_load_data( const gchar *hostName, const gint iPort, const gin
                        GList *baseDN = syldap_read_basedn_s( sHost, iPort, bindDN, bindPW, tov );
                        if( baseDN ) {
                                GList *node = baseDN;
-                               gchar *sBase[2];
-                               sBase[1] = NULL;
+                               gchar *text[2] = { NULL, NULL };
+
                                while( node ) {
-                                       sBase[0] = g_strdup( node->data );
-                                       gtk_clist_append(GTK_CLIST(ldapedit_basedn.basedn_list), sBase);
+                                       text[0] = (gchar *)node->data;
+                                       gtk_clist_append(GTK_CLIST(ldapedit_basedn.basedn_list), text);
                                        node = g_list_next( node );
                                        flgDN = TRUE;
                                }
                                mgu_free_dlist( baseDN );
                                baseDN = node = NULL;
-                               sBase[0] = NULL;
                        }
                        ldapedit_basedn_bad_server = FALSE;
                        flgConn = TRUE;
@@ -310,15 +306,11 @@ gchar *edit_ldap_basedn_selection( const gchar *hostName, const gint port, gchar
        edit_ldap_bdn_load_data( hostName, port, tov, bindDN, bindPW );
        gtk_widget_show(ldapedit_basedn.window);
 
-/*     sprintf( sPort, "%d", port ); */
-/*     gtk_label_set_text(GTK_LABEL(ldapedit_basedn.host_label), hostName); */
-/*     gtk_label_set_text(GTK_LABEL(ldapedit_basedn.port_label), sPort); */
        gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), baseDN);
 
        gtk_main();
        gtk_widget_hide(ldapedit_basedn.window);
        if( ldapedit_basedn_cancelled ) return NULL;
-/*     if( cancelled == TRUE ) return NULL; */
        if( ldapedit_basedn_bad_server ) return NULL;
 
        retVal = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(ldapedit_basedn.basedn_entry), 0, -1 ) );