[Commits] account.c 1.61.2.107 1.61.2.108

[wwp at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv10079/src

Modified Files:
      Tag: gtk2
	account.c 
Log Message:
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.

Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.107
retrieving revision 1.61.2.108
diff -u -d -r1.61.2.107 -r1.61.2.108
--- account.c	16 Nov 2012 23:42:14 -0000	1.61.2.107
+++ account.c	12 Mar 2013 09:56:30 -0000	1.61.2.108
@@ -374,6 +374,15 @@
 	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 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 	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);