These are no longer used, replaced by notmuch_config_get.
---
notmuch-client.h | 29 ------------
notmuch-config.c | 119 -----------------------------------------------
2 files changed, 148 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index dfdfc876..677f2f39 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -275,70 +275,41 @@ notmuch_config_save (notmuch_config_t *config);
bool
notmuch_config_is_new (notmuch_config_t *config);
-const char *
-notmuch_config_get_database_path (notmuch_config_t *config);
-
void
notmuch_config_set_database_path (notmuch_config_t *config,
const char *database_path);
-const char *
-notmuch_config_get_user_name (notmuch_config_t *config);
-
void
notmuch_config_set_user_name (notmuch_config_t *config,
const char *user_name);
-const char *
-notmuch_config_get_user_primary_email (notmuch_config_t *config);
-
void
notmuch_config_set_user_primary_email (notmuch_config_t *config,
const char *primary_email);
-const char **
-notmuch_config_get_user_other_email (notmuch_config_t *config,
- size_t *length);
-
void
notmuch_config_set_user_other_email (notmuch_config_t *config,
const char *other_email[],
size_t length);
-const char **
-notmuch_config_get_new_tags (notmuch_config_t *config,
- size_t *length);
void
notmuch_config_set_new_tags (notmuch_config_t *config,
const char *new_tags[],
size_t length);
-const char **
-notmuch_config_get_new_ignore (notmuch_config_t *config,
- size_t *length);
-
void
notmuch_config_set_new_ignore (notmuch_config_t *config,
const char *new_ignore[],
size_t length);
-bool
-notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config);
-
void
notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,
bool synchronize_flags);
-const char **
-notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t
*length);
-
void
notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[],
size_t length);
-const char *
-_notmuch_config_get_path (notmuch_config_t *config);
-
int
notmuch_run_hook (notmuch_database_t *notmuch, const char *hook);
diff --git a/notmuch-config.c b/notmuch-config.c
index 390998b1..1382b0a3 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -359,9 +359,6 @@ notmuch_config_close (notmuch_config_t *config)
talloc_free (config);
}
-const char *_notmuch_config_get_path (notmuch_config_t *config) {
- return config->filename;
-}
/* Save any changes made to the notmuch configuration.
*
* Any comments originally in the file will be preserved.
@@ -425,22 +422,6 @@ notmuch_config_is_new (notmuch_config_t *config)
return config->is_new;
}
-static const char *
-_config_get (notmuch_config_t *config, char **field,
- const char *group, const char *key)
-{
- /* read from config file and cache value, if not cached already */
- if (*field == NULL) {
- char *value;
- value = g_key_file_get_string (config->key_file, group, key, NULL);
- if (value) {
- *field = talloc_strdup (config, value);
- free (value);
- }
- }
- return *field;
-}
-
static void
_config_set (notmuch_config_t *config, char **field,
const char *group, const char *key, const char *value)
@@ -452,38 +433,6 @@ _config_set (notmuch_config_t *config, char **field,
*field = NULL;
}
-static const char **
-_config_get_list (notmuch_config_t *config,
- const char *section, const char *key,
- const char ***outlist, size_t *list_length, size_t
*ret_length)
-{
- assert (outlist);
-
- /* read from config file and cache value, if not cached already */
- if (*outlist == NULL) {
-
- char **inlist = g_key_file_get_string_list (config->key_file,
- section, key, list_length,
NULL);
- if (inlist) {
- unsigned int i;
-
- *outlist = talloc_size (config, sizeof (char *) * (*list_length +
1));
-
- for (i = 0; i < *list_length; i++)
- (*outlist)[i] = talloc_strdup (*outlist, inlist[i]);
-
- (*outlist)[i] = NULL;
-
- g_strfreev (inlist);
- }
- }
-
- if (ret_length)
- *ret_length = *list_length;
-
- return *outlist;
-}
-
static void
_config_set_list (notmuch_config_t *config,
const char *group, const char *key,
@@ -497,24 +446,6 @@ _config_set_list (notmuch_config_t *config,
*config_var = NULL;
}
-const char *
-notmuch_config_get_database_path (notmuch_config_t *config)
-{
- char *db_path = (char *) _config_get (config, &config->database_path,
"database", "path");
-
- if (db_path && *db_path != '/') {
- /* If the path in the configuration file begins with any
- * character other than /, presume that it is relative to
- * $HOME and update as appropriate.
- */
- char *abs_path = talloc_asprintf (config, "%s/%s", getenv ("HOME"),
db_path);
- talloc_free (db_path);
- db_path = config->database_path = abs_path;
- }
-
- return db_path;
-}
-
void
notmuch_config_set_database_path (notmuch_config_t *config,
const char *database_path)
@@ -522,12 +453,6 @@ notmuch_config_set_database_path (notmuch_config_t *config,
_config_set (config, &config->database_path, "database", "path",
database_path);
}
-const char *
-notmuch_config_get_user_name (notmuch_config_t *config)
-{
- return _config_get (config, &config->user_name, "user", "name");
-}
-
void
notmuch_config_set_user_name (notmuch_config_t *config,
const char *user_name)
@@ -535,12 +460,6 @@ notmuch_config_set_user_name (notmuch_config_t *config,
_config_set (config, &config->user_name, "user", "name", user_name);
}
-const char *
-notmuch_config_get_user_primary_email (notmuch_config_t *config)
-{
- return _config_get (config, &config->user_primary_email, "user",
"primary_email");
-}
-
void
notmuch_config_set_user_primary_email (notmuch_config_t *config,
const char *primary_email)
@@ -548,30 +467,6 @@ notmuch_config_set_user_primary_email (notmuch_config_t
*config,
_config_set (config, &config->user_primary_email, "user", "primary_email",
primary_email);
}
-const char **
-notmuch_config_get_user_other_email (notmuch_config_t *config, size_t
*length)
-{
- return _config_get_list (config, "user", "other_email",
- &(config->user_other_email),
- &(config->user_other_email_length), length);
-}
-
-const char **
-notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length)
-{
- return _config_get_list (config, "new", "tags",
- &(config->new_tags),
- &(config->new_tags_length), length);
-}
-
-const char **
-notmuch_config_get_new_ignore (notmuch_config_t *config, size_t *length)
-{
- return _config_get_list (config, "new", "ignore",
- &(config->new_ignore),
- &(config->new_ignore_length), length);
-}
-
void
notmuch_config_set_user_other_email (notmuch_config_t *config,
const char *list[],
@@ -599,14 +494,6 @@ notmuch_config_set_new_ignore (notmuch_config_t *config,
&(config->new_ignore));
}
-const char **
-notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t
*length)
-{
- return _config_get_list (config, "search", "exclude_tags",
- &(config->search_exclude_tags),
- &(config->search_exclude_tags_length), length);
-}
-
void
notmuch_config_set_search_exclude_tags (notmuch_config_t *config,
const char *list[],
@@ -881,12 +768,6 @@ notmuch_config_command (notmuch_config_t *config,
notmuch_database_t *notmuch, i
}
-bool
-notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config)
-{
- return config->maildir_synchronize_flags;
-}
-
void
notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,
bool synchronize_flags)
--
2.30.0
_______________________________________________
notmuch mailing list -- [email protected]
To unsubscribe send an email to [email protected]
