From 18414e327025c009aecca7108d47c96ea0a34f6e Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 30 Aug 2010 09:45:41 +0000
Subject: fixed open_inbox_on_startup setting.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2684 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog  | 6 ++++++
 src/main.c | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 672ffa79..c2cc366f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-30
+
+	* src/main.c: remote_command_exec(): fixed the bug that default
+	  account's inbox was not properly selected when 'Open inbox on
+	  startup' was enabled.
+
 2010-08-19
 
 	* src/addressbook.[ch]
diff --git a/src/main.c b/src/main.c
index ca4d7caf..2292a0cf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1542,8 +1542,13 @@ static void remote_command_exec(void)
 
 	if (prefs_common.open_inbox_on_startup) {
 		FolderItem *item;
-		item = cur_account && cur_account->inbox
-			? folder_find_item_from_identifier(cur_account->inbox)
+		PrefsAccount *ac;
+
+		ac = account_get_default();
+		if (!ac)
+			ac = cur_account;
+		item = ac && ac->inbox
+			? folder_find_item_from_identifier(ac->inbox)
 			: folder_get_default_inbox();
 		folderview_select(mainwin->folderview, item);
 	}
-- 
cgit v1.2.3