aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-05-24 08:34:51 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-05-24 08:34:51 +0000
commite9882b3e41b62de9682db367a070439d1aa55475 (patch)
tree90d818870b2f8b9a92d82fc085add21e86b5dc60
parent199702278eb3846ba157b68cf412df661d1f4af4 (diff)
fixed crash when clicking tray icon menu 'Get from current account' with no account.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2546 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--src/inc.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 152b0a92..7c28519d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-05-24
+ * src/inc.c: fixed crash when clicking tray icon menu
+ 'Get from current account' with no account.
+
+2010-05-24
+
* src/main.c: added --instance-id <ID> option, which allows users to
run multiple instances of Sylpheed. There is no extra checks for
config directory, so use with caution.
diff --git a/src/inc.c b/src/inc.c
index 64e6f266..36305814 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -241,6 +241,7 @@ static gint inc_remote_account_mail(MainWindow *mainwin, PrefsAccount *account)
gint new_msgs = 0;
gboolean update_summary = FALSE;
+ g_return_val_if_fail(account != NULL, 0);
g_return_val_if_fail(account->folder != NULL, 0);
if (account->protocol == A_IMAP4 &&
@@ -354,6 +355,8 @@ static gint inc_account_mail_real(MainWindow *mainwin, PrefsAccount *account)
IncProgressDialog *inc_dialog;
IncSession *session;
+ g_return_val_if_fail(account != NULL, 0);
+
if (account->protocol == A_IMAP4 || account->protocol == A_NNTP)
return inc_remote_account_mail(mainwin, account);