2013-03-12 [wwp] 3.9.0cvs112
authorTristan Chabredier <wwp@claws-mail.org>
Tue, 12 Mar 2013 09:56:32 +0000 (09:56 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Tue, 12 Mar 2013 09:56:32 +0000 (09:56 +0000)
* src/account.c
Fix 'edit accounts' windows going backward when leaving an
'account preferences' window, by focusing this window again.

ChangeLog
PATCHSETS
configure.ac
src/account.c

index 1968e25a375ffc832bd20c6eb2da68bef35cee7f..aec84ad3b411d7c795537e418419ec3fbb8a8554 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-12 [wwp]       3.9.0cvs112
+
+       * src/account.c
+       Fix 'edit accounts' windows going backward when leaving an
+       'account preferences' window, by focusing this window again.
+
 2013-03-09 [mones]     3.9.0cvs111
 
        * INSTALL
index 19d85bdfe037e70e91dd8f7748cf42293c3379d8..11edd5c681e1de8bc5733ed1047214276913f44b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fancy/fancy_prefs.c;  ) > 3.9.0cvs109.patchset
 ( cvs diff -u -r 1.654.2.4686 -r 1.654.2.4687 configure.ac;  ) > 3.9.0cvs110.patchset
 ( cvs diff -u -r 1.29.2.13 -r 1.29.2.14 INSTALL;  cvs diff -u -r 1.274.2.366 -r 1.274.2.367 src/mainwindow.c;  cvs diff -u -r 1.395.2.462 -r 1.395.2.463 src/summaryview.c;  ) > 3.9.0cvs111.patchset
+( cvs diff -u -r 1.61.2.107 -r 1.61.2.108 src/account.c;  ) > 3.9.0cvs112.patchset
index 9865c70edb08ce73ce23e14f97bb5d552521c642..8e92720acfe855d2a4b1f2f5d17043ee97249e55 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=111
+EXTRA_VERSION=112
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d621a27eb36187c971faa9f48acb195c8bf095da..f00e338acaa2ecd417a9bdbf5553346459c64517 100644 (file)
@@ -374,6 +374,15 @@ GList *account_get_list(void)
        return account_list;
 }
 
+void account_edit_focus(void)
+{
+       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);
+}
+
 void account_edit_open(gpointer a, gpointer b)
 {
        inc_lock();
@@ -395,11 +404,7 @@ void account_edit_open(gpointer a, gpointer b)
 
        account_list_view_set();
 
-       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);
+       account_edit_focus();
 }
 
 void account_add(void)
@@ -410,6 +415,8 @@ void account_add(void)
 
        if (!ac_prefs) return;
 
+       account_edit_focus();
+
        account_list = g_list_append(account_list, ac_prefs);
 
        if (ac_prefs->is_default)
@@ -455,6 +462,8 @@ void account_open(PrefsAccount *ac_prefs)
 
        prefs_account_open(ac_prefs, &account_dirty);
 
+       account_edit_focus();
+
        if (account_dirty) {
                if (!prev_default && ac_prefs->is_default)
                        account_set_as_default(ac_prefs);
@@ -937,6 +946,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
        ACP_FASSIGN(sd_rmmail_on_download);
        ACP_FASSIGN(enable_size_limit);
        ACP_FASSIGN(size_limit);
+       ACP_FASSIGN(time_lapse);
        ACP_FASSIGN(filter_on_recv);
        ACP_FASSIGN(filterhook_on_recv);
        ACP_FDUP(inbox);