/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 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,
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 <gtk/gtk.h>
#include "addrbook.h"
#include "addressbook.h"
/*
* Edit functions.
*/
-void imp_mutt_status_show( gchar *msg ) {
+static void imp_mutt_status_show( gchar *msg ) {
if( impmutt_dlg.statusbar != NULL ) {
gtk_statusbar_pop( GTK_STATUSBAR(impmutt_dlg.statusbar), impmutt_dlg.status_cid );
if( msg ) {
addrbook_free_book( abf );
}
+ mutt_free(mdf);
+
return retVal;
}
gboolean errFlag = FALSE;
sFile = gtk_editable_get_chars( GTK_EDITABLE(impmutt_dlg.file_entry), 0, -1 );
- g_strchug( sFile ); g_strchomp( sFile );
+ g_strstrip( sFile );
gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.file_entry), sFile );
sName = gtk_editable_get_chars( GTK_EDITABLE(impmutt_dlg.name_entry), 0, -1 );
- g_strchug( sName ); g_strchomp( sName );
+ g_strstrip( sName );
gtk_entry_set_text( GTK_ENTRY(impmutt_dlg.name_entry), sName );
if( *sFile == '\0'|| strlen( sFile ) < 1 ) {
}
static gboolean imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
GtkWidget *file_entry;
GtkWidget *name_entry;
GtkWidget *hbbox;
- GtkWidget *hsep;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GtkWidget *file_btn;
GtkWidget *hsbox;
gint top;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "importmutt");
gtk_widget_set_size_request(window, 450, -1);
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
gtk_window_set_title( GTK_WINDOW(window), _("Import MUTT file into Address Book") );
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(imp_mutt_delete_event), cancelled);
g_signal_connect(G_OBJECT(window), "key_press_event",
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
+ gtk_container_set_border_width( GTK_CONTAINER(hbbox), 5);
gtk_widget_grab_default(ok_btn);
- hsep = gtk_hseparator_new();
- gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
-
g_signal_connect(G_OBJECT(ok_btn), "clicked",
G_CALLBACK(imp_mutt_ok), cancelled);
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
gtk_widget_grab_focus(impmutt_dlg.file_entry);
gtk_widget_show(impmutt_dlg.window);
manage_window_set_transient(GTK_WINDOW(impmutt_dlg.window));
+ gtk_window_set_modal(GTK_WINDOW(impmutt_dlg.window), TRUE);
imp_mutt_status_show( _( "Please select a file to import." ) );
muttFile = mutt_find_file();
gtk_main();
gtk_widget_hide(impmutt_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(impmutt_dlg.window), FALSE);
_imp_addressIndex_ = NULL;
if (cancelled == TRUE) return NULL;