diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.ja | 11 | ||||
| -rw-r--r-- | src/prefs_account_dialog.c | 1 | ||||
| -rw-r--r-- | src/prefs_actions.c | 2 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 2 | ||||
| -rw-r--r-- | src/prefs_filter.c | 1 | ||||
| -rw-r--r-- | src/prefs_folder_item.c | 2 | ||||
| -rw-r--r-- | src/prefs_summary_column.c | 1 | ||||
| -rw-r--r-- | src/prefs_template.c | 3 |
9 files changed, 34 insertions, 0 deletions
@@ -1,5 +1,16 @@ 2005-11-01 + * src/prefs_actions.c + src/prefs_template.c + src/prefs_folder_item.c + src/prefs_common_dialog.c + src/prefs_summary_column.c + src/prefs_account_dialog.c + src/prefs_filter.c: bring main window in front after dialogs are + closed (to avoid the focus problem on win32). + +2005-11-01 + * libsylph/prefs_common.[ch] libsylph/procmime.c src/textview.c diff --git a/ChangeLog.ja b/ChangeLog.ja index b745a99d..b4d000d9 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,16 @@ 2005-11-01 + * src/prefs_actions.c + src/prefs_template.c + src/prefs_folder_item.c + src/prefs_common_dialog.c + src/prefs_summary_column.c + src/prefs_account_dialog.c + src/prefs_filter.c: ダイアログを閉じた後メインウィンドウを前面に + 持ってくるようにした(win32 でのフォーカス問題の回避)。 + +2005-11-01 + * libsylph/prefs_common.[ch] libsylph/procmime.c src/textview.c diff --git a/src/prefs_account_dialog.c b/src/prefs_account_dialog.c index 66929de7..9cbd274a 100644 --- a/src/prefs_account_dialog.c +++ b/src/prefs_account_dialog.c @@ -475,6 +475,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs) gtk_widget_show(dialog.window); gtk_main(); gtk_widget_hide(dialog.window); + main_window_popup(main_window_get()); inc_unlock(); diff --git a/src/prefs_actions.c b/src/prefs_actions.c index 6f994c9d..af33d40e 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.c @@ -655,6 +655,7 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data) { prefs_actions_read_config(); gtk_widget_hide(actions.window); + main_window_popup(main_window_get()); inc_unlock(); } @@ -667,6 +668,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data) ifactory = gtk_item_factory_from_widget(mainwin->menubar); action_update_mainwin_menu(ifactory, mainwin); gtk_widget_hide(actions.window); + main_window_popup(main_window_get()); inc_unlock(); } diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index eedae1d3..12ffccd0 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -3522,6 +3522,7 @@ static void prefs_common_ok(void) if (quote_desc_win && GTK_WIDGET_VISIBLE(quote_desc_win)) gtk_widget_hide(quote_desc_win); + main_window_popup(main_window_get()); inc_unlock(); } @@ -3541,5 +3542,6 @@ static void prefs_common_apply(void) static void prefs_common_cancel(void) { gtk_widget_hide(dialog.window); + main_window_popup(main_window_get()); inc_unlock(); } diff --git a/src/prefs_filter.c b/src/prefs_filter.c index e8b8b3f3..0fcf7c92 100644 --- a/src/prefs_filter.c +++ b/src/prefs_filter.c @@ -826,5 +826,6 @@ static void prefs_filter_close(void) filter_write_config(); gtk_widget_hide(rule_list_window.window); gtk_list_store_clear(rule_list_window.store); + main_window_popup(main_window_get()); inc_unlock(); } diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index e14767ba..fefe44bc 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -36,6 +36,7 @@ #include "account.h" #include "manage_window.h" #include "folderview.h" +#include "mainwindow.h" #include "inc.h" #include "menu.h" @@ -489,6 +490,7 @@ void prefs_folder_item_destroy(PrefsFolderItemDialog *dialog) g_free(dialog->dialog); g_free(dialog); + main_window_popup(main_window_get()); inc_unlock(); } diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c index 334db41f..46ae20c8 100644 --- a/src/prefs_summary_column.c +++ b/src/prefs_summary_column.c @@ -133,6 +133,7 @@ void prefs_summary_column_open(void) gtk_main_iteration(); gtk_widget_hide(summary_col.window); + main_window_popup(main_window_get()); inc_unlock(); } diff --git a/src/prefs_template.c b/src/prefs_template.c index f473cf84..b86ad195 100644 --- a/src/prefs_template.c +++ b/src/prefs_template.c @@ -38,6 +38,7 @@ #include "prefs_common.h" #include "prefs_common_dialog.h" #include "compose.h" +#include "mainwindow.h" #include "addr_compl.h" #include "quote_fmt.h" @@ -369,6 +370,7 @@ static void prefs_template_ok_cb(void) compose_reflect_prefs_all(); gtk_clist_clear(GTK_CLIST(templates.clist_tmpls)); gtk_widget_hide(templates.window); + main_window_popup(main_window_get()); inc_unlock(); } @@ -376,6 +378,7 @@ static void prefs_template_cancel_cb(void) { prefs_template_clear(); gtk_widget_hide(templates.window); + main_window_popup(main_window_get()); inc_unlock(); } |