about summary refs log tree commit diff stats
path: root/src/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/config')
-rw-r--r--src/config/preferences.c16
-rw-r--r--src/config/preferences.h1
-rw-r--r--src/config/theme.c2
3 files changed, 6 insertions, 13 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c
index e46cbe45..a1b1dbb3 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -104,7 +104,7 @@ static void _prefs_load(void)
         char *message = g_key_file_get_string(prefs, PREF_GROUP_PRESENCE, "autoaway.message", NULL);
         g_key_file_set_string(prefs, PREF_GROUP_PRESENCE, "autoaway.awaymessage", message);
         g_key_file_remove_key(prefs, PREF_GROUP_PRESENCE, "autoaway.message", NULL);
-        prefs_free_string(message);
+        g_free(message);
     }
 
     // migrate pre 0.5.0 time settings
@@ -123,7 +123,7 @@ static void _prefs_load(void)
         g_key_file_set_string(prefs, PREF_GROUP_UI, "time.private", val);
         g_key_file_set_string(prefs, PREF_GROUP_UI, "time.xmlconsole", val);
         g_key_file_remove_key(prefs, PREF_GROUP_UI, "time", NULL);
-        prefs_free_string(time);
+        g_free(time);
     }
 
     // move pre 0.5.0 notify settings
@@ -137,7 +137,7 @@ static void _prefs_load(void)
             g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room", FALSE);
             g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room.mention", TRUE);
         }
-        prefs_free_string(value);
+        g_free(value);
     }
 
     // move pre 0.6.0 titlebar settings to wintitle
@@ -570,12 +570,6 @@ prefs_get_string_list_with_option(preference_t pref, gchar *option)
 }
 
 void
-prefs_free_string(char *pref)
-{
-    g_free(pref);
-}
-
-void
 prefs_set_string(preference_t pref, char *value)
 {
     const char *group = _get_group(pref);
@@ -632,7 +626,7 @@ prefs_get_tls_certpath(void)
     char *setting = g_key_file_get_string(prefs, group, key, NULL);
 
     if (g_strcmp0(setting, "none") == 0) {
-        prefs_free_string(setting);
+        g_free(setting);
         return NULL;
     }
 
@@ -657,7 +651,7 @@ prefs_get_tls_certpath(void)
     }
 
     char *result = strdup(setting);
-    prefs_free_string(setting);
+    g_free(setting);
 
     return result;
 }
diff --git a/src/config/preferences.h b/src/config/preferences.h
index e3110904..686b9380 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -320,7 +320,6 @@ void prefs_set_boolean(preference_t pref, gboolean value);
 char* prefs_get_string(preference_t pref);
 char* prefs_get_string_with_option(preference_t pref, gchar *option);
 gchar **prefs_get_string_list_with_option(preference_t pref, gchar *option);
-void prefs_free_string(char *pref);
 void prefs_set_string(preference_t pref, char *value);
 void prefs_set_string_with_option(preference_t pref, char *option, char *value);
 void prefs_set_string_list_with_option(preference_t pref, char *option, const gchar* const *values);
diff --git a/src/config/theme.c b/src/config/theme.c
index c4df93a0..6432e386 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -708,7 +708,7 @@ theme_hash_attrs(const char *str)
     } else if (strcmp(color_pref, "blue") == 0) {
         profile = COLOR_PROFILE_BLUE_BLINDNESS;
     }
-    prefs_free_string(color_pref);
+    g_free(color_pref);
 
     return COLOR_PAIR(color_pair_cache_hash_str(str, profile));
 }