diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-06-18 16:57:50 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-06-18 16:57:50 +0800 |
| commit | af2b5dd152cd54daaf21533b98a704744cbc9265 (patch) | |
| tree | a2dc371b03002de04097e6b364085168bd050a25 /mail | |
| parent | 9eec91e7be4cd60778e3e624ab60d17721d4050a (diff) | |
| download | gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar.gz gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar.bz2 gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar.lz gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar.xz gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.tar.zst gsoc2013-evolution-af2b5dd152cd54daaf21533b98a704744cbc9265.zip | |
** See #31027.
2004-06-18 Not Zed <NotZed@Ximian.com>
** See #31027.
* em-vfolder-editor.c (em_vfolder_editor_new): make sure we
construct the rule editor with a source of 'incoming', otherwise
newly created rules have no source in the current session.
* em-vfolder-rule.c (em_vfolder_rule_init): init the vfolder
source to 'incoming' always.
* mail-vfolder.c (uri_is_ignore): fix debug statement.
svn path=/trunk/; revision=26415
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-vfolder-editor.c | 2 | ||||
| -rw-r--r-- | mail/em-vfolder-rule.c | 1 | ||||
| -rw-r--r-- | mail/mail-vfolder.c | 5 |
4 files changed, 17 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f0d6f83a4c..f6af13ea4f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,16 @@ 2004-06-18 Not Zed <NotZed@Ximian.com> + ** See #31027. + + * em-vfolder-editor.c (em_vfolder_editor_new): make sure we + construct the rule editor with a source of 'incoming', otherwise + newly created rules have no source in the current session. + + * em-vfolder-rule.c (em_vfolder_rule_init): init the vfolder + source to 'incoming' always. + + * mail-vfolder.c (uri_is_ignore): fix debug statement. + ** See #60214. * em-folder-view.c (em_folder_view_print): re-arrange code to make diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 3974790223..3e7aa3e282 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -101,7 +101,7 @@ em_vfolder_editor_new (EMVFolderContext *vc) GladeXML *gui; gui = glade_xml_new (EVOLUTION_GLADEDIR "/filter.glade", "rule_editor", NULL); - rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, NULL, _("Virtual _Folders")); + rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Virtual _Folders")); gtk_widget_hide(glade_xml_get_widget (gui, "filter_source")); g_object_unref (gui); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index f7afd05a35..fc8532eba0 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -111,6 +111,7 @@ static void em_vfolder_rule_init(EMVFolderRule *vr) { vr->with = EM_VFOLDER_RULE_WITH_SPECIFIC; + vr->rule.source = g_strdup("incoming"); } static void diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index c8ed01a9eb..07a2a85128 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -342,7 +342,10 @@ uri_is_ignore(const char *uri, GCompareFunc uri_cmp) EIterator *iter; int found = FALSE; - d(printf("checking '%s' against:\n %s\n %s\n %s\n", uri, default_outbox_folder_uri, default_sent_folder_uri, default_drafts_folder_uri)); + d(printf("checking '%s' against:\n %s\n %s\n %s\n", uri, + mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), + mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT), + mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS))); found = uri_cmp(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), uri) || uri_cmp(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT), uri) |