remove space in front of colon

[claws.git] / src / importldif.c

diff --git a/src/importldif.c b/src/importldif.c
index fc03fcaced3f97612bedf978408c2b7eb3c3e3dd..242edd931838e76cc00773fcb3d7800205cd90df 100644 (file)
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2009 Match Grun and the Claws Mail team
+ * 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 /*
@@ -23,6 +22,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -335,7 +335,8 @@ static gboolean imp_ldif_field_list_toggle(
                        gint y = event->y;
                        gint row, col;
 
-                       gtk_cmclist_get_selection_info( clist, x, y, &row, &col );
+                       if (!gtk_cmclist_get_selection_info( clist, x, y, &row, &col ))
+                               return FALSE;
                        if( col != FIELD_COL_SELECT ) return FALSE;
                        if( row > impldif_dlg.rowCount ) return FALSE;
 
@@ -432,10 +433,10 @@ static gboolean imp_ldif_file_move() {
        gboolean errFlag = FALSE;
 
        sFile = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.entryFile), 0, -1 );
-       g_strchug( sFile ); g_strchomp( sFile );
+       g_strstrip( sFile );
 
        sName = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.entryName), 0, -1 );
-       g_strchug( sName ); g_strchomp( sName );
+       g_strstrip( sName );
 
        g_free( impldif_dlg.nameBook );
        g_free( impldif_dlg.fileName );
@@ -613,7 +614,7 @@ static gint imp_ldif_delete_event( GtkWidget *widget, GdkEventAny *event, gpoint
  * \param data   User data.
  */
 static gboolean imp_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                imp_ldif_cancel( widget, data );
        }
        return FALSE;
@@ -631,7 +632,6 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
        GtkWidget *entryFile;
        GtkWidget *entryName;
        GtkWidget *btnFile;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new(FALSE, 8);
@@ -717,7 +717,6 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
        GtkWidget *checkSelect;
        GtkWidget *btnModify;
        GtkWidget *eventBox;
-       CLAWS_TIP_DECL();
        gint top;
 
        gchar *titles[ FIELDS_N_COLS ];
@@ -764,9 +763,9 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
 
        /* Remove focus capability for column headers */
        for( i = 0; i < FIELDS_N_COLS; i++ ) {
-               GTK_WIDGET_UNSET_FLAGS(
+               gtkut_widget_set_can_focus(
                        GTK_CMCLIST(clist_field)->column[i].button,
-                       GTK_CAN_FOCUS);
+                       FALSE);
        }
 
        /* Lower area - Edit area */
@@ -889,7 +888,7 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
 
        /* 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);
 
@@ -899,7 +898,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);
 
@@ -909,7 +908,7 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) {
 
        /* Third row */
        top++;
-       label = gtk_label_new( _("Records Imported :") );
+       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);
 
@@ -981,7 +980,7 @@ static void imp_ldif_dialog_create() {
        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_FLAGS(btnProceed, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(btnProceed, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
        gtk_widget_hide(btnProceed);