debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable maildir synchronization by default.

Browse source 
This is a useful feature that most people should want, so enable it by
default, (still allowing customization to disable it of course).
This commit is contained in:
Carl Worth 2010-11-11 04:11:21 -08:00
parent 937ecd5057
commit 28708d2bd3
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
notmuch-config.c
View file

@ -97,8 +97,6 @@ struct _notmuch_config {
notmuch_bool_t maildir_synchronize_flags; notmuch_bool_t maildir_synchronize_flags;
}; };
#define MAILDIR_SYNC_UNDEF ((notmuch_bool_t)-1)
static int static int
notmuch_config_destructor (notmuch_config_t *config) notmuch_config_destructor (notmuch_config_t *config)
{ {
@ -247,7 +245,7 @@ notmuch_config_open (void *ctx,
config->user_other_email_length = 0; config->user_other_email_length = 0;
config->new_tags = NULL; config->new_tags = NULL;
config->new_tags_length = 0; config->new_tags_length = 0;
config->maildir_synchronize_flags = MAILDIR_SYNC_UNDEF; config->maildir_synchronize_flags = TRUE;
if (! g_key_file_load_from_file (config->key_file, if (! g_key_file_load_from_file (config->key_file,
config->filename, config->filename,
@ -341,8 +339,13 @@ notmuch_config_open (void *ctx,
notmuch_config_set_new_tags (config, tags, 2); notmuch_config_set_new_tags (config, tags, 2);
} }
if (notmuch_config_get_maildir_synchronize_flags (config) == MAILDIR_SYNC_UNDEF) { error = NULL;
notmuch_config_set_maildir_synchronize_flags (config, FALSE); config->maildir_synchronize_flags =
g_key_file_get_boolean (config->key_file,
"maildir", "synchronize_flags", &error);
if (error) {
config->maildir_synchronize_flags = TRUE;
g_error_free (error);
} }
/* Whenever we know of configuration sections that don't appear in /* Whenever we know of configuration sections that don't appear in
@ -745,16 +748,6 @@ notmuch_config_command (void *ctx, int argc, char *argv[])
notmuch_bool_t notmuch_bool_t
notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config) notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config)
{ {
GError *err = NULL;
if (config->maildir_synchronize_flags == MAILDIR_SYNC_UNDEF) {
config->maildir_synchronize_flags =
g_key_file_get_boolean (config->key_file,
"maildir", "synchronize_flags", &err);
if (err) {
config->maildir_synchronize_flags = MAILDIR_SYNC_UNDEF;
g_error_free (err);
}
}
return config->maildir_synchronize_flags; return config->maildir_synchronize_flags;
} }

5
test/maildir-sync
View file

@ -12,11 +12,6 @@ filter_show_json() {
echo echo
} }
cat >> "$NOTMUCH_CONFIG" <<EOF
[maildir]
synchronize_flags=true
EOF
# Create the expected maildir structure # Create the expected maildir structure
mkdir $MAIL_DIR/cur mkdir $MAIL_DIR/cur
mkdir $MAIL_DIR/new mkdir $MAIL_DIR/new