diff options
author | James Booth <boothj5@gmail.com> | 2015-06-05 23:02:56 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-05 23:02:56 +0100 |
commit | 9aff8abd2ed405e2790bb3918834ef501542d4f5 (patch) | |
tree | f78d54491b01c2c8d259f37459ad2229e6919d71 /src/config | |
parent | a3693cfbe744c6ba8274b56a437f1faaaad414bf (diff) | |
parent | ae4e07ad87968072893b58c2ee778b52fc3059da (diff) | |
download | profani-tty-9aff8abd2ed405e2790bb3918834ef501542d4f5.tar.gz |
Merge branch 'master' into openpgp
Conflicts: .travis.yml
Diffstat (limited to 'src/config')
-rw-r--r-- | src/config/preferences.c | 4 | ||||
-rw-r--r-- | src/config/theme.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index b7ca113e..e892d796 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -82,7 +82,7 @@ prefs_load(void) { GError *err; - log_info("Loading preferences"); +// log_info("Loading preferences"); prefs_loc = _get_preferences_file(); if (g_file_test(prefs_loc, G_FILE_TEST_EXISTS)) { @@ -743,4 +743,4 @@ _get_default_string(preference_t pref) default: return NULL; } -} \ No newline at end of file +} diff --git a/src/config/theme.c b/src/config/theme.c index 537771b1..640b7298 100644 --- a/src/config/theme.c +++ b/src/config/theme.c @@ -207,12 +207,15 @@ theme_close(void) { if (theme) { g_key_file_free(theme); + theme = NULL; } if (theme_loc) { g_string_free(theme_loc, TRUE); + theme_loc = NULL; } if (bold_items) { g_hash_table_destroy(bold_items); + bold_items = NULL; } } @@ -614,4 +617,4 @@ theme_attrs(theme_item_t attrs) return result; } -} \ No newline at end of file +} |