fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)
[claws.git] / src / importldif.c
index c2ba52d1acefc009d03facbab5d1de406cff757b..5b523f425ddc3aab8bc7a6f813e4f9df6de81773 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-
-#include "intl.h"
+#include <gtk/gtk.h>
+
 #include "addrbook.h"
 #include "addressbook.h"
 #include "addressitem.h"
 #include "mgutils.h"
 #include "ldif.h"
 #include "utils.h"
+#include "filesel.h"
 
-#define IMPORTLDIF_GUESS_NAME "LDIF Import"
+#define IMPORTLDIF_GUESS_NAME      "LDIF Import"
 
 #define PAGE_FILE_INFO             0
 #define PAGE_ATTRIBUTES            1
 #define PAGE_FINISH                2
 
-#define IMPORTLDIF_WIDTH           380
+#define IMPORTLDIF_WIDTH           390
 #define IMPORTLDIF_HEIGHT          300
 
-#define FIELDS_N_COLS              3
+#define FIELDS_COL_WIDTH_RESERVED  10
 #define FIELDS_COL_WIDTH_SELECT    10
 #define FIELDS_COL_WIDTH_FIELD     140
 #define FIELDS_COL_WIDTH_ATTRIB    140
 
 typedef enum {
-       FIELD_COL_SELECT  = 0,
-       FIELD_COL_FIELD   = 1,
-       FIELD_COL_ATTRIB  = 2
+       FIELD_COL_RESERVED,
+       FIELD_COL_SELECT,
+       FIELD_COL_FIELD,
+       FIELD_COL_ATTRIB,
+       FIELD_COL_PTR,
+       FIELDS_N_COLS
 } ImpLdif_FieldColPos;
 
+/**
+ * LDIF dialog definition.
+ */
 static struct _ImpLdif_Dlg {
        GtkWidget *window;
        GtkWidget *notebook;
-       GtkWidget *file_entry;
-       GtkWidget *name_entry;
-       GtkWidget *clist_field;
-       GtkWidget *name_ldif;
-       GtkWidget *name_attrib;
-       GtkWidget *check_select;
+       GtkWidget *entryFile;
+       GtkWidget *entryName;
+       GtkWidget *view_fields;
+       GtkWidget *entryField;
+       GtkWidget *entryAttrib;
+       GtkWidget *checkSelect;
+       GtkWidget *btnModify;
        GtkWidget *labelBook;
        GtkWidget *labelFile;
        GtkWidget *labelRecords;
        GtkWidget *btnPrev;
        GtkWidget *btnNext;
+       GtkWidget *btnProceed;
        GtkWidget *btnCancel;
        GtkWidget *statusbar;
        gint      status_cid;
-       gint      rowIndSelect;
        gint      rowCount;
        gchar     *nameBook;
        gchar     *fileName;
@@ -97,8 +100,7 @@ static AddressBookFile *_importedBook_;
 static AddressIndex *_imp_addressIndex_;
 static LdifFile *_ldifFile_ = NULL;
 
-static GdkPixmap *markxpm;
-static GdkBitmap *markxpmmask;
+static GdkPixbuf *markxpm;
 
 /**
  * Structure of error message table.
@@ -155,6 +157,10 @@ static gchar *imp_ldif_err2string( ErrMsgTableEntry lut[], gint code ) {
         return desc;
 }
 
+/**
+ * Display message in status field.
+ * \param msg Message to display.
+ */
 static void imp_ldif_status_show( gchar *msg ) {
        if( impldif_dlg.statusbar != NULL ) {
                gtk_statusbar_pop( GTK_STATUSBAR(impldif_dlg.statusbar),
@@ -167,11 +173,14 @@ static void imp_ldif_status_show( gchar *msg ) {
        }
 }
 
+/**
+ * Select and display status message appropriate for the page being displayed.
+ */
 static void imp_ldif_message( void ) {
        gchar *sMsg = NULL;
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
        if( pageNum == PAGE_FILE_INFO ) {
                sMsg = _( "Please specify address book name and file to import." );
        }
@@ -184,61 +193,48 @@ static void imp_ldif_message( void ) {
        imp_ldif_status_show( sMsg );
 }
 
-static void imp_ldif_update_row( GtkCList *clist ) {
-       Ldif_FieldRec *rec;
-       gchar *text[ FIELDS_N_COLS ];
-       gint row;
-
-       if( impldif_dlg.rowIndSelect < 0 ) return;
-       row = impldif_dlg.rowIndSelect;
-
-       rec = gtk_clist_get_row_data( clist, row );
-       text[ FIELD_COL_SELECT ] = "";
-       text[ FIELD_COL_FIELD  ] = rec->tagName;
-       text[ FIELD_COL_ATTRIB ] = rec->userName;
-
-       gtk_clist_freeze( clist );
-       gtk_clist_remove( clist, row );
-       if( row == impldif_dlg.rowCount - 1 ) {
-               gtk_clist_append( clist, text );
-       }
-       else {
-               gtk_clist_insert( clist, row, text );
-       }
-       if( rec->selected )
-               gtk_clist_set_pixmap( clist, row, FIELD_COL_SELECT, markxpm, markxpmmask );
-
-       gtk_clist_set_row_data( clist, row, rec );
-       gtk_clist_thaw( clist );
+/**
+ * Update the line (represented by the GtkTreeIter) with data
+ * from the Ldif_FieldRec.
+ */
+static void _populate_iter(GtkListStore *store, GtkTreeIter *iter,
+               Ldif_FieldRec *rec)
+{
+       gtk_list_store_set(store, iter,
+                       FIELD_COL_FIELD, rec->tagName,
+                       FIELD_COL_ATTRIB, rec->userName,
+                       FIELD_COL_PTR, rec,
+                       -1);
+       gtk_list_store_set(store, iter,
+                       FIELD_COL_SELECT, rec->selected ? markxpm : NULL, -1);
+       gtk_list_store_set(store, iter,
+                       FIELD_COL_RESERVED, rec->reserved ? markxpm : NULL, -1);
 }
 
+/**
+ * Load list with LDIF fields read from file.
+ * \param ldf LDIF control data.
+ */
 static void imp_ldif_load_fields( LdifFile *ldf ) {
-       GtkCList *clist = GTK_CLIST(impldif_dlg.clist_field);
+       GtkWidget *view = impldif_dlg.view_fields;
+       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+       GtkTreeIter iter;
        GList *node, *list;
-       gchar *text[ FIELDS_N_COLS ];
 
-       impldif_dlg.rowIndSelect = -1;
        impldif_dlg.rowCount = 0;
+
        if( ! ldf->accessFlag ) return;
-       gtk_clist_clear( clist );
+
+       gtk_list_store_clear(GTK_LIST_STORE(model));
+
        list = ldif_get_fieldlist( ldf );
        node = list;
        while( node ) {
                Ldif_FieldRec *rec = node->data;
-               gint row;
-
-               if( ! rec->reserved ) {
-                       text[ FIELD_COL_SELECT ] = "";
-                       text[ FIELD_COL_FIELD  ] = rec->tagName;
-                       text[ FIELD_COL_ATTRIB ] = rec->userName;
-                       row = gtk_clist_append( clist, text );
-                       gtk_clist_set_row_data( clist, row, rec );
-                       if( rec->selected )
-                               gtk_clist_set_pixmap(
-                                       clist, row, FIELD_COL_SELECT, markxpm,
-                                       markxpmmask );
-                       impldif_dlg.rowCount++;
-               }
+
+               gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+               _populate_iter(GTK_LIST_STORE(model), &iter, rec);
+               impldif_dlg.rowCount++;
                node = g_list_next( node );
        }
        g_list_free( list );
@@ -246,69 +242,10 @@ static void imp_ldif_load_fields( LdifFile *ldf ) {
        ldif_set_accessed( ldf, FALSE );
 }
 
-static void imp_ldif_field_list_selected(
-               GtkCList *clist, gint row, gint column, GdkEvent *event,
-               gpointer data )
-{
-       Ldif_FieldRec *rec = gtk_clist_get_row_data( clist, row );
-
-       impldif_dlg.rowIndSelect = row;
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.name_attrib), "" );
-       if( rec ) {
-               gtk_label_set_text( GTK_LABEL(impldif_dlg.name_ldif), rec->tagName );
-               if( rec->userName )
-                       gtk_entry_set_text(
-                               GTK_ENTRY(impldif_dlg.name_attrib), rec->userName );
-               gtk_toggle_button_set_active(
-                       GTK_TOGGLE_BUTTON( impldif_dlg.check_select),
-                       rec->selected );
-       }
-       gtk_widget_grab_focus(impldif_dlg.name_attrib);
-}
-
-static void imp_ldif_field_list_toggle(
-               GtkCList *clist, GdkEventButton *event, gpointer data )
-{
-       if( ! event ) return;
-       if( impldif_dlg.rowIndSelect < 0 ) return;
-       if( event->button == 1 ) {
-               if( event->type == GDK_2BUTTON_PRESS ) {
-                       Ldif_FieldRec *rec = gtk_clist_get_row_data(
-                               clist, impldif_dlg.rowIndSelect );
-                       if( rec ) {
-                               rec->selected = ! rec->selected;
-                               imp_ldif_update_row( clist );
-                       }
-               }
-       }
-}
-
-static void imp_ldif_modify_pressed( GtkWidget *widget, gpointer data ) {
-       GtkCList *clist = GTK_CLIST(impldif_dlg.clist_field);
-       Ldif_FieldRec *rec;
-       gint row;
-
-       if( impldif_dlg.rowIndSelect < 0 ) return;
-       row = impldif_dlg.rowIndSelect;
-       rec = gtk_clist_get_row_data( clist, impldif_dlg.rowIndSelect );
-
-       g_free( rec->userName );
-       rec->userName = gtk_editable_get_chars(
-                               GTK_EDITABLE(impldif_dlg.name_attrib), 0, -1 );
-       rec->selected = gtk_toggle_button_get_active(
-                               GTK_TOGGLE_BUTTON( impldif_dlg.check_select) );
-       imp_ldif_update_row( clist );
-       gtk_clist_select_row( clist, row, 0 );
-       gtk_label_set_text( GTK_LABEL(impldif_dlg.name_ldif), "" );
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.name_attrib), "" );
-       gtk_toggle_button_set_active(
-               GTK_TOGGLE_BUTTON( impldif_dlg.check_select), FALSE );
-}
-
-/*
-* Move off fields page.
-* return: TRUE if OK to move off page.
-*/
+/**
+ * Test whether we can move off fields page.
+ * \return <i>TRUE</i> if OK to move off page.
+ */
 static gboolean imp_ldif_field_move() {
        gboolean retVal = FALSE;
        gchar *newFile;
@@ -338,10 +275,40 @@ static gboolean imp_ldif_field_move() {
        return retVal;
 }
 
-/*
-* Move off fields page.
-* return: TRUE if OK to move off page.
-*/
+static void _update_selected_row()
+{
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       Ldif_FieldRec *rec;
+
+       rec = gtkut_tree_view_get_selected_pointer(
+                       GTK_TREE_VIEW(impldif_dlg.view_fields), FIELD_COL_PTR,
+                       &model, NULL, &iter);
+       if (rec == NULL)
+               return;
+
+       ldif_field_set_name(rec, gtk_entry_get_text(
+                               GTK_ENTRY(impldif_dlg.entryAttrib)));
+       ldif_field_set_selected(rec, gtk_toggle_button_get_active(
+                               GTK_TOGGLE_BUTTON(impldif_dlg.checkSelect)));
+
+       _populate_iter(GTK_LIST_STORE(model), &iter, rec);
+}
+
+static void imp_ldif_modify_pressed(GtkButton *widget, gpointer user_data)
+{
+       _update_selected_row();
+}
+
+static void imp_ldif_entryattrib_activate(GtkEntry *entry, gpointer user_data)
+{
+       _update_selected_row();
+}
+
+/**
+ * Test whether we can move off file page.
+ * \return <i>TRUE</i> if OK to move off page.
+ */
 static gboolean imp_ldif_file_move() {
        gboolean retVal = FALSE;
        gchar *sName;
@@ -349,29 +316,29 @@ static gboolean imp_ldif_file_move() {
        gchar *sMsg = NULL;
        gboolean errFlag = FALSE;
 
-       sFile = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.file_entry), 0, -1 );
-       g_strchug( sFile ); g_strchomp( sFile );
+       sFile = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.entryFile), 0, -1 );
+       g_strstrip( sFile );
 
-       sName = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_entry), 0, -1 );
-       g_strchug( sName ); g_strchomp( sName );
+       sName = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.entryName), 0, -1 );
+       g_strstrip( sName );
 
        g_free( impldif_dlg.nameBook );
        g_free( impldif_dlg.fileName );
        impldif_dlg.nameBook = sName;
        impldif_dlg.fileName = sFile;
 
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.file_entry), sFile );
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.name_entry), sName );
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryFile), sFile );
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryName), sName );
 
-       if( *sFile == '\0'|| strlen( sFile ) < 1 ) {
+       if( *sFile == '\0' ) {
                sMsg = _( "Please select a file." );
-               gtk_widget_grab_focus(impldif_dlg.file_entry);
+               gtk_widget_grab_focus(impldif_dlg.entryFile);
                errFlag = TRUE;
        }
 
-       if( *sName == '\0'|| strlen( sName ) < 1 ) {
-               if( ! errFlag ) sMsg = _( "Address book name must be supplied." );
-               gtk_widget_grab_focus(impldif_dlg.name_entry);
+       if( ! errFlag && *sName == '\0' ) {
+               sMsg = _( "Address book name must be supplied." );
+               gtk_widget_grab_focus(impldif_dlg.entryName);
                errFlag = TRUE;
        }
 
@@ -385,7 +352,7 @@ static gboolean imp_ldif_file_move() {
                        retVal = TRUE;
                }
                else {
-                       sMsg = _( "Error reading LDIF fields." );
+                       sMsg = imp_ldif_err2string( _lutErrorsLDIF_, _ldifFile_->retVal );
                }
        }
        imp_ldif_status_show( sMsg );
@@ -393,20 +360,22 @@ static gboolean imp_ldif_file_move() {
        return retVal;
 }
 
-/*
+/**
  * Display finish page.
  */
 static void imp_ldif_finish_show() {
        gchar *sMsg;
        gchar *name;
 
-       name = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_entry), 0, -1 );
+       name = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.entryName), 0, -1 );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.labelBook), name );
        g_free( name );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.labelFile), _ldifFile_->path );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.labelRecords), itos( _ldifFile_->importCount ) );
        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
-       gtk_widget_set_sensitive( impldif_dlg.btnNext, FALSE );
+       gtk_widget_hide( impldif_dlg.btnNext );
+       gtk_widget_show( impldif_dlg.btnProceed );
+       gtk_widget_set_sensitive( impldif_dlg.btnProceed, FALSE );
        if( _ldifFile_->retVal == MGU_SUCCESS ) {
                sMsg = _( "LDIF file imported successfully." );
        }
@@ -417,124 +386,136 @@ static void imp_ldif_finish_show() {
        gtk_widget_grab_focus(impldif_dlg.btnCancel);
 }
 
+/**
+ * Callback function to select previous page.
+ * \param widget Widget (button).
+ */
 static void imp_ldif_prev( GtkWidget *widget ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
        if( pageNum == PAGE_ATTRIBUTES ) {
                /* Goto file page stuff */
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
                gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
+               gtk_widget_hide( impldif_dlg.btnProceed );
+               gtk_widget_show( impldif_dlg.btnNext );
        }
        imp_ldif_message();
 }
 
+/**
+ * Callback function to select next page.
+ * \param widget Widget (button).
+ */
 static void imp_ldif_next( GtkWidget *widget ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
        if( pageNum == PAGE_FILE_INFO ) {
                /* Goto attributes stuff */
                if( imp_ldif_file_move() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_ATTRIBUTES );
                        imp_ldif_message();
                        gtk_widget_set_sensitive( impldif_dlg.btnPrev, TRUE );
+                       gtk_widget_hide( impldif_dlg.btnNext );
+                       gtk_widget_show( impldif_dlg.btnProceed );
+                       gtk_widget_set_sensitive( impldif_dlg.btnProceed, TRUE );
                }
                else {
                        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
+                       _ldifFile_->dirtyFlag = TRUE;
                }
        }
        else if( pageNum == PAGE_ATTRIBUTES ) {
                /* Goto finish stuff */
                if( imp_ldif_field_move() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FINISH );
+                       gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
+                                            GTK_STOCK_CLOSE);
                        imp_ldif_finish_show();
                }
        }
 }
 
+/**
+ * Callback function to cancel and close dialog.
+ * \param widget Widget (button).
+ * \param data   User data.
+ */
 static void imp_ldif_cancel( GtkWidget *widget, gpointer data ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impldif_dlg.notebook) );
        if( pageNum != PAGE_FINISH ) {
                impldif_dlg.cancelled = TRUE;
        }
        gtk_main_quit();
 }
 
-static void imp_ldif_file_ok( GtkWidget *widget, gpointer data ) {
-       gchar *sFile;
-       AddressFileSelection *afs;
-       GtkWidget *fileSel;
-
-       afs = ( AddressFileSelection * ) data;
-       fileSel = afs->fileSelector;
-       sFile = gtk_file_selection_get_filename( GTK_FILE_SELECTION(fileSel) );
-
-       afs->cancelled = FALSE;
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.file_entry), sFile );
-       gtk_widget_hide( afs->fileSelector );
-       gtk_grab_remove( afs->fileSelector );
-       gtk_widget_grab_focus( impldif_dlg.file_entry );
-}
-
-static void imp_ldif_file_cancel( GtkWidget *widget, gpointer data ) {
-       AddressFileSelection *afs = ( AddressFileSelection * ) data;
-       afs->cancelled = TRUE;
-       gtk_widget_hide( afs->fileSelector );
-       gtk_grab_remove( afs->fileSelector );
-       gtk_widget_grab_focus( impldif_dlg.file_entry );
-}
 
+/**
+ * Create LDIF file selection dialog.
+ * \param afs Address file selection data.
+ */
 static void imp_ldif_file_select_create( AddressFileSelection *afs ) {
-       GtkWidget *fileSelector;
-
-       fileSelector = gtk_file_selection_new( _("Select LDIF File") );
-       gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
-               "clicked", GTK_SIGNAL_FUNC (imp_ldif_file_ok), ( gpointer ) afs );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
-               "clicked", GTK_SIGNAL_FUNC (imp_ldif_file_cancel), ( gpointer ) afs );
-       afs->fileSelector = fileSelector;
-       afs->cancelled = TRUE;
+       gchar *file = filesel_select_file_open(_("Select LDIF File"), NULL);
+
+       if (file == NULL)
+               afs->cancelled = TRUE;
+       else {
+               afs->cancelled = FALSE;
+               gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryFile), file );
+               g_free(file);
+       }
 }
 
+/**
+ * Callback function to display LDIF file selection dialog.
+ */
 static void imp_ldif_file_select( void ) {
-       gchar *sFile;
-       if( ! _imp_ldif_file_selector_.fileSelector )
-               imp_ldif_file_select_create( & _imp_ldif_file_selector_ );
-
-       sFile = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.file_entry), 0, -1 );
-       gtk_file_selection_set_filename(
-               GTK_FILE_SELECTION( _imp_ldif_file_selector_.fileSelector ),
-               sFile );
-       g_free( sFile );
-       gtk_widget_show( _imp_ldif_file_selector_.fileSelector );
-       gtk_grab_add( _imp_ldif_file_selector_.fileSelector );
+       imp_ldif_file_select_create( & _imp_ldif_file_selector_ );
 }
 
+/**
+ * Callback function to handle dialog close event.
+ * \param widget Widget (dialog).
+ * \param event  Event object.
+ * \param data   User data.
+ */
 static gint imp_ldif_delete_event( GtkWidget *widget, GdkEventAny *event, gpointer data ) {
        imp_ldif_cancel( widget, data );
        return TRUE;
 }
 
-static void imp_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
-       if (event && event->keyval == GDK_Escape) {
+/**
+ * Callback function to respond to dialog key press events.
+ * \param widget Widget.
+ * \param event  Event object.
+ * \param data   User data.
+ */
+static gboolean imp_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                imp_ldif_cancel( widget, data );
        }
+       return FALSE;
 }
 
+/**
+ * Format notebook "file" page.
+ * \param pageNum Page (tab) number.
+ * \param pageLbl Page (tab) label.
+ */
 static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
        GtkWidget *vbox;
        GtkWidget *table;
        GtkWidget *label;
-       GtkWidget *file_entry;
-       GtkWidget *name_entry;
-       GtkWidget *file_btn;
+       GtkWidget *entryFile;
+       GtkWidget *entryName;
+       GtkWidget *btnFile;
        gint top;
 
        vbox = gtk_vbox_new(FALSE, 8);
@@ -562,10 +543,14 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
                GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       name_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1),
+       entryName = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entryName, 1, 2, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
+       CLAWS_SET_TIP(entryName, _( 
+               "Specify the name for the address book that will " \
+               "be created from the LDIF file data." ));
+
        /* Second row */
        top = 1;
        label = gtk_label_new(_("File Name"));
@@ -573,45 +558,114 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
                GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       file_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1),
+       entryFile = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entryFile, 1, 2, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
-       file_btn = gtk_button_new_with_label( _(" ... "));
-       gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1),
+       CLAWS_SET_TIP(entryFile,
+               _( "The full file specification of the LDIF file to import." ));
+
+       btnFile = gtkut_get_browse_file_btn(_("B_rowse"));
+       gtk_table_attach(GTK_TABLE(table), btnFile, 2, 3, top, (top + 1),
                GTK_FILL, 0, 3, 0);
 
+       CLAWS_SET_TIP(btnFile,
+               _( "Select the LDIF file to import." ));
+
        gtk_widget_show_all(vbox);
 
        /* Button handler */
-       gtk_signal_connect(GTK_OBJECT(file_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_ldif_file_select), NULL);
+       g_signal_connect(G_OBJECT(btnFile), "clicked",
+                        G_CALLBACK(imp_ldif_file_select), NULL);
+
+       impldif_dlg.entryFile = entryFile;
+       impldif_dlg.entryName = entryName;
 
-       impldif_dlg.file_entry = file_entry;
-       impldif_dlg.name_entry = name_entry;
 }
 
+static void imp_ldif_field_list_cursor_changed(GtkTreeView *view,
+               gpointer user_data)
+{
+       Ldif_FieldRec *rec;
+
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryAttrib), "" );
+
+       rec = gtkut_tree_view_get_selected_pointer(view, FIELD_COL_PTR,
+                       NULL, NULL, NULL);
+
+       if( rec != NULL) {
+               /* Update widget contents */
+               gtk_label_set_text(
+                       GTK_LABEL(impldif_dlg.entryField), rec->tagName );
+               if( rec->userName )
+                       gtk_entry_set_text(
+                               GTK_ENTRY(impldif_dlg.entryAttrib), rec->userName );
+               gtk_toggle_button_set_active(
+                       GTK_TOGGLE_BUTTON(impldif_dlg.checkSelect),
+                       rec->selected );
+
+               /* Disable widgets for reserved fields */
+               gtk_widget_set_sensitive(
+                       impldif_dlg.entryAttrib, ! rec->reserved );
+               gtk_widget_set_sensitive(
+                       impldif_dlg.checkSelect, ! rec->reserved );
+               gtk_widget_set_sensitive(
+                       impldif_dlg.btnModify,   ! rec->reserved );
+       }
+       gtk_widget_grab_focus(impldif_dlg.entryAttrib);
+}
+
+static void imp_ldif_field_list_row_activated(GtkTreeView *view,
+               GtkTreePath *path, GtkTreeViewColumn *col,
+               gpointer user_data)
+{
+       GtkTreeModel *model = gtk_tree_view_get_model(view);
+       GtkTreeIter iter;
+       gboolean ok;
+       Ldif_FieldRec *rec;
+
+       ok = gtk_tree_model_get_iter(model, &iter, path);
+       if (!ok) {
+               return; /* Huh? */
+       }
+
+       gtk_tree_model_get(model, &iter, FIELD_COL_PTR, &rec, -1);
+       cm_return_if_fail(rec != NULL);
+
+       /* Flip the "selected" state for the record, and update the
+        * "selected" column in the list view, as well as the
+        * "selected" checkbox. */
+       ldif_field_toggle(rec);
+       gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+                       FIELD_COL_SELECT, rec->selected ? markxpm : NULL, -1);
+       gtk_toggle_button_set_active(
+               GTK_TOGGLE_BUTTON(impldif_dlg.checkSelect),
+               rec->selected );
+}
+
+/**
+ * Format notebook fields page.
+ * \param pageNum Page (tab) number.
+ * \param pageLbl Page (tab) label.
+ */
 static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
        GtkWidget *vbox;
        GtkWidget *vboxt;
        GtkWidget *vboxb;
-       GtkWidget *buttonMod;
-
        GtkWidget *table;
        GtkWidget *label;
-       GtkWidget *clist_swin;
-       GtkWidget *clist_field;
-       GtkWidget *name_ldif;
-       GtkWidget *name_attrib;
-       GtkWidget *check_select;
+       GtkWidget *scrollwin;
+       GtkWidget *view_fields;
+       GtkWidget *entryField;
+       GtkWidget *entryAttrib;
+       GtkWidget *checkSelect;
+       GtkWidget *btnModify;
+       GtkWidget *eventBox;
        gint top;
-
-       gchar *titles[ FIELDS_N_COLS ];
-       gint i;
-
-       titles[ FIELD_COL_SELECT ] = _("S");
-       titles[ FIELD_COL_FIELD  ] = _("LDIF Field");
-       titles[ FIELD_COL_ATTRIB ] = _("Attribute Name");
+       GtkListStore *store;
+       GtkCellRenderer *rdr;
+       GtkTreeViewColumn *col;
+       GtkTreeSelection *sel;
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add( GTK_CONTAINER( impldif_dlg.notebook ), vbox );
@@ -628,24 +682,48 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
        vboxt = gtk_vbox_new( FALSE, 4 );
        gtk_container_add( GTK_CONTAINER( vbox ), vboxt );
 
-       clist_swin = gtk_scrolled_window_new( NULL, NULL );
-       gtk_container_add( GTK_CONTAINER(vboxt), clist_swin );
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
+       scrollwin = gtk_scrolled_window_new( NULL, NULL );
+       gtk_container_add( GTK_CONTAINER(vboxt), scrollwin );
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-
-       clist_field = gtk_clist_new_with_titles( FIELDS_N_COLS, titles );
-       gtk_container_add( GTK_CONTAINER(clist_swin), clist_field );
-       gtk_clist_set_selection_mode( GTK_CLIST(clist_field), GTK_SELECTION_BROWSE );
-       gtk_clist_set_column_width(
-                       GTK_CLIST(clist_field), FIELD_COL_SELECT, FIELDS_COL_WIDTH_SELECT );
-       gtk_clist_set_column_width(
-                       GTK_CLIST(clist_field), FIELD_COL_FIELD, FIELDS_COL_WIDTH_FIELD );
-       gtk_clist_set_column_width(
-                       GTK_CLIST(clist_field), FIELD_COL_ATTRIB, FIELDS_COL_WIDTH_ATTRIB );
-
-       for( i = 0; i < FIELDS_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_field)->column[i].button, GTK_CAN_FOCUS);
+                                      GTK_POLICY_AUTOMATIC);
+
+       store = gtk_list_store_new(FIELDS_N_COLS,
+                       GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
+                       G_TYPE_STRING, G_TYPE_STRING,
+                       G_TYPE_POINTER,
+                       -1);
+
+       view_fields = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+       g_object_unref(store);
+       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view_fields), TRUE);
+       gtk_tree_view_set_reorderable(GTK_TREE_VIEW(view_fields), FALSE);
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view_fields));
+       gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
+
+       rdr = gtk_cell_renderer_pixbuf_new();
+       col = gtk_tree_view_column_new_with_attributes(_("R"), rdr,
+                       "pixbuf", FIELD_COL_RESERVED, NULL);
+       gtk_tree_view_column_set_min_width(col, FIELD_COL_RESERVED);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(view_fields), col);
+
+       col = gtk_tree_view_column_new_with_attributes(_("S"), rdr,
+                       "pixbuf", FIELD_COL_SELECT, NULL);
+       gtk_tree_view_column_set_min_width(col, FIELD_COL_SELECT);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(view_fields), col);
+
+       rdr = gtk_cell_renderer_text_new();
+       col = gtk_tree_view_column_new_with_attributes(_("LDIF Field Name"), rdr,
+                       "markup", FIELD_COL_FIELD, NULL);
+       gtk_tree_view_column_set_min_width(col, FIELD_COL_FIELD);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(view_fields), col);
+
+       col = gtk_tree_view_column_new_with_attributes(_("Attribute Name"), rdr,
+                       "markup", FIELD_COL_ATTRIB, NULL);
+       gtk_tree_view_column_set_min_width(col, FIELD_COL_ATTRIB);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(view_fields), col);
+
+       gtk_container_add( GTK_CONTAINER(scrollwin), view_fields );
 
        /* Lower area - Edit area */
        vboxb = gtk_vbox_new( FALSE, 4 );
@@ -664,53 +742,83 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
                GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       name_ldif = gtk_label_new( "" );
-       gtk_misc_set_alignment(GTK_MISC(name_ldif), 0.01, 0.5);
-       gtk_table_attach(GTK_TABLE(table), name_ldif, 1, 3, top, (top + 1),
+       entryField = gtk_label_new( "" );
+       gtk_misc_set_alignment(GTK_MISC(entryField), 0.01, 0.5);
+       gtk_table_attach(GTK_TABLE(table), entryField, 1, 3, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
        /* Second row */
        ++top;
        label = gtk_label_new(_("Attribute"));
-       gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1),
-               GTK_FILL, 0, 0, 0);
+       /*
+        * Use an event box to attach some help in the form of a tooltip.
+        * Tried this for the clist but it looked bad.
+        */
+       eventBox = gtk_event_box_new();
+       gtk_container_add( GTK_CONTAINER(eventBox), label );
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(table), eventBox, 0, 1, top, (top + 1),
+               GTK_FILL, 0, 0, 0);
 
-       name_attrib = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), name_attrib, 1, 3, top, (top + 1),
+       CLAWS_SET_TIP(eventBox, _(
+               "Choose the LDIF field that will be renamed or selected " \
+               "for import in the list above. Reserved fields (marked " \
+               "with a tick in the \"R\" column), are automatically " \
+               "imported and cannot be renamed. A single click in the " \
+               "Select (\"S\") column will select the field for import " \
+               "with a tick. A single click anywhere in the row will " \
+               "select that field for rename in the input area below " \
+               "the list. A double click anywhere in the row will also " \
+               "select the field for import."));
+
+       entryAttrib = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entryAttrib, 1, 3, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
+       CLAWS_SET_TIP(entryAttrib,
+               _( "The LDIF field can be renamed to the User Attribute name." ));
+
        /* Next row */
        ++top;
-       label = gtk_label_new(_("Select"));
-       gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1),
-               GTK_FILL, 0, 0, 0);
-       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       check_select = gtk_check_button_new();
-       gtk_table_attach(GTK_TABLE(table), check_select, 1, 2, top, (top + 1),
+       checkSelect = gtk_check_button_new_with_label( _( "Select for Import" ) );
+       gtk_table_attach(GTK_TABLE(table), checkSelect, 1, 2, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
-       buttonMod = gtk_button_new_with_label( _("Modify"));
-       gtk_table_attach(GTK_TABLE(table), buttonMod, 2, 3, top, (top + 1),
+       CLAWS_SET_TIP(checkSelect,
+               _( "Select the LDIF field for import into the address book." ));
+
+       btnModify = gtk_button_new_with_label( _(" Modify "));
+       gtk_table_attach(GTK_TABLE(table), btnModify, 2, 3, top, (top + 1),
                GTK_FILL, 0, 3, 0);
 
+       CLAWS_SET_TIP(btnModify,
+               _( "This button will update the list above with the data supplied." ));
+
        gtk_widget_show_all(vbox);
 
        /* Event handlers */
-       gtk_signal_connect( GTK_OBJECT(clist_field), "select_row",
-                       GTK_SIGNAL_FUNC(imp_ldif_field_list_selected), NULL );
-       gtk_signal_connect( GTK_OBJECT(clist_field), "button_press_event",
-                       GTK_SIGNAL_FUNC(imp_ldif_field_list_toggle), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonMod), "clicked",
-                       GTK_SIGNAL_FUNC(imp_ldif_modify_pressed), NULL );
-
-       impldif_dlg.clist_field  = clist_field;
-       impldif_dlg.name_ldif    = name_ldif;
-       impldif_dlg.name_attrib  = name_attrib;
-       impldif_dlg.check_select = check_select;
+       g_signal_connect(G_OBJECT(view_fields), "cursor-changed",
+                       G_CALLBACK(imp_ldif_field_list_cursor_changed), NULL);
+       g_signal_connect(G_OBJECT(view_fields), "row-activated",
+                       G_CALLBACK(imp_ldif_field_list_row_activated), NULL);
+       g_signal_connect(G_OBJECT(btnModify), "clicked",
+                       G_CALLBACK(imp_ldif_modify_pressed), NULL );
+       g_signal_connect(G_OBJECT(entryAttrib), "activate",
+                       G_CALLBACK(imp_ldif_entryattrib_activate), NULL);
+
+       impldif_dlg.view_fields = view_fields;
+       impldif_dlg.entryField  = entryField;
+       impldif_dlg.entryAttrib = entryAttrib;
+       impldif_dlg.checkSelect = checkSelect;
+       impldif_dlg.btnModify   = btnModify;
 }
 
+/**
+ * Format notebook finish page.
+ * \param pageNum Page (tab) number.
+ * \param pageLbl Page (tab) label.
+ */
 static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
        GtkWidget *vbox;
        GtkWidget *table;
@@ -735,11 +843,11 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
        gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
        gtk_table_set_row_spacings(GTK_TABLE(table), 8);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8 );
+       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        /* First row */
        top = 0;
-       label = gtk_label_new(_("Address Book :"));
+       label = gtk_label_new( _( "Address Book:" ) );
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
 
@@ -749,7 +857,7 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
 
        /* Second row */
        top++;
-       label = gtk_label_new(_("File Name :"));
+       label = gtk_label_new( _( "File Name:" ) );
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
 
@@ -759,7 +867,7 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
 
        /* Third row */
        top++;
-       label = gtk_label_new(_("Records :"));
+       label = gtk_label_new( _("Records Imported:") );
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
 
@@ -772,6 +880,9 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
        impldif_dlg.labelRecords = labelRecs;
 }
 
+/**
+ * Create main dialog decorations (excluding notebook pages).
+ */
 static void imp_ldif_dialog_create() {
        GtkWidget *window;
        GtkWidget *vbox;
@@ -780,22 +891,23 @@ static void imp_ldif_dialog_create() {
        GtkWidget *hbbox;
        GtkWidget *btnPrev;
        GtkWidget *btnNext;
+       GtkWidget *btnProceed;
        GtkWidget *btnCancel;
        GtkWidget *hsbox;
        GtkWidget *statusbar;
 
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_widget_set_usize(window, IMPORTLDIF_WIDTH, IMPORTLDIF_HEIGHT );
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "importldif");
+       gtk_widget_set_size_request(window, IMPORTLDIF_WIDTH, IMPORTLDIF_HEIGHT );
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Import LDIF file into Address Book") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(imp_ldif_delete_event),
-                          NULL );
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(imp_ldif_key_pressed),
-                          NULL );
+       gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(imp_ldif_delete_event),
+                        NULL );
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(imp_ldif_key_pressed),
+                        NULL );
 
        vbox = gtk_vbox_new(FALSE, 4);
        gtk_widget_show(vbox);
@@ -820,20 +932,31 @@ static void imp_ldif_dialog_create() {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_button_set_create(&hbbox, &btnPrev, _( "Prev" ),
-                               &btnNext, _( "Next" ),
-                               &btnCancel, _( "Cancel" ) );
+       gtkut_stock_button_set_create(&hbbox,
+                                     &btnCancel, GTK_STOCK_CANCEL, 
+                                     &btnPrev, GTK_STOCK_GO_BACK,
+                                     &btnNext, GTK_STOCK_GO_FORWARD);
+
+       btnProceed = gtk_button_new_with_mnemonic(_("Proceed"));
+       gtk_button_set_image(GTK_BUTTON(btnProceed),
+                       gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
+       gtk_widget_set_can_default(btnProceed, TRUE);
+       gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
+       gtk_widget_hide(btnProceed);
+
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
        gtk_widget_grab_default(btnNext);
 
        /* Button handlers */
-       gtk_signal_connect(GTK_OBJECT(btnPrev), "clicked",
-                          GTK_SIGNAL_FUNC(imp_ldif_prev), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnNext), "clicked",
-                          GTK_SIGNAL_FUNC(imp_ldif_next), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnCancel), "clicked",
-                          GTK_SIGNAL_FUNC(imp_ldif_cancel), NULL);
+       g_signal_connect(G_OBJECT(btnPrev), "clicked",
+                        G_CALLBACK(imp_ldif_prev), NULL);
+       g_signal_connect(G_OBJECT(btnNext), "clicked",
+                        G_CALLBACK(imp_ldif_next), NULL);
+       g_signal_connect(G_OBJECT(btnProceed), "clicked",
+                        G_CALLBACK(imp_ldif_next), NULL);
+       g_signal_connect(G_OBJECT(btnCancel), "clicked",
+                        G_CALLBACK(imp_ldif_cancel), NULL);
 
        gtk_widget_show_all(vbox);
 
@@ -841,6 +964,7 @@ static void imp_ldif_dialog_create() {
        impldif_dlg.notebook   = notebook;
        impldif_dlg.btnPrev    = btnPrev;
        impldif_dlg.btnNext    = btnNext;
+       impldif_dlg.btnProceed = btnProceed;
        impldif_dlg.btnCancel  = btnCancel;
        impldif_dlg.statusbar  = statusbar;
        impldif_dlg.status_cid = gtk_statusbar_get_context_id(
@@ -848,6 +972,9 @@ static void imp_ldif_dialog_create() {
 
 }
 
+/**
+ * Create import LDIF dialog.
+ */
 static void imp_ldif_create() {
        imp_ldif_dialog_create();
        imp_ldif_page_file( PAGE_FILE_INFO, _( "File Info" ) );
@@ -856,31 +983,48 @@ static void imp_ldif_create() {
        gtk_widget_show_all( impldif_dlg.window );
 }
 
+/**
+ * Import LDIF file.
+ * \param  addrIndex Address index.
+ * \return Address book file of imported data, or <i>NULL</i> if import
+ *         was cancelled.
+ */
 AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
+       GtkWidget *view;
+       GtkTreeModel *model;
+
        _importedBook_ = NULL;
        _imp_addressIndex_ = addrIndex;
 
        if( ! impldif_dlg.window )
                imp_ldif_create();
+
+       view = impldif_dlg.view_fields;
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+
+       gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
+                            GTK_STOCK_CANCEL);
+       gtk_widget_hide(impldif_dlg.btnProceed);
+       gtk_widget_show(impldif_dlg.btnNext);
+
        impldif_dlg.cancelled = FALSE;
        gtk_widget_show(impldif_dlg.window);
        manage_window_set_transient(GTK_WINDOW(impldif_dlg.window));
        gtk_widget_grab_default(impldif_dlg.btnNext);
-
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.name_entry), IMPORTLDIF_GUESS_NAME );
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.file_entry), "" );
-       gtk_label_set_text( GTK_LABEL(impldif_dlg.name_ldif), "" );
-       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.name_attrib), "" );
-       gtk_clist_clear( GTK_CLIST(impldif_dlg.clist_field) );
-       gtk_notebook_set_page( GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
+       gtk_window_set_modal(GTK_WINDOW(impldif_dlg.window), TRUE);
+
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryName), IMPORTLDIF_GUESS_NAME );
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryFile), "" );
+       gtk_label_set_text( GTK_LABEL(impldif_dlg.entryField), "" );
+       gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryAttrib), "" );
+       gtk_list_store_clear( GTK_LIST_STORE(model) );
+       gtk_notebook_set_current_page( GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
        gtk_widget_set_sensitive( impldif_dlg.btnNext, TRUE );
-       stock_pixmap_gdk( impldif_dlg.window, STOCK_PIXMAP_MARK,
-                         &markxpm, &markxpmmask );
+       stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm );
        imp_ldif_message();
-       gtk_widget_grab_focus(impldif_dlg.file_entry);
+       gtk_widget_grab_focus(impldif_dlg.entryFile);
 
-       impldif_dlg.rowIndSelect = -1;
        impldif_dlg.rowCount = 0;
        g_free( impldif_dlg.nameBook );
        g_free( impldif_dlg.fileName );
@@ -890,6 +1034,7 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
        _ldifFile_ = ldif_create();
        gtk_main();
        gtk_widget_hide(impldif_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(impldif_dlg.window), FALSE);
        ldif_free( _ldifFile_ );
        _ldifFile_ = NULL;
        _imp_addressIndex_ = NULL;
@@ -904,6 +1049,8 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
 }
 
 /*
-* End of Source.
-*/
+ * ============================================================================
+ * End of Source.
+ * ============================================================================
+ */