More Coverity fixes

[claws.git] / src / importldif.c

diff --git a/src/importldif.c b/src/importldif.c
index 03a9dbd40cf01f0ed2a2734f7286c3d075b520c9..e8db5b64f12231e401a41c86ba05036b5e367657 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
+ * Copyright (C) 2001-2012 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
@@ -23,6 +23,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -335,7 +336,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;
 
@@ -613,7 +615,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 +633,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 +718,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 +764,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 */
@@ -943,7 +943,6 @@ static void imp_ldif_dialog_create() {
        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); 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(imp_ldif_delete_event),
                         NULL );
@@ -982,7 +981,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);
 
@@ -1047,6 +1046,7 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
        gtk_widget_show(impldif_dlg.window);
        manage_window_set_transient(GTK_WINDOW(impldif_dlg.window));
        gtk_widget_grab_default(impldif_dlg.btnNext);
+       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), "" );
@@ -1071,6 +1071,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;