aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-11-09 09:01:07 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-11-09 09:01:07 +0000
commit476168eeba6a0574f96afa1655d9b344b803da14 (patch)
tree7854c99c7d3d7285c90db66e7f2c3fa2e1810a2e /src
parent7e61c63e03f31fdd0b5e28faaef096747020c355 (diff)
only disable new mail notification when a new mail is actually read.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1286 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r--src/inc.c2
-rw-r--r--src/summaryview.c9
-rw-r--r--src/trayicon.c1
3 files changed, 11 insertions, 1 deletions
diff --git a/src/inc.c b/src/inc.c
index 17f1d056..6eb939ce 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -162,8 +162,10 @@ static void inc_finished(MainWindow *mainwin, gint new_messages)
trayicon_set_tooltip(buf);
trayicon_set_notify(TRUE);
} else {
+#if 0
trayicon_set_tooltip(NULL);
trayicon_set_notify(FALSE);
+#endif
}
if (new_messages <= 0 && !prefs_common.scan_all_after_inc) return;
diff --git a/src/summaryview.c b/src/summaryview.c
index da7c73f3..c4f382cf 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -77,6 +77,7 @@
#include "alertpanel.h"
#include "inputdialog.h"
#include "statusbar.h"
+#include "trayicon.h"
#include "filter.h"
#include "folder.h"
#include "colorlabel.h"
@@ -2575,6 +2576,10 @@ static void summary_display_msg_full(SummaryView *summaryview,
if (MSG_IS_NEW(msginfo->flags) ||
MSG_IS_UNREAD(msginfo->flags)) {
+ if (MSG_IS_NEW(msginfo->flags)) {
+ trayicon_set_tooltip(NULL);
+ trayicon_set_notify(FALSE);
+ }
MSG_UNSET_PERM_FLAGS
(msginfo->flags, MSG_NEW | MSG_UNREAD);
MSG_SET_TMP_FLAGS(msginfo->flags, MSG_FLAG_CHANGED);
@@ -2827,6 +2832,10 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
}
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ if (MSG_IS_NEW(msginfo->flags)) {
+ trayicon_set_tooltip(NULL);
+ trayicon_set_notify(FALSE);
+ }
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
MSG_SET_TMP_FLAGS(msginfo->flags, MSG_FLAG_CHANGED);
summaryview->folder_item->mark_dirty = TRUE;
diff --git a/src/trayicon.c b/src/trayicon.c
index 1e8e3d98..677c4f29 100644
--- a/src/trayicon.c
+++ b/src/trayicon.c
@@ -36,7 +36,6 @@
#include "mainwindow.h"
#include "utils.h"
#include "gtkutils.h"
-#include "eggtrayicon.h"
#include "stock_pixmap.h"
#include "menu.h"
#include "main.h"