general clean up
authorPaul Mangan <paul@claws-mail.org>
Fri, 12 Dec 2003 08:31:20 +0000 (08:31 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 12 Dec 2003 08:31:20 +0000 (08:31 +0000)
12 files changed:
ChangeLog.claws
configure.ac
src/filtering.c
src/mainwindow.c
src/matcher.c
src/matcher.h
src/matcher_parser_parse.y
src/plugins/clamav/clamav_plugin.c
src/plugins/spamassassin/spamassassin.c
src/prefs_account.c
src/prefs_filtering_action.c
src/prefs_folder_item.c

index ad4106e..0faf97d 100644 (file)
@@ -1,3 +1,32 @@
+2003-12-12 [paul]      0.9.7claws39
+
+       general clean up
+       
+       * configure.ac
+               correct and clean up './configure --help' info
+       
+       * src/plugins/clamav/clamav_plugin.c
+         src/plugins/spamassassin/spamassassin.c
+               correct plugin_desc(), works with LOCAL, IMAP, and
+               POP accounts
+               
+       * src/filtering.c
+         src/matcher.[ch]
+         src/matcher_parser_parse.y
+         src/prefs_filtering_action.c
+               use 'Change Score' instead of '(In/De)crease score'.
+               use *CHANGE_SCORE* instead of *ADD_SCORE*
+        
+        * src/mainwindow.c
+               hyphenate: 'Pre-processing', 'Post-processing'
+               
+       * src/prefs_account.c
+               change 'Generate Message-ID' to 'Generate Message-Id'
+               
+       * src/prefs_folder_item.c
+               change 'Processing on startup:' to 'Process at startup'
+               change 'Scan for new mail:' to 'Scan for new mail'
+               
 2003-12-11 [christoph] 0.9.7claws38
 
        * src/crash.c
index 494b8c3..40b4dd9 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -414,7 +414,7 @@ PLUGINS=""
 
 dnl --- Trayicon ---
 AC_ARG_ENABLE(trayicon-plugin,
-       [  --enable-trayicon-plugin   System Tray Icon [default=no]],
+       [  --disable-trayicon-plugin         Do not build System Tray Icon plugin],
        [ac_cv_enable_trayicon_plugin=$enableval], [ac_cv_enable_trayicon_plugin=yes])
 if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
        PLUGINS="trayicon $PLUGINS"
@@ -423,7 +423,7 @@ AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xy
 
 dnl --- SpamAssassin ---
 AC_ARG_ENABLE(spamassassin-plugin,
-       [  --enable-spamassassin-plugin    Build SpamAssassin plugin [default=no]],
+       [  --enable-spamassassin-plugin      Build SpamAssassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN
@@ -433,7 +433,7 @@ AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plug
 
 dnl --- MathML Viewer ---
 AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
+       [  --disable-mathml-viewer-plugin    Do not build MathML-Viewer plugin],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
        PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2 gtkmathview < 0.5, :, ac_cv_enable_mathml_viewer_plugin=no)
@@ -449,14 +449,14 @@ AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_pl
 
 dnl --- Image Viewer ---
 AC_ARG_ENABLE(image-viewer-plugin,
-       [  --disable-image-viewer-plugin   Do not build image viewer plugin],
+       [  --disable-image-viewer-plugin     Do not build image viewer plugin],
        [ac_cv_enable_image_viewer_plugin=$enableval], [ac_cv_enable_image_viewer_plugin=yes])
 if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
        AC_ARG_ENABLE(gdk-pixbuf,
-               [  --disable-gdk-pixbuf    Do not use gdk-pixbuf],
+               [  --disable-gdk-pixbuf              Do not use gdk-pixbuf],
                [ac_cv_enable_gdk_pixbuf=$enableval], [ac_cv_enable_gdk_pixbuf=yes])
        AC_ARG_ENABLE(imlib,
-               [  --disable-imlib         Do not use imlib],
+               [  --disable-imlib                   Do not use imlib],
                [ac_cv_enable_imlib=$enableval], [ac_cv_enable_imlib=yes])
 
        if test "$ac_cv_enable_gdk_pixbuf" = yes; then
@@ -482,7 +482,7 @@ AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plug
 
 dnl --- Dillo Viewer ---
 AC_ARG_ENABLE(dillo-viewer-plugin,
-       [  --enable-dillo-viewer-plugin   Build Dillo plugin for html mail rendering [default=no]],
+       [  --disable-dillo-viewer-plugin     Do not build Dillo plugin for html mail rendering],
        [ac_cv_enable_dillo_viewer_plugin=$enableval], [ac_cv_enable_dillo_viewer_plugin=yes])
 if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
        PLUGINS="dillo-viewer $PLUGINS"
@@ -491,7 +491,7 @@ AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plug
 
 dnl --- Demo ---
 AC_ARG_ENABLE(demo-plugin,
-       [  --enable-demo-plugin    Build demo plugin [default=no]],
+       [  --enable-demo-plugin              Build demo plugin [default=no]],
        [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
 if test x"$ac_cv_enable_demo_plugin" = xyes; then
        PLUGINS="demo $PLUGINS"
@@ -500,7 +500,7 @@ AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
 
 dnl --- ClamAV ---
 AC_ARG_ENABLE(clamav-plugin,
-       [  --enable-clamav-plugin    Build Clam AntiVirus plugin [default=no]],
+       [  --disable-clamav-plugin           Do not build Clam AntiVirus plugin],
        [ac_cv_enable_clamav_plugin=$enableval], [ac_cv_enable_clamav_plugin=yes])
 if test x"$ac_cv_enable_clamav_plugin" = xyes; then
        AC_CHECK_LIB(clamav, cl_scanfile, clamav_lib=-lclamav, ac_cv_enable_clamav_plugin=no)
index bac28ce..fb79d43 100644 (file)
@@ -279,7 +279,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
                info->score = action->score;
                return TRUE;
 
-       case MATCHACTION_ADD_SCORE:
+       case MATCHACTION_CHANGE_SCORE:
                info->score += action->score;
                return TRUE;
 
@@ -431,7 +431,7 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
                g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
                return dest;  
 
-       case MATCHACTION_ADD_SCORE:
+       case MATCHACTION_CHANGE_SCORE:
        case MATCHACTION_SET_SCORE:
                g_snprintf(dest, destlen, "%s %d", command_str, action->score);
                return dest;  
index 91afc98..ad4070d 100644 (file)
@@ -697,9 +697,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/Pre processing..."),
+       {N_("/_Configuration/Pre-processing..."),
                                                NULL, prefs_pre_processing_open_cb, 0, NULL},
-       {N_("/_Configuration/Post processing..."),
+       {N_("/_Configuration/Post-processing..."),
                                                NULL, prefs_post_processing_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
index 28a32e2..c4bb3d2 100644 (file)
@@ -126,7 +126,7 @@ static const MatchParser matchparser_tab[] = {
        {MATCHACTION_EXECUTE, "execute"},
        {MATCHACTION_COLOR, "color"},
        {MATCHACTION_REDIRECT, "redirect"},
-       {MATCHACTION_ADD_SCORE, "add_score"},
+       {MATCHACTION_CHANGE_SCORE, "change_score"},
        {MATCHACTION_SET_SCORE, "set_score"},
        {MATCHACTION_STOP, "stop"},
        {MATCHACTION_HIDE, "hide"},
index a8c284c..8cfb0cf 100644 (file)
@@ -120,7 +120,7 @@ enum {
        MA_(FORWARD_AS_ATTACHMENT),
        MA_(COLOR),
        MA_(REDIRECT),
-       MA_(ADD_SCORE),
+       MA_(CHANGE_SCORE),
        MA_(SET_SCORE),
        MA_(STOP),
        MA_(HIDE),
index c84a8bc..a376763 100644 (file)
@@ -236,7 +236,7 @@ int matcher_parserwrap(void)
 %token MATCHER_LOCKED MATCHER_NOT_LOCKED
 %token MATCHER_COLORLABEL MATCHER_NOT_COLORLABEL
 %token MATCHER_IGNORE_THREAD MATCHER_NOT_IGNORE_THREAD
-%token MATCHER_ADD_SCORE MATCHER_SET_SCORE
+%token MATCHER_CHANGE_SCORE MATCHER_SET_SCORE
 %token MATCHER_STOP MATCHER_HIDE
 
 %start file
@@ -348,7 +348,7 @@ filtering_action_list
                         
                         first_action = action_list->data;
                         
-                        if (first_action->type == MATCHACTION_ADD_SCORE)
+                        if (first_action->type == MATCHACTION_CHANGE_SCORE)
                                 prefs_filtering = &pre_global_processing;
                 }
         }
@@ -1005,12 +1005,12 @@ MATCHER_EXECUTE MATCHER_STRING
        color = strtol($2, NULL, 10);
        action = filteringaction_new(action_type, 0, NULL, color, 0);
 }
-| MATCHER_ADD_SCORE MATCHER_INTEGER
+| MATCHER_CHANGE_SCORE MATCHER_INTEGER
 {
         gint score = 0;
         
         score = strtol($2, NULL, 10);
-       action = filteringaction_new(MATCHACTION_ADD_SCORE, 0,
+       action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
                                     NULL, 0, score);
 }
 /* backward compatibility */
@@ -1019,7 +1019,7 @@ MATCHER_EXECUTE MATCHER_STRING
         gint score = 0;
         
         score = strtol($2, NULL, 10);
-       action = filteringaction_new(MATCHACTION_ADD_SCORE, 0,
+       action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
                                     NULL, 0, score);
 }
 | MATCHER_SET_SCORE MATCHER_INTEGER
index 2ece2f6..ba4aed8 100644 (file)
@@ -226,8 +226,8 @@ const gchar *plugin_name(void)
 
 const gchar *plugin_desc(void)
 {
-       return _("This plugin uses Clam AntiVirus to scan all message attachments "
-              "that are received from a POP account.\n"
+       return _("This plugin uses Clam AntiVirus to scan all messages that are "
+              "received from an IMAP, LOCAL or POP account.\n"
               "\n"
               "When a message attachment is found to contain a virus it can be "
               "deleted or saved in a specially designated folder.\n"
index 396d410..2284a6e 100644 (file)
@@ -311,9 +311,10 @@ const gchar *plugin_name(void)
 
 const gchar *plugin_desc(void)
 {
-       return _("This plugin checks all messages that are received from a POP "
-                "account for spam using a SpamAssassin server. You will need "
-                "a SpamAssassin Server (spamd) running somewhere.\n"
+       return _("This plugin checks all messages that are received from an "
+                "IMAP, LOCAL or POP account for spam using a SpamAssassin "
+                "server. You will need a SpamAssassin Server (spamd) running "
+                "somewhere.\n"
                 "\n"
                 "When a message is identified as spam it can be deleted or "
                 "saved into a special folder.\n"
index ad9906c..3bd5bb4 100644 (file)
@@ -1361,7 +1361,7 @@ static void prefs_account_send_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
        PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date"));
-       PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
+       PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-Id"));
 
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);
index 02e6c76..66d579d 100644 (file)
@@ -119,7 +119,7 @@ typedef enum Action_ {
        ACTION_REDIRECT,
        ACTION_EXECUTE,
        ACTION_COLOR,
-       ACTION_ADD_SCORE,
+       ACTION_CHANGE_SCORE,
        ACTION_SET_SCORE,
        ACTION_HIDE,
        ACTION_STOP,
@@ -144,7 +144,7 @@ static struct {
        { N_("Redirect"),               ACTION_REDIRECT },
        { N_("Execute"),                ACTION_EXECUTE  },
        { N_("Color"),                  ACTION_COLOR    },
-       { N_("(In/de)crease score"),    ACTION_ADD_SCORE},
+       { N_("Change score"),           ACTION_CHANGE_SCORE},
        { N_("Set score"),              ACTION_SET_SCORE},
        { N_("Hide"),                   ACTION_HIDE     },
        { N_("Stop filter"),            ACTION_STOP     },
@@ -714,8 +714,8 @@ static gint prefs_filtering_action_get_matching_from_action(Action action_id)
                return MATCHACTION_HIDE;
        case ACTION_STOP:
                return MATCHACTION_STOP;
-       case ACTION_ADD_SCORE:
-               return MATCHACTION_ADD_SCORE;
+       case ACTION_CHANGE_SCORE:
+               return MATCHACTION_CHANGE_SCORE;
        case ACTION_SET_SCORE:
                return MATCHACTION_SET_SCORE;
        default:
@@ -778,7 +778,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
                        gtk_option_menu_get_menu(GTK_OPTION_MENU(filtering_action.color_optmenu)));
                destination = NULL;     
                break;
-        case ACTION_ADD_SCORE:
+        case ACTION_CHANGE_SCORE:
         case ACTION_SET_SCORE:
                score_str = gtk_entry_get_text(GTK_ENTRY(filtering_action.dest_entry));
                if (*score_str == '\0') {
@@ -1018,9 +1018,9 @@ static void prefs_filtering_action_select(GtkCList *clist,
                                     ACTION_COLOR);
                gtk_option_menu_set_history(GTK_OPTION_MENU(filtering_action.color_optmenu), action->labelcolor);     
                break;
-       case MATCHACTION_ADD_SCORE:
+       case MATCHACTION_CHANGE_SCORE:
                gtk_list_select_item(GTK_LIST(filtering_action.action_type_list),
-                                    ACTION_ADD_SCORE);
+                                    ACTION_CHANGE_SCORE);
                break;
        case MATCHACTION_SET_SCORE:
                gtk_list_select_item(GTK_LIST(filtering_action.action_type_list),
@@ -1344,7 +1344,7 @@ static void prefs_filtering_action_type_select(GtkList *list,
                gtk_widget_show(filtering_action.color_label);
                gtk_widget_hide(filtering_action.score_label);
                break;
-       case ACTION_ADD_SCORE:
+       case ACTION_CHANGE_SCORE:
        case ACTION_SET_SCORE:
                gtk_widget_show(filtering_action.account_label);
                gtk_widget_set_sensitive(filtering_action.account_label, FALSE);
index 7d02fc0..59a38d6 100644 (file)
@@ -198,7 +198,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        rowcount++;
 
        /* Enable processing at startup */
-       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Processing on startup: "));
+       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at startup"));
        gtk_widget_show(checkbtn_enable_processing);
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
@@ -209,7 +209,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        rowcount++;
 
        /* Check folder for new mail */
-       checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
+       checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
        gtk_widget_show(checkbtn_newmailcheck);
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
                                         rowcount, rowcount+1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);