CVS: sylpheed-claws/src prefs_common.h,1.103.2.47,1.103.2.48 prefs_summaries.c,1.1.2.23,1.1.2.24 summaryview.c,1.395.2.196,1.395.2.197
Paul Mangan <[email protected]>
| Newsgroups | gmane.mail.sylpheed.claws.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32277/src
Modified Files:
Tag: gtk2
prefs_common.h prefs_summaries.c summaryview.c
Log Message:
2006-05-12 [paul] 2.2.0cvs7
* src/prefs_common.h
* src/prefs_summaries.c
* src/summaryview.c
when entering a folder also allow
going directly to first Marked message
Index: prefs_common.h
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/prefs_common.h,v
retrieving revision 1.103.2.47
retrieving revision 1.103.2.48
diff -u -r1.103.2.47 -r1.103.2.48
--- prefs_common.h 10 Apr 2006 19:16:31 -0000 1.103.2.47
+++ prefs_common.h 12 May 2006 18:12:31 -0000 1.103.2.48
@@ -57,8 +57,14 @@
typedef enum
{
- SELECTONENTRY_UNREAD = 1 << 0,
- SELECTONENTRY_NEW = 1 << 1
+/* U = unread, N = new, M = marked */
+ SELECTONENTRY_NOTHING,
+ SELECTONENTRY_UNM,
+ SELECTONENTRY_UMN,
+ SELECTONENTRY_NUM,
+ SELECTONENTRY_NMU,
+ SELECTONENTRY_MNU,
+ SELECTONENTRY_MUN
} SelectOnEntry;
typedef enum
Index: prefs_summaries.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/Attic/prefs_summaries.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- prefs_summaries.c 5 Apr 2006 16:45:54 -0000 1.1.2.23
+++ prefs_summaries.c 12 May 2006 18:12:31 -0000 1.1.2.24
@@ -916,11 +916,19 @@
(GtkAttachOptions) (0), 0, 0);
menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Do nothing"), 0);
- MENUITEM_ADD (menu, menuitem, _("Select first unread (or new) message"),
- SELECTONENTRY_UNREAD);
- MENUITEM_ADD (menu, menuitem, _("Select first new (or unread) message"),
- SELECTONENTRY_NEW);
+ MENUITEM_ADD (menu, menuitem, _("Do nothing"), SELECTONENTRY_NOTHING);
+ MENUITEM_ADD (menu, menuitem, _("Select first unread (or new or marked) message"),
+ SELECTONENTRY_UNM);
+ MENUITEM_ADD (menu, menuitem, _("Select first unread (or marked or new) message"),
+ SELECTONENTRY_UMN);
+ MENUITEM_ADD (menu, menuitem, _("Select first new (or unread or marked) message"),
+ SELECTONENTRY_NUM);
+ MENUITEM_ADD (menu, menuitem, _("Select first new (or marked or unread) message"),
+ SELECTONENTRY_NMU);
+ MENUITEM_ADD (menu, menuitem, _("Select first marked (or new or unread) message"),
+ SELECTONENTRY_MNU);
+ MENUITEM_ADD (menu, menuitem, _("Select first marked (or unread or new) message"),
+ SELECTONENTRY_MUN);
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_select_on_entry), menu);
Index: summaryview.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/summaryview.c,v
retrieving revision 1.395.2.196
retrieving revision 1.395.2.197
diff -u -r1.395.2.196 -r1.395.2.197
--- summaryview.c 12 May 2006 18:10:00 -0000 1.395.2.196
+++ summaryview.c 12 May 2006 18:12:31 -0000 1.395.2.197
@@ -1060,18 +1060,64 @@
}
} else {
switch (prefs_common.select_on_entry) {
- case SELECTONENTRY_NEW:
+ case SELECTONENTRY_MNU:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ break;
+ case SELECTONENTRY_MUN:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ break;
+ case SELECTONENTRY_NMU:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ break;
+ case SELECTONENTRY_NUM:
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_NEW, FALSE);
if (node == NULL)
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_UNREAD, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
+ break;
+ case SELECTONENTRY_UNM:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
break;
- case SELECTONENTRY_UNREAD:
+ case SELECTONENTRY_UMN:
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_UNREAD, FALSE);
if (node == NULL)
node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_NEW, FALSE);
break;
default:
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642