changed attachement into attachment

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0eeb5146c9c40244b50abcdaeda48ad682de548b..2bb826acebf9f20278c34d284f04e88c9cddcb8a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-05-17 [hoa]
+
+       * src/filtering.c
+       * src/matcher.[ch]
+       * src/prefs_filtering.c
+               changed attachement into attachment
+

 2001-05-17 [alfons]
 
        0.4.67claws4    
 2001-05-17 [alfons]
 
        0.4.67claws4    


@@ -7,28 +14,28 @@
 
 2001-05-17 [hoa]
 
 
 2001-05-17 [hoa]
 

-* src/Makefile.am
-       added prefs_filtering.c
+       * src/Makefile.am
+               added prefs_filtering.c

 
 

-* src/filtering.[ch]
-* src/matcher.[ch]
-       removed action : forward_news and forward_news_as_attachement
-       (forward and forward_as_attachement can be used instead)
+       * src/filtering.[ch]
+       * src/matcher.[ch]
+               removed action : forward_news and forward_news_as_attachement
+               (forward and forward_as_attachement can be used instead)

 
 

-* src/mainwindow.c
-       added menu option to access filtering configuration
+       * src/mainwindow.c
+               added menu option to access filtering configuration

 
 

-* src/prefs_account.c
-       changed mail_command default to /usr/sbin/sendmail
+       * src/prefs_account.c
+               changed mail_command default to /usr/sbin/sendmail

 
 

-* added src/prefs_filtering.[ch]
-       dialog box for filtering configuration
+       * added src/prefs_filtering.[ch]
+               dialog box for filtering configuration

 
 

-* src/prefs_matcher.c
-       added function prefs_matcher_get_criteria_from_matching()
+       * src/prefs_matcher.c
+               added function prefs_matcher_get_criteria_from_matching()

 
 

-* src/prefs_scoring.c
-       reset the dialog when register or substitute is clicked
+       * src/prefs_scoring.c
+               reset the dialog when register or substitute is clicked

 
 2001-05-15 [hoa]
 
 
 2001-05-15 [hoa]
 

diff --git a/src/filtering.c b/src/filtering.c
index ce392f3c08420b7876d5af1aaf640e74e6d8f1c5..a2d76462341d5a8c4f7056c287b638c282585eaa 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -88,7 +88,7 @@ FilteringAction * filteringaction_parse(gchar ** str)
                }
 
                break;
                }
 
                break;

-       case MATCHING_ACTION_FORWARD_AS_ATTACHEMENT:
+       case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:

                account_id = matcher_parse_number(&tmp);
                if (tmp == NULL) {
                        * str = NULL;
                account_id = matcher_parse_number(&tmp);
                if (tmp == NULL) {
                        * str = NULL;


@@ -286,7 +286,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
 
                return FALSE;
 
 
                return FALSE;
 

-       case MATCHING_ACTION_FORWARD_AS_ATTACHEMENT:
+       case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:

 
                return FALSE;
 
 
                return FALSE;
 


@@ -335,7 +335,7 @@ static gboolean filteringprop_apply(FilteringProp * filtering, MsgInfo * info,
                case MATCHING_ACTION_UNMARK:
                case MATCHING_ACTION_MARK_AS_UNREAD:
                case MATCHING_ACTION_FORWARD:
                case MATCHING_ACTION_UNMARK:
                case MATCHING_ACTION_MARK_AS_UNREAD:
                case MATCHING_ACTION_FORWARD:

-               case MATCHING_ACTION_FORWARD_AS_ATTACHEMENT:
+               case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:

                        return FALSE;
                default:
                        return FALSE;
                        return FALSE;
                default:
                        return FALSE;


@@ -473,7 +473,7 @@ gchar * filteringaction_to_string(FilteringAction * action)
                break;
 
        case MATCHING_ACTION_FORWARD:
                break;
 
        case MATCHING_ACTION_FORWARD:

-       case MATCHING_ACTION_FORWARD_AS_ATTACHEMENT:
+       case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:

                account_id_str = itos(action->account_id);
                return g_strconcat(command_str, " ", account_id_str,
                                   " \"", action->destination, "\"", NULL);
                account_id_str = itos(action->account_id);
                return g_strconcat(command_str, " ", account_id_str,
                                   " \"", action->destination, "\"", NULL);

diff --git a/src/matcher.c b/src/matcher.c
index 58a9ce737c9783e7ac62c7357cd0dcf343ada877..e6308eb52699ba72133635374b4bff9ebfdf638e 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -80,7 +80,7 @@ static MatchParser matchparser_tab[] = {
        {MATCHING_ACTION_MARK_AS_READ, "mark_as_read"},
        {MATCHING_ACTION_MARK_AS_UNREAD, "mark_as_unread"},
        {MATCHING_ACTION_FORWARD, "forward"},
        {MATCHING_ACTION_MARK_AS_READ, "mark_as_read"},
        {MATCHING_ACTION_MARK_AS_UNREAD, "mark_as_unread"},
        {MATCHING_ACTION_FORWARD, "forward"},

-       {MATCHING_ACTION_FORWARD_AS_ATTACHEMENT, "forward_as_attachement"},
+       {MATCHING_ACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},

 };
 
 gchar * get_matchparser_tab_str(gint id)
 };
 
 gchar * get_matchparser_tab_str(gint id)

diff --git a/src/matcher.h b/src/matcher.h
index 5a065c48de395e3392f808f10d0e45a2f8fe19a2..6ecd526819911507de9862332f26f7c39b38b484 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -67,7 +67,7 @@ enum {
        MATCHING_ACTION_UNMARK,
        MATCHING_ACTION_MARK_AS_UNREAD,
        MATCHING_ACTION_FORWARD,
        MATCHING_ACTION_UNMARK,
        MATCHING_ACTION_MARK_AS_UNREAD,
        MATCHING_ACTION_FORWARD,

-       MATCHING_ACTION_FORWARD_AS_ATTACHEMENT,
+       MATCHING_ACTION_FORWARD_AS_ATTACHMENT,

 
        MATCHING_MATCH,
        MATCHING_REGEXP,
 
        MATCHING_MATCH,
        MATCHING_REGEXP,

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 256d1c1b0202ba89227cded79d79a85069f35809..5a1229712d284c114476861d17f8a58bb6de79de 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -111,7 +111,7 @@ enum {
        ACTION_MARK_AS_READ = 5,
        ACTION_MARK_AS_UNREAD = 6,
        ACTION_FORWARD = 7,
        ACTION_MARK_AS_READ = 5,
        ACTION_MARK_AS_UNREAD = 6,
        ACTION_FORWARD = 7,

-       ACTION_FORWARD_AS_ATTACHEMENT =8
+       ACTION_FORWARD_AS_ATTACHMENT =8

 };
 
 static gint get_sel_from_list(GtkList * list)
 };
 
 static gint get_sel_from_list(GtkList * list)


@@ -181,8 +181,8 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
                return MATCHING_ACTION_MARK_AS_UNREAD;
        case ACTION_FORWARD:
                return MATCHING_ACTION_FORWARD;
                return MATCHING_ACTION_MARK_AS_UNREAD;
        case ACTION_FORWARD:
                return MATCHING_ACTION_FORWARD;

-       case ACTION_FORWARD_AS_ATTACHEMENT:
-               return MATCHING_ACTION_FORWARD_AS_ATTACHEMENT;
+       case ACTION_FORWARD_AS_ATTACHMENT:
+               return MATCHING_ACTION_FORWARD_AS_ATTACHMENT;

        default:
                return -1;
        }
        default:
                return -1;
        }


@@ -191,7 +191,7 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
 gchar * action_text [] = {
        "Move", "Copy", "Delete",
        "Mark", "Unmark", "Mark as read", "Mark as unread",
 gchar * action_text [] = {
        "Move", "Copy", "Delete",
        "Mark", "Unmark", "Mark as read", "Mark as unread",

-       "Forward", "Forward as attachement"
+       "Forward", "Forward as attachment"

 };
 
 void prefs_filtering_open(void)
 };
 
 void prefs_filtering_open(void)


@@ -655,7 +655,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        case ACTION_MOVE:
        case ACTION_COPY:
        case ACTION_FORWARD:
        case ACTION_MOVE:
        case ACTION_COPY:
        case ACTION_FORWARD:

-       case ACTION_FORWARD_AS_ATTACHEMENT:
+       case ACTION_FORWARD_AS_ATTACHMENT:

                destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
                if (*destination == '\0') {
                        alertpanel_error(_("Destination is not set."));
                destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
                if (*destination == '\0') {
                        alertpanel_error(_("Destination is not set."));


@@ -817,10 +817,10 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;

-       case MATCHING_ACTION_FORWARD_AS_ATTACHEMENT:
+       case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:

                list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.action_list),

-                                    ACTION_FORWARD_AS_ATTACHEMENT);
+                                    ACTION_FORWARD_AS_ATTACHMENT);

                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;


@@ -914,7 +914,7 @@ static void prefs_filtering_action_select(GtkList *list,
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                break;
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                break;

-       case ACTION_FORWARD_AS_ATTACHEMENT:
+       case ACTION_FORWARD_AS_ATTACHMENT:

                gtk_widget_set_sensitive(filtering.account_combo, TRUE);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_set_sensitive(filtering.account_combo, TRUE);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);