2006-09-13 [colin] 2.4.0cvs179

	* src/folder.h
		Fix a warning in summaryview.c
	* src/mainwindow.c
	* src/summaryview.c
	* src/summaryview.h
		Add missing Mark/* elements in the
		main menu

diff --git a/ChangeLog b/ChangeLog
index c0faeabafdeb371b3c56c3d1ae088897a1054ec4..b9f4a2c91eaf7ba3dec39a5223b8414514b7ea70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-13 [colin]     2.4.0cvs179
+
+       * src/folder.h
+               Fix a warning in summaryview.c
+       * src/mainwindow.c
+       * src/summaryview.c
+       * src/summaryview.h
+               Add missing Mark/* elements in the
+               main menu
+
 2006-09-12 [colin]     2.4.0cvs178
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index c3d31ee53f9df82228023d21da931917b93b6c85..8919c94387e6af0ca5325d82deca3245f5fc9796 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1870,3 +1870,4 @@
 ( cvs diff -u -r 1.43.2.45 -r 1.43.2.46 src/prefs_matcher.c;  ) > 2.4.0cvs176.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/addrbook.xml;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/fr/handling.xml;  ) > 2.4.0cvs177.patchset
 ( cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/prefs_actions.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/prefs_matcher.c;  ) > 2.4.0cvs178.patchset
+( cvs diff -u -r 1.87.2.29 -r 1.87.2.30 src/folder.h;  cvs diff -u -r 1.274.2.149 -r 1.274.2.150 src/mainwindow.c;  cvs diff -u -r 1.395.2.247 -r 1.395.2.248 src/summaryview.c;  cvs diff -u -r 1.68.2.25 -r 1.68.2.26 src/summaryview.h;  ) > 2.4.0cvs179.patchset

diff --git a/configure.ac b/configure.ac
index 3d8d686c884a259c497da3199e1e36b4b0f7f6a6..22f6576fa002d934b90468e29c3b1bae02eccfa7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=178
+EXTRA_VERSION=179
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.h b/src/folder.h
index 050ea7a031dc59beecdc182ac8246239c71394c0..a49223b94bf25f55f4b815b38dcd9506ed35a524 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -745,6 +745,8 @@ gchar *folder_item_get_path         (FolderItem     *item);
 gint   folder_item_open                        (FolderItem     *item);
 gint   folder_item_close               (FolderItem     *item);
 gint   folder_item_scan                        (FolderItem     *item);
+gint   folder_item_scan_full           (FolderItem     *item, 
+                                        gboolean        filtering);
 gint   folder_item_syncronize_flags    (FolderItem     *item);
 void   folder_item_scan_foreach                (GHashTable     *table);
 MsgInfo *folder_item_get_msginfo       (FolderItem     *item,

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5e6445d30ba16f9ddc27b2911834b539bae11c47..a43a18438154b0c87c4620530dc7d058cc014ea8 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -261,6 +261,19 @@ static void mark_as_spam_cb                (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void ignore_thread_cb           (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void unignore_thread_cb         (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void lock_msgs_cb               (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void unlock_msgs_cb             (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void reedit_cb                  (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -771,9 +784,14 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark as unr_ead"), "<shift>exclam", mark_as_unread_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark as rea_d"),   NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
+       {N_("/_Message/_Mark/Ignore thread"),   NULL, ignore_thread_cb, 0, NULL},
+       {N_("/_Message/_Mark/Unignore thread"), NULL, unignore_thread_cb, 0, NULL},
        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark/Mark as _spam"),   NULL, mark_as_spam_cb, 1, NULL},
        {N_("/_Message/_Mark/Mark as _ham"),    NULL, mark_as_spam_cb, 0, NULL},
+       {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/_Mark/Lock"),            NULL, lock_msgs_cb, 0, NULL},
+       {N_("/_Message/_Mark/Unlock"),          NULL, unlock_msgs_cb, 0, NULL},
        {N_("/_Message/Color la_bel"),          NULL, NULL,            0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
@@ -2250,6 +2268,10 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Mark"                  , M_TARGET_EXIST},
                {"/Message/Mark/Mark as spam"     , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
                {"/Message/Mark/Mark as ham"      , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
+               {"/Message/Mark/Ignore thread"    , M_TARGET_EXIST},
+               {"/Message/Mark/Unignore thread"  , M_TARGET_EXIST},
+               {"/Message/Mark/Lock"             , M_TARGET_EXIST},
+               {"/Message/Mark/Unlock"           , M_TARGET_EXIST},
                {"/Message/Color label"           , M_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
@@ -3417,6 +3439,31 @@ static void mark_as_spam_cb(MainWindow *mainwin, guint action,
        summary_mark_as_spam(mainwin->summaryview, action, NULL);
 }
 
+static void ignore_thread_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_ignore_thread(mainwin->summaryview);
+}
+
+static void unignore_thread_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_unignore_thread(mainwin->summaryview);
+}
+
+static void lock_msgs_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_msgs_lock(mainwin->summaryview);
+}
+
+static void unlock_msgs_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_msgs_unlock(mainwin->summaryview);
+}
+
+
 static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_reedit(mainwin->summaryview);

diff --git a/src/summaryview.c b/src/summaryview.c
index 071d40c5a8ce2e408bfe23858bb76c5bfa9ef9e1..528df22faadb7c1e720124773540fa9eb38f44f9 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -230,8 +230,6 @@ static void summary_execute_delete_func     (GtkCTree               *ctree,
                                         gpointer                data);
 
 static void summary_thread_init                (SummaryView            *summaryview);
-static void summary_ignore_thread      (SummaryView            *summaryview);
-static void summary_unignore_thread     (SummaryView            *summaryview);
 
 static void summary_unthread_for_exec          (SummaryView    *summaryview);
 static void summary_unthread_for_exec_func     (GtkCTree       *ctree,
@@ -1402,6 +1400,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Mark/Mark as unread"         , M_TARGET_EXIST},
                {"/Mark/Mark all read"          , M_TARGET_EXIST},
                {"/Mark/Ignore thread"          , M_TARGET_EXIST},
+               {"/Mark/Unignore thread"        , M_TARGET_EXIST},
                {"/Mark/Lock"                   , M_TARGET_EXIST},
                {"/Mark/Unlock"                 , M_TARGET_EXIST},
                {"/Mark/Mark as spam"           , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
@@ -5988,7 +5987,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
            msginfo->msgnum);
 }
 
-static void summary_ignore_thread(SummaryView *summaryview)
+void summary_ignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
@@ -6020,7 +6019,7 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
            msginfo->msgnum);
 }
 
-static void summary_unignore_thread(SummaryView *summaryview)
+void summary_unignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;

diff --git a/src/summaryview.h b/src/summaryview.h
index 99237c75639e98d93080ba05c4958257a252a6c7..31d6ea10f19d2edcd1e34dddbdcb68eebc17a2f1 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -258,6 +258,9 @@ void summary_mark_all_read    (SummaryView          *summaryview);
 void summary_mark_as_spam        (SummaryView          *summaryview, 
                                   guint                 action, 
                                   GtkWidget            *widget);
+void summary_ignore_thread       (SummaryView          *summaryview);
+void summary_unignore_thread     (SummaryView          *summaryview);
+
 void summary_add_address         (SummaryView          *summaryview);
 void summary_select_all                  (SummaryView          *summaryview);
 void summary_unselect_all        (SummaryView          *summaryview);