/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2007 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
#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 "utils.h"
#include "prefs_common.h"
}
static gboolean edit_book_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();
}
t = addrbook_test_read_file( abf, abf->fileName );
if( t == MGU_SUCCESS ) {
- sMsg = _("File appears to be Ok.");
+ sMsg = _("File appears to be OK.");
}
else if( t == MGU_BAD_FORMAT ) {
sMsg = _("File does not appear to be a valid address book format.");
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
gtk_window_set_title(GTK_WINDOW(window), _("Edit Addressbook"));
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(edit_book_delete_event),
cancelled);
gtk_widget_grab_focus(addrbookedit_dlg.name_entry);
gtk_widget_show(addrbookedit_dlg.window);
manage_window_set_transient(GTK_WINDOW(addrbookedit_dlg.window));
+ gtk_window_set_modal(GTK_WINDOW(addrbookedit_dlg.window), TRUE);
edit_book_status_show( "" );
gtk_label_set_text( GTK_LABEL(addrbookedit_dlg.file_label), "" );
gtk_main();
gtk_widget_hide(addrbookedit_dlg.window);
-
+ gtk_window_set_modal(GTK_WINDOW(addrbookedit_dlg.window), FALSE);
if( cancelled == TRUE ) {
if( newBook ) {
addrbook_free_book( abf );