2009-07-28 [colin] 3.7.2cvs15
authorColin Leroy <colin@colino.net>
Tue, 28 Jul 2009 18:42:52 +0000 (18:42 +0000)
committerColin Leroy <colin@colino.net>
Tue, 28 Jul 2009 18:42:52 +0000 (18:42 +0000)
* src/account.c
* src/addrcustomattr.c
* src/addressadd.c
* src/addressbook_foldersel.c
* src/addrgather.c
* src/browseldap.c
* src/compose.c
* src/editbook.c
* src/editgroup.c
* src/editjpilot.c
* src/editldap.c
* src/editldap_basedn.c
* src/edittags.c
* src/editvcard.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/export.c
* src/foldersel.c
* src/import.c
* src/importldif.c
* src/importmutt.c
* src/importpine.c
* src/prefs_actions.c
* src/prefs_customheader.c
* src/prefs_display_header.c
* src/prefs_filtering.c
* src/prefs_folder_column.c
* src/prefs_matcher.c
* src/prefs_summary_column.c
* src/prefs_summary_open.c
* src/prefs_template.c
* src/textview.c
* src/uri_opener.c
Fix bug 1950, 'Program freeze up during folder selection'
Don't leave hidden windows modal

36 files changed:
ChangeLog
PATCHSETS
configure.ac
src/account.c
src/addrcustomattr.c
src/addressadd.c
src/addressbook_foldersel.c
src/addrgather.c
src/browseldap.c
src/compose.c
src/editbook.c
src/editgroup.c
src/editjpilot.c
src/editldap.c
src/editldap_basedn.c
src/edittags.c
src/editvcard.c
src/exphtmldlg.c
src/expldifdlg.c
src/export.c
src/foldersel.c
src/import.c
src/importldif.c
src/importmutt.c
src/importpine.c
src/prefs_actions.c
src/prefs_customheader.c
src/prefs_display_header.c
src/prefs_filtering.c
src/prefs_folder_column.c
src/prefs_matcher.c
src/prefs_summary_column.c
src/prefs_summary_open.c
src/prefs_template.c
src/textview.c
src/uri_opener.c

index 5abba43ac6228e41e615e79bf176b3a5500a53a6..85dc4fc06563e6d254a3ce52fd8bc39aa4aee4b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2009-07-28 [colin]     3.7.2cvs15
+
+       * src/account.c
+       * src/addrcustomattr.c
+       * src/addressadd.c
+       * src/addressbook_foldersel.c
+       * src/addrgather.c
+       * src/browseldap.c
+       * src/compose.c
+       * src/editbook.c
+       * src/editgroup.c
+       * src/editjpilot.c
+       * src/editldap.c
+       * src/editldap_basedn.c
+       * src/edittags.c
+       * src/editvcard.c
+       * src/exphtmldlg.c
+       * src/expldifdlg.c
+       * src/export.c
+       * src/foldersel.c
+       * src/import.c
+       * src/importldif.c
+       * src/importmutt.c
+       * src/importpine.c
+       * src/prefs_actions.c
+       * src/prefs_customheader.c
+       * src/prefs_display_header.c
+       * src/prefs_filtering.c
+       * src/prefs_folder_column.c
+       * src/prefs_matcher.c
+       * src/prefs_summary_column.c
+       * src/prefs_summary_open.c
+       * src/prefs_template.c
+       * src/textview.c
+       * src/uri_opener.c
+               Fix bug 1950, 'Program freeze up during folder selection'
+               Don't leave hidden windows modal
+
 2009-07-28 [colin]     3.7.2cvs14
 
        * src/ldapquery.c
index 550cd996f1b9585c482045e046538b01c0629a4f..d350167f27b8b7533860ee640f4118387de8e8c2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/common/session.c;  ) > 3.7.2cvs12.patchset
 ( cvs diff -u -r 1.395.2.414 -r 1.395.2.415 src/summaryview.c;  ) > 3.7.2cvs13.patchset
 ( cvs diff -u -r 1.3.2.31 -r 1.3.2.32 src/ldapquery.c;  ) > 3.7.2cvs14.patchset
+( cvs diff -u -r 1.61.2.94 -r 1.61.2.95 src/account.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addrcustomattr.c;  cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/addressadd.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.28 -r 1.5.10.29 src/addrgather.c;  cvs diff -u -r 1.2.4.23 -r 1.2.4.24 src/browseldap.c;  cvs diff -u -r 1.382.2.518 -r 1.382.2.519 src/compose.c;  cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editbook.c;  cvs diff -u -r 1.11.2.23 -r 1.11.2.24 src/editgroup.c;  cvs diff -u -r 1.5.12.16 -r 1.5.12.17 src/editjpilot.c;  cvs diff -u -r 1.8.2.35 -r 1.8.2.36 src/editldap.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/editldap_basedn.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/edittags.c;  cvs diff -u -r 1.5.12.15 -r 1.5.12.16 src/editvcard.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/expldifdlg.c;  cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/export.c;  cvs diff -u -r 1.26.2.43 -r 1.26.2.44 src/foldersel.c;  cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/import.c;  cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/importldif.c;  cvs diff -u -r 1.4.12.20 -r 1.4.12.21 src/importmutt.c;  cvs diff -u -r 1.1.14.20 -r 1.1.14.21 src/importpine.c;  cvs diff -u -r 1.60.2.69 -r 1.60.2.70 src/prefs_actions.c;  cvs diff -u -r 1.16.2.38 -r 1.16.2.39 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.37 -r 1.16.2.38 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.79 -r 1.59.2.80 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_folder_column.c;  cvs diff -u -r 1.43.2.80 -r 1.43.2.81 src/prefs_matcher.c;  cvs diff -u -r 1.10.2.25 -r 1.10.2.26 src/prefs_summary_column.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_summary_open.c;  cvs diff -u -r 1.12.2.70 -r 1.12.2.71 src/prefs_template.c;  cvs diff -u -r 1.96.2.219 -r 1.96.2.220 src/textview.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/uri_opener.c;  ) > 3.7.2cvs15.patchset
index 6aebdde11e28766b7ffdf34279d4728ca017e943..9b8691d981aa703d63f3174dc8ed7ce688f7c7c9 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 0c0a512a610a015de85f0fc86899fa457f14de40..6add83573a3d8903b860fa263d355c149d17426d 100644 (file)
@@ -396,7 +396,7 @@ void account_edit_open(gpointer a, gpointer b)
        manage_window_set_transient(GTK_WINDOW(edit_account.window));
        gtk_widget_grab_focus(edit_account.close_btn);
        gtk_widget_show(edit_account.window);
-
+       gtk_window_set_modal(GTK_WINDOW(edit_account.window), TRUE);
        manage_window_focus_in(edit_account.window, NULL, NULL);
 }
 
@@ -698,7 +698,6 @@ static void account_edit_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "account");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        g_signal_connect (G_OBJECT (window), "delete_event",
                          G_CALLBACK (account_delete_event), NULL);
 #ifdef MAEMO
@@ -1215,7 +1214,7 @@ static void account_edit_close(GtkWidget *widget, gpointer data)
                account_flush_state();
 
        gtk_widget_hide(edit_account.window);
-
+       gtk_window_set_modal(GTK_WINDOW(edit_account.window), FALSE);
        inc_unlock();
 }
 
index 74f00170d2ffd4300b69ed9d21aae980d5769737..bca491c1fd7fcce5e42a39056e7fc9b1b6b12ff9 100644 (file)
@@ -299,6 +299,7 @@ static void custom_attr_window_close(void)
                custom_attr_window_save_list();
        custom_attr_window_list_view_clear_list(custom_attr_window.attr_list, FALSE);
        gtk_widget_hide(custom_attr_window.window);
+       gtk_window_set_modal(GTK_WINDOW(custom_attr_window.window), FALSE);
        if (dirty && !prefs_common.addressbook_use_editaddress_dialog)
                addressbook_edit_reload_attr_list();
 }
index ced28adb2c477d739a6fb899802c20235903a062..afd743892a9272320dbac04fd9c5455739d1eac0 100644 (file)
@@ -158,7 +158,6 @@ static void addressadd_create( void ) {
        gtk_container_set_border_width( GTK_CONTAINER(window), VBOX_BORDER );
        gtk_window_set_title( GTK_WINDOW(window), _("Add to address book") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
-       gtk_window_set_modal( GTK_WINDOW(window), TRUE );
        g_signal_connect( G_OBJECT(window), "delete_event",
                          G_CALLBACK(addressadd_delete_event), NULL );
        g_signal_connect( G_OBJECT(window), "key_press_event",
@@ -377,14 +376,15 @@ gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
        addressadd_cancelled = FALSE;
 
        if( ! addressadd_dlg.window ) addressadd_create();
-       gtk_widget_grab_focus(addressadd_dlg.ok_btn);
-       gtk_widget_show(addressadd_dlg.window);
-       manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
 
        addressadd_dlg.fiSelected = NULL;
        addressadd_load_data( addrIndex );
        gtk_cmclist_select_row( GTK_CMCLIST( addressadd_dlg.tree_folder ), 0, 0 );
        gtk_widget_show(addressadd_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), TRUE);
+       gtk_widget_grab_focus(addressadd_dlg.ok_btn);
+
+       manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
 
        gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_name ), "" );
        gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), "" );
@@ -403,7 +403,7 @@ gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
        }
        gtk_main();
        gtk_widget_hide( addressadd_dlg.window );
-
+       gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), FALSE);
        if( ! addressadd_cancelled ) {
                if( addressadd_dlg.fiSelected ) {
                        gchar *returned_name;
index 59aceca68facb4f05e2222b28f02bd5359f69db5..cc640ec34c72b4387de3f7bb904c603908555c9c 100644 (file)
@@ -156,7 +156,6 @@ static void addressbook_foldersel_create( void )
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Select Address Book Folder") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
-       gtk_window_set_modal( GTK_WINDOW(window), TRUE );
        g_signal_connect( G_OBJECT(window), "delete_event",
                          G_CALLBACK(addressbook_foldersel_delete_event), NULL );
        g_signal_connect( G_OBJECT(window), "key_press_event",
@@ -382,7 +381,8 @@ gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
        gtk_widget_grab_focus(addressbook_foldersel_dlg.ok_btn);
        gtk_widget_show(addressbook_foldersel_dlg.window);
        manage_window_set_transient(GTK_WINDOW(addressbook_foldersel_dlg.window));
-
+       gtk_window_set_modal(GTK_WINDOW(addressbook_foldersel_dlg.window), TRUE);
+       
        addressbook_foldersel_dlg.fiSelected = NULL;
 
        /* split the folder path we've received, we'll try to match this path, subpath by
@@ -414,7 +414,7 @@ gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
 
        gtk_main();
        gtk_widget_hide( addressbook_foldersel_dlg.window );
-
+       gtk_window_set_modal(GTK_WINDOW(addressbook_foldersel_dlg.window), FALSE);
        if ( ! addressbook_foldersel_cancelled ) {
 
                *book = NULL;
index 6fc81ff60af06c2cf9c559538aa53a80ca98d875..a7f8f5b85a5626cce2288e8fad7d9f06f6cc6c8d 100644 (file)
@@ -423,7 +423,6 @@ static void addrgather_dlg_create(void)
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(addrgather_dlg_delete_event), NULL);
@@ -529,7 +528,7 @@ AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *ad
 
        addrgather_dlg_status_show("");
        gtk_widget_show(addrgather_dlg.window);
-
+       gtk_window_set_modal(GTK_WINDOW(addrgather_dlg.window), TRUE);
        gtk_widget_grab_focus(addrgather_dlg.entryBook);
        manage_window_set_transient(GTK_WINDOW(addrgather_dlg.window));
        gtk_main();
@@ -537,6 +536,7 @@ AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *ad
        g_free(addrgather_dlg.folderPath);
        addrgather_dlg.folderPath = NULL;
        gtk_widget_hide(addrgather_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(addrgather_dlg.window), FALSE);
        _harv_addressIndex_ = NULL;
 
        if (addrgather_dlg.cancelled == TRUE)
index 746108a33153fc33edcfdbf06fda4ebd9ee09681..da1d1e2a887a1b0089a5be6f74f16e3bb933e56e 100644 (file)
@@ -216,7 +216,6 @@ static void browse_create( void ) {
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Browse Directory Entry") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
-       gtk_window_set_modal( GTK_WINDOW(window), TRUE );
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(browse_delete_event), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -367,7 +366,7 @@ gboolean browseldap_entry( AddressDataSource *ds, const gchar *dn ) {
        gtk_widget_grab_focus(browseldap_dlg.close_btn);
        gtk_widget_show(browseldap_dlg.window);
        manage_window_set_transient(GTK_WINDOW(browseldap_dlg.window));
-
+       gtk_window_set_modal(GTK_WINDOW(browseldap_dlg.window), TRUE);
        gtk_cmclist_select_row( GTK_CMCLIST( browseldap_dlg.list_entry ), 0, 0 );
        gtk_widget_show(browseldap_dlg.window);
 
@@ -395,7 +394,7 @@ gboolean browseldap_entry( AddressDataSource *ds, const gchar *dn ) {
        /* Display dialog */
        gtk_main();
        gtk_widget_hide( browseldap_dlg.window );
-
+       gtk_window_set_modal(GTK_WINDOW(browseldap_dlg.window), FALSE);
        /* Stop query */
        debug_print("stopping search\n");
        ldaplocate_search_stop( _queryID_ );
index 6fe02040b6311c2d68f239880a4ae950a642d63c..b8f2eb7b62b741c761b5b2bb04284bf08c4b13d2 100644 (file)
@@ -8302,6 +8302,7 @@ static void compose_attach_property(GtkAction *action, gpointer data)
 
        if (!attach_prop.window)
                compose_attach_property_create(&cancelled);
+       gtk_window_set_modal(GTK_WINDOW(attach_prop.window), TRUE);
        gtk_widget_grab_focus(attach_prop.ok_btn);
        gtk_widget_show(attach_prop.window);
        manage_window_set_transient(GTK_WINDOW(attach_prop.window));
@@ -8330,6 +8331,7 @@ static void compose_attach_property(GtkAction *action, gpointer data)
                gtk_main();
 
                gtk_widget_hide(attach_prop.window);
+               gtk_window_set_modal(GTK_WINDOW(attach_prop.window), FALSE);
                
                if (cancelled) 
                        break;
@@ -8433,7 +8435,6 @@ static void compose_attach_property_create(gboolean *cancelled)
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
        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(attach_property_delete_event),
                         cancelled);
index c96eebbdd96184b05bd996e8bc81be83278f60d7..a5535c1f08de1f137a23a7361c7c029165f3da52 100644 (file)
@@ -147,7 +147,6 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
        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); 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(edit_book_delete_event),
                         cancelled);
@@ -247,6 +246,7 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
        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), "" );
@@ -285,7 +285,7 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
 
        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 );
index 378c835625b1ce6331c40f315b3a85e89e72b37c..d3cd3abb0637079ea7910f0452635693aeb736a3 100644 (file)
@@ -292,7 +292,6 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_title(GTK_WINDOW(window), _("Edit Group Data"));
        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(edit_group_delete_event),
                         cancelled);
@@ -499,7 +498,7 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite
        gtk_widget_grab_focus(groupeditdlg.entry_name);
        gtk_widget_show(groupeditdlg.window);
        manage_window_set_transient(GTK_WINDOW(groupeditdlg.window));
-
+       gtk_window_set_modal(GTK_WINDOW(groupeditdlg.window), TRUE);
        /* Clear all fields */
        edit_group_status_show( "" );
        gtk_cmclist_clear( GTK_CMCLIST(groupeditdlg.clist_group) );
@@ -527,7 +526,7 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite
 
        gtk_main();
        gtk_widget_hide( groupeditdlg.window );
-
+       gtk_window_set_modal(GTK_WINDOW(groupeditdlg.window), FALSE);
        if( cancelled ) {
                return NULL;
        }
index 71600d225563b20c0f5a260d123920d7ebbc42bf..d3ee57848ee45cd8eec1c6a5f2ee9fc93e7ef8d1 100644 (file)
@@ -234,7 +234,6 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_title(GTK_WINDOW(window), _("Edit JPilot Entry"));
        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(edit_jpilot_delete_event),
                         cancelled);
@@ -352,7 +351,7 @@ AdapterDSource *addressbook_edit_jpilot( AddressIndex *addrIndex, AdapterDSource
        gtk_widget_grab_focus(jpilotedit.name_entry);
        gtk_widget_show(jpilotedit.window);
        manage_window_set_transient(GTK_WINDOW(jpilotedit.window));
-
+       gtk_window_set_modal(GTK_WINDOW(jpilotedit.window), TRUE);
        edit_jpilot_status_show( "" );
        if( ads ) {
                ds = ads->dataSource;
@@ -378,6 +377,7 @@ AdapterDSource *addressbook_edit_jpilot( AddressIndex *addrIndex, AdapterDSource
 
        gtk_main();
        gtk_widget_hide(jpilotedit.window);
+       gtk_window_set_modal(GTK_WINDOW(jpilotedit.window), FALSE);
        if (cancelled == TRUE) return NULL;
 
        fin = FALSE;
index 5b14658b89d5dc3fa9b1f751d5ee1acf9c44859e..0b223013f0d727a36be77ce1ee7522bc1f3a0c7a 100644 (file)
@@ -334,7 +334,6 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP Server"));
        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(edit_ldap_delete_event),
                         cancelled);
@@ -967,6 +966,7 @@ AdapterDSource *addressbook_edit_ldap(
        gtk_widget_grab_focus(ldapedit.entry_name);
        gtk_widget_show(ldapedit.window);
        manage_window_set_transient(GTK_WINDOW(ldapedit.window));
+       gtk_window_set_modal(GTK_WINDOW(ldapedit.window), TRUE);
 
        edit_ldap_status_show( "" );
        if( ads ) {
@@ -984,6 +984,7 @@ AdapterDSource *addressbook_edit_ldap(
 
        gtk_main();
        gtk_widget_hide(ldapedit.window);
+       gtk_window_set_modal(GTK_WINDOW(ldapedit.window), FALSE);
        if (cancelled == TRUE) return NULL;
 
        sName = gtk_editable_get_chars(
index 1f34288be79e3e0e433f1dc63b79f0f8d2d19aa7..914ee56620cffc4f5304d2f63c9180a78efa3c7c 100644 (file)
@@ -136,7 +136,6 @@ static void edit_ldap_bdn_create(void) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP - Select Search Base"));
        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(edit_ldap_bdn_delete_event), NULL );
        g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -303,7 +302,7 @@ gchar *edit_ldap_basedn_selection( const gchar *hostName, const gint port, gchar
        gtk_widget_grab_focus(ldapedit_basedn.ok_btn);
        gtk_widget_show(ldapedit_basedn.window);
        manage_window_set_transient(GTK_WINDOW(ldapedit_basedn.window));
-
+       gtk_window_set_modal(GTK_WINDOW(ldapedit_basedn.window), TRUE);
        edit_ldap_bdn_status_show( "" );
        edit_ldap_bdn_load_data( hostName, port, tov, bindDN, bindPW, ssl, tls );
        gtk_widget_show(ldapedit_basedn.window);
@@ -312,6 +311,7 @@ gchar *edit_ldap_basedn_selection( const gchar *hostName, const gint port, gchar
 
        gtk_main();
        gtk_widget_hide(ldapedit_basedn.window);
+       gtk_window_set_modal(GTK_WINDOW(ldapedit_basedn.window), FALSE);
        if( ldapedit_basedn_cancelled ) return NULL;
        if( ldapedit_basedn_bad_server ) return NULL;
 
index ecdd091611bc07f2a5f00706a204d378253803e9..4690a1baf47f65f852d28c7be031e598e0c91dcc 100644 (file)
@@ -374,6 +374,7 @@ static void apply_window_close(void)
        APPLYWINDOW_UNLOCK();
        apply_window_list_view_clear_tags(applywindow.taglist);
        gtk_widget_hide(applywindow.window);
+       gtk_window_set_modal(GTK_WINDOW(applywindow.window), FALSE);
 }
 
 static void apply_window_close_cb(GtkWidget *widget,
index fa911b6182f55a51fb523c79ec61fa4a4dfc2555..ec8e02c744e38ce18ca4645d1e83cbe8760b4903 100644 (file)
@@ -150,7 +150,6 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title(GTK_WINDOW(window), _("Edit vCard Entry"));
        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(edit_vcard_delete_event),
                         cancelled);
@@ -244,7 +243,7 @@ AdapterDSource *addressbook_edit_vcard( AddressIndex *addrIndex, AdapterDSource
        gtk_widget_grab_focus(vcardedit.name_entry);
        gtk_widget_show(vcardedit.window);
        manage_window_set_transient(GTK_WINDOW(vcardedit.window));
-
+       gtk_window_set_modal(GTK_WINDOW(vcardedit.window), TRUE);
        edit_vcard_status_show( "" );
        if( ads ) {
                ds = ads->dataSource;
@@ -263,6 +262,7 @@ AdapterDSource *addressbook_edit_vcard( AddressIndex *addrIndex, AdapterDSource
 
        gtk_main();
        gtk_widget_hide(vcardedit.window);
+       gtk_window_set_modal(GTK_WINDOW(vcardedit.window), FALSE);
        if (cancelled == TRUE) return NULL;
 
        fin = FALSE;
index 1c3c123665774e8f1014f88738285aae19fd79d8..def6c5bb17aa8395b1b3868cac30c6ed73d0247d 100644 (file)
@@ -589,7 +589,6 @@ static void export_html_dialog_create( void ) {
        gtk_window_set_title( GTK_WINDOW(window),
                _("Export Address Book to HTML File") );
        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(export_html_delete_event),
                         NULL );
@@ -702,7 +701,7 @@ void addressbook_exp_html( AddressCache *cache ) {
        exphtml_dlg.cancelled = FALSE;
        gtk_widget_show(exphtml_dlg.window);
        manage_window_set_transient(GTK_WINDOW(exphtml_dlg.window));
-
+       gtk_window_set_modal(GTK_WINDOW(exphtml_dlg.window), TRUE);
        gtk_label_set_text( GTK_LABEL(exphtml_dlg.labelBook), cache->name );
        gtk_label_set_text( GTK_LABEL(exphtml_dlg.labelOutBook), cache->name );
        export_html_fill_fields( _exportCtl_ );
@@ -717,6 +716,7 @@ void addressbook_exp_html( AddressCache *cache ) {
 
        gtk_main();
        gtk_widget_hide(exphtml_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(exphtml_dlg.window), FALSE);
        exporthtml_free( _exportCtl_ );
        _exportCtl_ = NULL;
 
index 2678f9147b2296303ee824f0441f0a67a9cb8d3d..0030150a2843867c62d48345da4113bd6c911398 100644 (file)
@@ -654,7 +654,6 @@ static void export_ldif_dialog_create( void ) {
        gtk_window_set_title( GTK_WINDOW(window),
                _("Export Address Book to LDIF File") );
        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(export_ldif_delete_event),
                         NULL );
@@ -768,7 +767,7 @@ void addressbook_exp_ldif( AddressCache *cache ) {
        expldif_dlg.cancelled = FALSE;
        gtk_widget_show(expldif_dlg.window);
        manage_window_set_transient(GTK_WINDOW(expldif_dlg.window));
-
+       gtk_window_set_modal(GTK_WINDOW(expldif_dlg.window), TRUE);
        gtk_label_set_text( GTK_LABEL(expldif_dlg.labelBook), cache->name );
        gtk_label_set_text( GTK_LABEL(expldif_dlg.labelOutBook), cache->name );
        export_ldif_fill_fields( _exportCtl_ );
@@ -783,6 +782,7 @@ void addressbook_exp_ldif( AddressCache *cache ) {
 
        gtk_main();
        gtk_widget_hide(expldif_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(expldif_dlg.window), FALSE);
        exportldif_free( _exportCtl_ );
        _exportCtl_ = NULL;
 
index 2a9cca82016f3fc0888f130a3a94192e081072c9..9063460b2841167a2861aa3928bb32e0318a4549 100644 (file)
@@ -72,6 +72,7 @@ gint export_mbox(FolderItem *default_src)
                gtk_widget_show(window);
        }
 
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        change_dir(claws_get_startup_dir());
 
        if (default_src && default_src->path) {
@@ -92,6 +93,7 @@ gint export_mbox(FolderItem *default_src)
        gtk_main();
 
        gtk_widget_hide(window);
+       gtk_window_set_modal(GTK_WINDOW(window), FALSE);
 
        return export_ok;
 }
@@ -110,7 +112,6 @@ static void export_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Export to mbox file"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
index 5566a199ef2a9efbc783c2f08385cdc6800fc8f3..025912db803ca1db62627c2a8e6bbc148fd8e9ad 100644 (file)
@@ -179,6 +179,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
        gtk_widget_grab_focus(treeview);
 
        gtk_widget_show(window);
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        manage_window_set_transient(GTK_WINDOW(window));
 
        cancelled = finished = FALSE;
@@ -187,6 +188,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
                gtk_main_iteration();
 
        gtk_widget_hide(window);
+       gtk_window_set_modal(GTK_WINDOW(window), FALSE);
        gtk_entry_set_text(GTK_ENTRY(entry), "");
        gtk_tree_store_clear(tree_store);
 
@@ -221,7 +223,6 @@ static void foldersel_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        gtk_widget_realize(window);
index da24a79f549c8ccafd2b33027fcc6283112e8fc2..1e124fac4e718da4b74b458c2dd07e9acd4f08dd 100644 (file)
@@ -72,6 +72,7 @@ gint import_mbox(FolderItem *default_dest)
                gtk_widget_show(window);
        }
 
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        change_dir(claws_get_startup_dir());
 
        if (default_dest && default_dest->path) {
@@ -92,6 +93,7 @@ gint import_mbox(FolderItem *default_dest)
        gtk_main();
 
        gtk_widget_hide(window);
+       gtk_window_set_modal(GTK_WINDOW(window), FALSE);
 
        return import_ok;
 }
@@ -110,7 +112,6 @@ static void import_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Import mbox file"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
index 03a9dbd40cf01f0ed2a2734f7286c3d075b520c9..fc03fcaced3f97612bedf978408c2b7eb3c3e3dd 100644 (file)
@@ -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 );
@@ -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;
index 9eff796c617266029e6976438b6300dfd9d8dfec..227d9ed3174a173ca8057f1a906eb3ca1ec3b294 100644 (file)
@@ -202,7 +202,6 @@ static void imp_mutt_create( gboolean *cancelled ) {
        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); 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(imp_mutt_delete_event), cancelled);
        g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -284,6 +283,7 @@ AddressBookFile *addressbook_imp_mutt( AddressIndex *addrIndex ) {
        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();
@@ -294,6 +294,7 @@ AddressBookFile *addressbook_imp_mutt( AddressIndex *addrIndex ) {
 
        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;
index 5d13df09049f27d0d818b401f3f0da2f63947c50..f6ecaee427b216ec2efec69cc7e54ad9e74322d9 100644 (file)
@@ -201,7 +201,6 @@ static void imp_pine_create( gboolean *cancelled ) {
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Import Pine 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_pine_delete_event), cancelled);
        g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -284,6 +283,7 @@ AddressBookFile *addressbook_imp_pine( AddressIndex *addrIndex ) {
        gtk_widget_grab_focus(imppine_dlg.file_entry);
        gtk_widget_show(imppine_dlg.window);
        manage_window_set_transient(GTK_WINDOW(imppine_dlg.window));
+       gtk_window_set_modal(GTK_WINDOW(imppine_dlg.window), TRUE);
 
        imp_pine_status_show( _( "Please select a file to import." ) );
        pineFile = pine_find_file();
@@ -294,6 +294,7 @@ AddressBookFile *addressbook_imp_pine( AddressIndex *addrIndex ) {
 
        gtk_main();
        gtk_widget_hide(imppine_dlg.window);
+       gtk_window_set_modal(GTK_WINDOW(imppine_dlg.window), FALSE);
        _imp_addressIndex_ = NULL;
 
        if (cancelled == TRUE) return NULL;
index 1f006299e98362fef93edabf91acf2e525729e61..d34df1a94b2b9421a78e3471da8fdf53bebde4d3 100644 (file)
@@ -142,6 +142,7 @@ void prefs_actions_open(MainWindow *mainwin)
        prefs_actions_set_dialog();
 
        gtk_widget_show(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), TRUE);
 }
 
 /*!
@@ -204,7 +205,6 @@ static void prefs_actions_create(MainWindow *mainwin)
 
        gtk_container_set_border_width(GTK_CONTAINER (window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        vbox = gtk_vbox_new(FALSE, 6);
@@ -907,6 +907,7 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
        gtk_list_store_clear(store);
        prefs_actions_read_config();
        gtk_widget_hide(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), FALSE);
        inc_unlock();
 }
 
@@ -951,6 +952,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
        }
 
        gtk_widget_hide(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), FALSE);
        inc_unlock();
 }
 
index 48823d3accb1bec6e518d9aa4268d8fb9ff73e59..2afef7700d058d8299608c4197ab4ae1a2a7e2b7 100644 (file)
@@ -125,6 +125,7 @@ void prefs_custom_header_open(PrefsAccount *ac)
        cur_ac = ac;
 
        gtk_widget_show(customhdr.window);
+       gtk_window_set_modal(GTK_WINDOW(customhdr.window), TRUE);
 }
 
 static void prefs_custom_header_create(void)
@@ -166,7 +167,6 @@ static void prefs_custom_header_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_customheader");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 
        vbox = gtk_vbox_new (FALSE, 6);
@@ -787,12 +787,14 @@ static void prefs_custom_header_ok(void)
 {
        prefs_custom_header_write_config(cur_ac);
        gtk_widget_hide(customhdr.window);
+       gtk_window_set_modal(GTK_WINDOW(customhdr.window), FALSE);
 }
 
 static void prefs_custom_header_cancel(void)
 {
        prefs_custom_header_read_config(cur_ac); 
        gtk_widget_hide(customhdr.window);
+       gtk_window_set_modal(GTK_WINDOW(customhdr.window), FALSE);
 }
 
 static gint prefs_custom_header_deleted(GtkWidget *widget, GdkEventAny *event,
index 19e32270873c7ca14b7dac2a267602e1ca474314..40f48ffc52926bf4d7092a9cff7d1d947add976b 100644 (file)
@@ -189,6 +189,7 @@ void prefs_display_header_open(void)
        prefs_display_header_set_dialog();
 
        gtk_widget_show(dispheader.window);
+       gtk_window_set_modal(GTK_WINDOW(dispheader.window), TRUE);
 }
 
 static void prefs_display_header_create(void)
@@ -227,7 +228,6 @@ static void prefs_display_header_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_display_header");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 
        vbox = gtk_vbox_new (FALSE, 6);
@@ -715,12 +715,14 @@ static void prefs_display_header_ok(void)
                        (GTK_TOGGLE_BUTTON(dispheader.other_headers));
        prefs_display_header_write_config();
        gtk_widget_hide(dispheader.window);
+       gtk_window_set_modal(GTK_WINDOW(dispheader.window), FALSE);
 }
 
 static void prefs_display_header_cancel(void)
 {
        prefs_display_header_read_config();
        gtk_widget_hide(dispheader.window);
+       gtk_window_set_modal(GTK_WINDOW(dispheader.window), FALSE);
 }
 
 static gint prefs_display_header_deleted(GtkWidget *widget, GdkEventAny *event,
index b3d840beef8445c756d1e85117f6aa0966cd9a4a..66d1fd94d6de4958da865d45e855539795a0eb2a 100644 (file)
@@ -220,6 +220,7 @@ void prefs_filtering_open(GSList ** p_processing,
        }
 
        gtk_widget_show(filtering.window);
+       gtk_window_set_modal(GTK_WINDOW(filtering.window), TRUE);
 
        start_address_completion(NULL);
 }
@@ -244,6 +245,7 @@ static void prefs_filtering_close(void)
                                (filtering.cond_list_view)));
        gtk_list_store_clear(store);
        gtk_widget_hide(filtering.window);
+       gtk_window_set_modal(GTK_WINDOW(filtering.window), FALSE);
        inc_unlock();
 }
 
@@ -334,7 +336,6 @@ static void prefs_filtering_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_filtering");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 
        vbox = gtk_vbox_new (FALSE, 6);
index 05eb0ce5b1423a947e66471e517f94a448cb2579..dfab12e6c5b6e23a19e285bbd4996f116a329025 100644 (file)
@@ -161,12 +161,14 @@ void prefs_folder_column_open(void)
        prefs_folder_column_set_dialog(NULL);
 
        gtk_widget_show(folder_col.window);
+       gtk_window_set_modal(GTK_WINDOW(folder_col.window), TRUE);
 
        folder_col.finished = FALSE;
        while (folder_col.finished == FALSE)
                gtk_main_iteration();
 
        gtk_widget_hide(folder_col.window);
+       gtk_window_set_modal(GTK_WINDOW(folder_col.window), FALSE);
 
        inc_unlock();
 }
@@ -204,7 +206,6 @@ static void prefs_folder_column_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_folder_column");
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Folder list columns configuration"));
index 883ae0731af72dfa96e6fe0033eef272113f8842..4c94b1ea6da50f11dbcb037a52663daa473f0d30 100644 (file)
@@ -436,6 +436,7 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
        prefs_matcher_set_dialog(matchers);
 
        gtk_widget_show(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), TRUE);
 }
 
 /*!
@@ -528,7 +529,6 @@ static void prefs_matcher_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_matcher");
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 
        vbox = gtk_vbox_new(FALSE, 6);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -1937,6 +1937,7 @@ static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void prefs_matcher_cancel(void)
 {
        gtk_widget_hide(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
        inc_unlock();
 }
 
@@ -1991,6 +1992,7 @@ static void prefs_matcher_ok(void)
                }
                 g_free(str);
                gtk_widget_hide(matcher.window);
+               gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
index 5f8d3e948bced91b2e7587530f96f8ce7b0039a3..a0491b5e17a9b67cbcaf41b0536ec7ae10a52b5e 100644 (file)
@@ -176,13 +176,14 @@ void prefs_summary_column_open(void)
        prefs_summary_column_set_dialog(NULL);
 
        gtk_widget_show(summary_col.window);
+       gtk_window_set_modal(GTK_WINDOW(summary_col.window), TRUE);
 
        summary_col.finished = FALSE;
        while (summary_col.finished == FALSE)
                gtk_main_iteration();
 
        gtk_widget_hide(summary_col.window);
-
+       gtk_window_set_modal(GTK_WINDOW(summary_col.window), FALSE);
        inc_unlock();
 }
 
@@ -219,7 +220,6 @@ static void prefs_summary_column_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summary_column");
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Message list columns configuration"));
index 1dbd22bb0f00310266c1a161cc6e0d41795e0a56..9f6e5469143b14046e7b2b3bde47fa9ad242bdb8 100644 (file)
@@ -130,6 +130,7 @@ void prefs_summary_open_open(void)
                saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
 
        gtk_widget_show(summaryopen.window);
+       gtk_window_set_modal(GTK_WINDOW(summaryopen.window), TRUE);
 }
 
 static void prefs_summary_open_create(void)
@@ -161,7 +162,6 @@ static void prefs_summary_open_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summary_open");
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 
        vbox = gtk_vbox_new (FALSE, 6);
@@ -543,6 +543,7 @@ static void prefs_summary_open_ok(void)
                saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
 
        gtk_widget_hide(summaryopen.window);
+       gtk_window_set_modal(GTK_WINDOW(summaryopen.window), FALSE);
 }
 
 static void prefs_summary_open_cancel(void)
index f69d05c29862383855cb8906c8eb0af59afd0183..348092b9915219e93157958dfac573c3b424605b 100644 (file)
@@ -135,6 +135,7 @@ void prefs_template_open(void)
 
        prefs_template_window_setup();
        gtk_widget_show(templates.window);
+       gtk_window_set_modal(GTK_WINDOW(templates.window), TRUE);
 }
 
 /*!
@@ -191,7 +192,6 @@ static void prefs_template_window_create(void)
        /* main window */
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_template");
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        vbox = gtk_vbox_new(FALSE, 8);
@@ -581,6 +581,7 @@ static void prefs_template_ok_cb(gpointer action, gpointer data)
                                (templates.list_view)));
        gtk_list_store_clear(store);
        gtk_widget_hide(templates.window);
+       gtk_window_set_modal(GTK_WINDOW(templates.window), FALSE);
        inc_unlock();
 }
 
index 5d326f1ecd9bd62d45d31253930b9844c6c992fb..0c6a4d5f61dd6305d9676ca7ac110592dea23e05 100644 (file)
@@ -858,7 +858,6 @@ void textview_show_error(TextView *textview)
        TEXTVIEW_INSERT_LINK(_("'View Log'"), "sc://view_log", NULL);
        TEXTVIEW_INSERT(_(" in the Tools menu for more information."));
        textview_show_icon(textview, GTK_STOCK_DIALOG_ERROR);
-
 }
 
 void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
index 548f689271b1003f00935687e2ecf0ea0da94775..263f0bcbe0487bd197bfa923358df4ef9fd33e94 100644 (file)
@@ -295,6 +295,7 @@ static void uri_opener_close(void)
 {
        g_slist_free(opener.uris);
        opener.uris = NULL;
+       gtk_window_set_modal(GTK_WINDOW(opener.window), FALSE);
        gtk_widget_hide(opener.window);
 }