[Commits] mainwindow.c 1.274.2.328.2.3 1.274.2.328.2.4 mainwindow.h 1.39.2.61.2.1 1.39.2.61.2.2 summaryview.c 1.395.2.430.2.3 1.395.2.430.2.4 toolbar.c 1.43.2.124.2.1 1.43.2.124.2.2
miras at claws-mail.org
miras at claws-mail.org
Wed Jan 11 23:40:49 CET 2012
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv11456/src
Modified Files:
Tag: new-contacts
mainwindow.c mainwindow.h summaryview.c toolbar.c
Log Message:
2012-01-11 [mir] 3.7.10cvs16.19-new-contacts
* src/mainwindow.c
* src/mainwindow.h
* src/summaryview.c
* src/toolbar.c
Applied patch 3.8.0cvs12 and 3.8.0cvs13 from HEAD.
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.430.2.3
retrieving revision 1.395.2.430.2.4
diff -u -d -r1.395.2.430.2.3 -r1.395.2.430.2.4
--- summaryview.c 16 Dec 2011 15:49:07 -0000 1.395.2.430.2.3
+++ summaryview.c 11 Jan 2012 22:40:47 -0000 1.395.2.430.2.4
@@ -3799,13 +3799,24 @@
} else if (MSG_IS_MOVE(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
movedxpm);
- if (style)
- style = bold_marked_style;
- else {
- style = small_marked_style;
- }
+ if (!msginfo->to_folder ||
+ !folder_has_parent_of_type(msginfo->to_folder, F_TRASH)) {
+ if (style)
+ style = bold_marked_style;
+ else {
+ style = small_marked_style;
+ }
gtk_cmctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
+ } else {
+ if (style)
+ style = bold_deleted_style;
+ else {
+ style = small_deleted_style;
+ }
+ gtk_cmctree_node_set_foreground
+ (ctree, row, &summaryview->color_dim);
+ }
} else if (MSG_IS_COPY(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
copiedxpm);
Index: toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/toolbar.c,v
retrieving revision 1.43.2.124.2.1
retrieving revision 1.43.2.124.2.2
diff -u -d -r1.43.2.124.2.1 -r1.43.2.124.2.2
--- toolbar.c 7 Sep 2011 15:52:28 -0000 1.43.2.124.2.1
+++ toolbar.c 11 Jan 2012 22:40:47 -0000 1.43.2.124.2.2
@@ -2361,11 +2361,11 @@
if (toolbar->get_btn)
SET_WIDGET_COND(toolbar->get_btn,
- M_HAVE_ACCOUNT|M_UNLOCKED);
+ M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT);
if (toolbar->getall_btn) {
SET_WIDGET_COND(toolbar->getall_btn,
- M_HAVE_ACCOUNT|M_UNLOCKED);
+ M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
}
if (toolbar->send_btn) {
SET_WIDGET_COND(toolbar->send_btn,
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.328.2.3
retrieving revision 1.274.2.328.2.4
diff -u -d -r1.274.2.328.2.3 -r1.274.2.328.2.4
--- mainwindow.c 3 Dec 2011 12:53:28 -0000 1.274.2.328.2.3
+++ mainwindow.c 11 Jan 2012 22:40:46 -0000 1.274.2.328.2.4
@@ -6,12 +6,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -3134,6 +3134,9 @@
if (cur_account)
state |= M_HAVE_ACCOUNT;
+ if (cur_account && cur_account->protocol != A_NONE)
+ state |= M_HAVE_RETRIEVABLE_ACCOUNT;
+
if (any_folder_want_synchronise())
state |= M_WANT_SYNC;
@@ -3144,6 +3147,13 @@
state |= M_HAVE_MULTI_ACCOUNT;
for ( ; account_list != NULL; account_list = account_list->next) {
+ if (((PrefsAccount*)account_list->data)->protocol != A_NONE) {
+ state |= M_HAVE_ANY_RETRIEVABLE_ACCOUNT;
+ break;
+ }
+ }
+
+ for ( ; account_list != NULL; account_list = account_list->next) {
if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
state |= M_HAVE_NEWS_ACCOUNT;
break;
@@ -3240,9 +3250,9 @@
{"Menu/View/Quotes" , M_SINGLE_TARGET_EXIST},
{"Menu/Message/Receive/CurrentAccount"
- , M_HAVE_ACCOUNT|M_UNLOCKED},
+ , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT},
{"Menu/Message/Receive/AllAccounts"
- , M_HAVE_ACCOUNT|M_UNLOCKED},
+ , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT},
{"Menu/Message/Receive/CancelReceiving"
, M_INC_ACTIVE},
{"Menu/Message/SendQueue" , M_HAVE_ACCOUNT|M_HAVE_QUEUED_MAILS},
Index: mainwindow.h
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.h,v
retrieving revision 1.39.2.61.2.1
retrieving revision 1.39.2.61.2.2
diff -u -d -r1.39.2.61.2.1 -r1.39.2.61.2.2
--- mainwindow.h 29 Nov 2011 00:15:21 -0000 1.39.2.61.2.1
+++ mainwindow.h 11 Jan 2012 22:40:47 -0000 1.39.2.61.2.2
@@ -67,7 +67,9 @@
M_SESSION_PASSWORDS = 1 << 26,
M_DELETED_EXISTS = 1 << 27,
M_NOT_TRASH = 1 << 28,
- M_HIDE_READ_THREADS = 1 << 29
+ M_HIDE_READ_THREADS = 1 << 29,
+ M_HAVE_RETRIEVABLE_ACCOUNT = 1 << 30,
+ M_HAVE_ANY_RETRIEVABLE_ACCOUNT = 1 << 31
} SensitiveCond;
typedef enum
More information about the Commits
mailing list