devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 09:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
James Booth
2015-06-05 23:02:56 +01:00
parent a3693cfbe7 ae4e07ad87
commit 9aff8abd2e
82 changed files with 968 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/preferences.c
View File

@@ -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;
}
}
}

5
src/config/theme.c
View File

@@ -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;
}
}
}