From 55be1de29c7eebc35f685de17b4f9abaa1b2e76a Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 26 Feb 2026 22:47:23 +0100 Subject: [PATCH] cleanup: use g_new0 and g_strdup for alias allocation And move whole preferences module to gchar. --- src/command/cmd_funcs.c | 2 +- src/config/preferences.c | 156 +++++++++++++++++++-------------------- src/config/preferences.h | 48 ++++++------ src/ui/console.c | 16 ++-- src/ui/rosterwin.c | 2 +- src/xmpp/connection.c | 2 +- 6 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 2f9e2d0e..257d6ae7 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -206,7 +206,7 @@ cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args) cons_show("Certificate path defaulted to finding system certpath."); return TRUE; } else if (args[1] == NULL) { - auto_char char* path = prefs_get_tls_certpath(); + auto_gchar gchar* path = prefs_get_tls_certpath(); if (path) { cons_show("Trusted certificate path: %s", path); } else { diff --git a/src/config/preferences.c b/src/config/preferences.c index 93eed0fa..a971d1e2 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -78,10 +78,10 @@ static Autocomplete boolean_choice_ac; static Autocomplete room_trigger_ac; static void _save_prefs(void); -static const char* _get_group(preference_t pref); -static const char* _get_key(preference_t pref); +static const gchar* _get_group(preference_t pref); +static const gchar* _get_key(preference_t pref); static gboolean _get_default_boolean(preference_t pref); -static char* _get_default_string(preference_t pref); +static gchar* _get_default_string(preference_t pref); static void _prefs_load(void) @@ -110,7 +110,7 @@ _prefs_load(void) // migrate pre 0.5.0 time settings if (g_key_file_has_key(prefs, PREF_GROUP_UI, "time", NULL)) { auto_gchar gchar* time = g_key_file_get_string(prefs, PREF_GROUP_UI, "time", NULL); - char* val = time ? time : "off"; + gchar* val = time ? time : "off"; g_key_file_set_string(prefs, PREF_GROUP_UI, "time.console", val); g_key_file_set_string(prefs, PREF_GROUP_UI, "time.chat", val); g_key_file_set_string(prefs, PREF_GROUP_UI, "time.muc", val); @@ -179,7 +179,7 @@ _prefs_load(void) if (values && !g_key_file_has_key(prefs, PREF_GROUP_EXECUTABLES, "url.open.cmd", NULL)) { // First value in array is `require_save` option -- we ignore that // one as there is no such option anymore. - char* executable = values[1]; + gchar* executable = values[1]; g_key_file_set_string(prefs, PREF_GROUP_EXECUTABLES, "url.open.cmd", executable); g_key_file_set_comment(prefs, PREF_GROUP_EXECUTABLES, "url.open.cmd", " Migrated from url.open.cmd[DEF]. `require_save` option has been removed in v0.10 and was discarded.", NULL); @@ -275,7 +275,7 @@ prefs_reload(void) } void -prefs_load(const char* config_file) +prefs_load(const gchar* config_file) { if (config_file == NULL) { load_config_keyfile(&prefs_prof_keyfile, FILE_PROFRC); @@ -288,7 +288,7 @@ prefs_load(const char* config_file) } static void -prefs_changes_print(const char* key, const char* newval, const char* oldval, gboolean* banner_shown) +prefs_changes_print(const gchar* key, const gchar* newval, const gchar* oldval, gboolean* banner_shown) { #define PREFS_CHANGES_FORMAT_STRING "%-32s | %-20s | %-20s" if (!*banner_shown) { @@ -302,7 +302,7 @@ prefs_changes_print(const char* key, const char* newval, const char* oldval, gbo void prefs_changes(void) { - const char* undef = ""; + const gchar* undef = ""; prof_keyfile_t saved; if (!load_custom_keyfile(&saved, g_strdup(prefs_prof_keyfile.filename))) return; @@ -374,7 +374,7 @@ prefs_close(void) } gchar* -prefs_autocomplete_boolean_choice(const char* const prefix, gboolean previous, void* context) +prefs_autocomplete_boolean_choice(const gchar* const prefix, gboolean previous, void* context) { return autocomplete_complete(boolean_choice_ac, prefix, TRUE, previous); } @@ -386,7 +386,7 @@ prefs_reset_boolean_choice(void) } gchar* -prefs_autocomplete_room_trigger(const char* const prefix, gboolean previous, void* context) +prefs_autocomplete_room_trigger(const gchar* const prefix, gboolean previous, void* context) { return autocomplete_complete(room_trigger_ac, prefix, TRUE, previous); } @@ -412,7 +412,7 @@ prefs_do_chat_notify(gboolean current_win) } GList* -prefs_message_get_triggers(const char* const message) +prefs_message_get_triggers(const gchar* const message) { GList* result = NULL; @@ -431,8 +431,8 @@ prefs_message_get_triggers(const char* const message) } gboolean -prefs_do_room_notify(gboolean current_win, const char* const roomjid, const char* const mynick, - const char* const theirnick, const char* const message, gboolean mention, gboolean trigger_found) +prefs_do_room_notify(gboolean current_win, const gchar* const roomjid, const gchar* const mynick, + const gchar* const theirnick, const gchar* const message, gboolean mention, gboolean trigger_found) { if (g_strcmp0(mynick, theirnick) == 0) { return FALSE; @@ -481,7 +481,7 @@ prefs_do_room_notify(gboolean current_win, const char* const roomjid, const char } gboolean -prefs_do_room_notify_mention(const char* const roomjid, int unread, gboolean mention, gboolean trigger) +prefs_do_room_notify_mention(const gchar* const roomjid, int unread, gboolean mention, gboolean trigger) { gboolean notify_room = FALSE; if (g_key_file_has_key(prefs, roomjid, "notify", NULL)) { @@ -517,61 +517,61 @@ prefs_do_room_notify_mention(const char* const roomjid, int unread, gboolean men } void -prefs_set_room_notify(const char* const roomjid, gboolean value) +prefs_set_room_notify(const gchar* const roomjid, gboolean value) { g_key_file_set_boolean(prefs, roomjid, "notify", value); } void -prefs_set_room_notify_mention(const char* const roomjid, gboolean value) +prefs_set_room_notify_mention(const gchar* const roomjid, gboolean value) { g_key_file_set_boolean(prefs, roomjid, "notify.mention", value); } void -prefs_set_room_notify_trigger(const char* const roomjid, gboolean value) +prefs_set_room_notify_trigger(const gchar* const roomjid, gboolean value) { g_key_file_set_boolean(prefs, roomjid, "notify.trigger", value); } gboolean -prefs_has_room_notify(const char* const roomjid) +prefs_has_room_notify(const gchar* const roomjid) { return g_key_file_has_key(prefs, roomjid, "notify", NULL); } gboolean -prefs_has_room_notify_mention(const char* const roomjid) +prefs_has_room_notify_mention(const gchar* const roomjid) { return g_key_file_has_key(prefs, roomjid, "notify.mention", NULL); } gboolean -prefs_has_room_notify_trigger(const char* const roomjid) +prefs_has_room_notify_trigger(const gchar* const roomjid) { return g_key_file_has_key(prefs, roomjid, "notify.trigger", NULL); } gboolean -prefs_get_room_notify(const char* const roomjid) +prefs_get_room_notify(const gchar* const roomjid) { return g_key_file_get_boolean(prefs, roomjid, "notify", NULL); } gboolean -prefs_get_room_notify_mention(const char* const roomjid) +prefs_get_room_notify_mention(const gchar* const roomjid) { return g_key_file_get_boolean(prefs, roomjid, "notify.mention", NULL); } gboolean -prefs_get_room_notify_trigger(const char* const roomjid) +prefs_get_room_notify_trigger(const gchar* const roomjid) { return g_key_file_get_boolean(prefs, roomjid, "notify.trigger", NULL); } gboolean -prefs_reset_room_notify(const char* const roomjid) +prefs_reset_room_notify(const gchar* const roomjid) { if (g_key_file_has_group(prefs, roomjid)) { g_key_file_remove_group(prefs, roomjid, NULL); @@ -584,8 +584,8 @@ prefs_reset_room_notify(const char* const roomjid) gboolean prefs_get_boolean(preference_t pref) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); gboolean def = _get_default_boolean(pref); if (!g_key_file_has_key(prefs, group, key, NULL)) { @@ -598,8 +598,8 @@ prefs_get_boolean(preference_t pref) void prefs_set_boolean(preference_t pref, gboolean value) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); g_key_file_set_boolean(prefs, group, key, value); } @@ -614,9 +614,9 @@ prefs_set_boolean(preference_t pref, gboolean value) gchar* prefs_get_string(preference_t pref) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); - char* def = _get_default_string(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); + gchar* def = _get_default_string(pref); gchar* result = g_key_file_get_string(prefs, group, key, NULL); @@ -643,9 +643,9 @@ prefs_get_string(preference_t pref) gchar* prefs_get_string_with_locale(preference_t pref, gchar* locale) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); - char* def = _get_default_string(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); + gchar* def = _get_default_string(pref); gchar* result = g_key_file_get_locale_string(prefs, group, key, locale, NULL); @@ -674,8 +674,8 @@ prefs_get_string_with_locale(preference_t pref, gchar* locale) void prefs_set_string(preference_t pref, const gchar* new_value) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); if (new_value == NULL) { g_key_file_remove_key(prefs, group, key, NULL); } else { @@ -684,10 +684,10 @@ prefs_set_string(preference_t pref, const gchar* new_value) } void -prefs_set_string_with_option(preference_t pref, char* option, char* value) +prefs_set_string_with_option(preference_t pref, gchar* option, gchar* value) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); if (value == NULL) { g_key_file_remove_key(prefs, group, key, NULL); } else { @@ -696,10 +696,10 @@ 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) +prefs_set_string_list_with_option(preference_t pref, gchar* option, const gchar* const* values) { - const char* group = _get_group(pref); - const char* key = _get_key(pref); + const gchar* group = _get_group(pref); + const gchar* key = _get_key(pref); if (values == NULL || *values == NULL) { if (g_strcmp0(option, "*") == 0) { g_key_file_set_string_list(prefs, group, key, NULL, 0); @@ -719,11 +719,11 @@ prefs_set_string_list_with_option(preference_t pref, char* option, const gchar* } } -char* +gchar* prefs_get_tls_certpath(void) { - const char* group = _get_group(PREF_TLS_CERTPATH); - const char* key = _get_key(PREF_TLS_CERTPATH); + const gchar* group = _get_group(PREF_TLS_CERTPATH); + const gchar* key = _get_key(PREF_TLS_CERTPATH); auto_gchar gchar* setting = g_key_file_get_string(prefs, group, key, NULL); @@ -751,7 +751,7 @@ prefs_get_tls_certpath(void) return NULL; } - char* result = strdup(setting); + gchar* result = g_strdup(setting); return result; } @@ -955,14 +955,14 @@ prefs_get_plugins(void) } void -prefs_add_plugin(const char* const name) +prefs_add_plugin(const gchar* const name) { conf_string_list_add(prefs, PREF_GROUP_PLUGINS, "load", name); _save_prefs(); } void -prefs_remove_plugin(const char* const name) +prefs_remove_plugin(const gchar* const name) { conf_string_list_remove(prefs, PREF_GROUP_PLUGINS, "load", name); _save_prefs(); @@ -996,7 +996,7 @@ prefs_get_occupants_char(void) } void -prefs_set_occupants_char(char* ch) +prefs_set_occupants_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "occupants.char", ch); @@ -1041,7 +1041,7 @@ prefs_get_occupants_header_char(void) } void -prefs_set_occupants_header_char(char* ch) +prefs_set_occupants_header_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "occupants.header.char", ch); @@ -1075,7 +1075,7 @@ prefs_get_roster_size(void) } static gchar* -_prefs_get_encryption_char(const char* const ch, const char* const pref_group, const char* const key) +_prefs_get_encryption_char(const gchar* const ch, const gchar* const pref_group, const gchar* const key) { gchar* result = NULL; @@ -1090,7 +1090,7 @@ _prefs_get_encryption_char(const char* const ch, const char* const pref_group, c } static gboolean -_prefs_set_encryption_char(const char* const ch, const char* const pref_group, const char* const key) +_prefs_set_encryption_char(const gchar* const ch, const gchar* const pref_group, const gchar* const key) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, pref_group, key, ch); @@ -1108,7 +1108,7 @@ prefs_get_otr_char(void) } gboolean -prefs_set_otr_char(char* ch) +prefs_set_otr_char(gchar* ch) { return _prefs_set_encryption_char(ch, PREF_GROUP_OTR, "otr.char"); } @@ -1120,7 +1120,7 @@ prefs_get_pgp_char(void) } gboolean -prefs_set_pgp_char(char* ch) +prefs_set_pgp_char(gchar* ch) { return _prefs_set_encryption_char(ch, PREF_GROUP_PGP, "pgp.char"); } @@ -1132,7 +1132,7 @@ prefs_get_ox_char(void) } gboolean -prefs_set_ox_char(char* ch) +prefs_set_ox_char(gchar* ch) { return _prefs_set_encryption_char(ch, PREF_GROUP_OX, "ox.char"); } @@ -1144,7 +1144,7 @@ prefs_get_omemo_char(void) } gboolean -prefs_set_omemo_char(char* ch) +prefs_set_omemo_char(gchar* ch) { return _prefs_set_encryption_char(ch, PREF_GROUP_OMEMO, "omemo.char"); } @@ -1156,7 +1156,7 @@ prefs_get_roster_header_char(void) } void -prefs_set_roster_header_char(char* ch) +prefs_set_roster_header_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.header.char", ch); @@ -1178,7 +1178,7 @@ prefs_get_roster_contact_char(void) } void -prefs_set_roster_contact_char(char* ch) +prefs_set_roster_contact_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.contact.char", ch); @@ -1200,7 +1200,7 @@ prefs_get_roster_resource_char(void) } void -prefs_set_roster_resource_char(char* ch) +prefs_set_roster_resource_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.resource.char", ch); @@ -1222,7 +1222,7 @@ prefs_get_roster_private_char(void) } void -prefs_set_roster_private_char(char* ch) +prefs_set_roster_private_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.private.char", ch); @@ -1244,7 +1244,7 @@ prefs_get_roster_room_char(void) } void -prefs_set_roster_room_char(char* ch) +prefs_set_roster_room_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.char", ch); @@ -1266,7 +1266,7 @@ prefs_get_roster_room_private_char(void) } void -prefs_set_roster_room_private_char(char* ch) +prefs_set_roster_room_private_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.rooms.private.char", ch); @@ -1353,7 +1353,7 @@ prefs_get_correction_char(void) } void -prefs_set_correction_char(char* ch) +prefs_set_correction_char(gchar* ch) { if (g_utf8_strlen(ch, 4) == 1) { g_key_file_set_string(prefs, PREF_GROUP_UI, "correction.char", ch); @@ -1363,7 +1363,7 @@ prefs_set_correction_char(char* ch) } gboolean -prefs_add_room_notify_trigger(const char* const text) +prefs_add_room_notify_trigger(const gchar* const text) { gboolean res = conf_string_list_add(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", text); @@ -1375,7 +1375,7 @@ prefs_add_room_notify_trigger(const char* const text) } gboolean -prefs_remove_room_notify_trigger(const char* const text) +prefs_remove_room_notify_trigger(const gchar* const text) { gboolean res = conf_string_list_remove(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", text); _save_prefs(); @@ -1695,7 +1695,7 @@ prefs_inputwin_pos_down(void) } gboolean -prefs_add_alias(const char* const name, const char* const value) +prefs_add_alias(const gchar* const name, const gchar* const value) { if (g_key_file_has_key(prefs, PREF_GROUP_ALIAS, name, NULL)) { return FALSE; @@ -1706,13 +1706,13 @@ prefs_add_alias(const char* const name, const char* const value) } gchar* -prefs_get_alias(const char* const name) +prefs_get_alias(const gchar* const name) { return g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL); } gboolean -prefs_remove_alias(const char* const name) +prefs_remove_alias(const gchar* const name) { if (!g_key_file_has_key(prefs, PREF_GROUP_ALIAS, name, NULL)) { return FALSE; @@ -1742,13 +1742,13 @@ prefs_get_aliases(void) auto_gcharv gchar** keys = g_key_file_get_keys(prefs, PREF_GROUP_ALIAS, &len, NULL); for (gsize i = 0; i < len; i++) { - char* name = keys[i]; + gchar* name = keys[i]; auto_gchar gchar* value = g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL); if (value) { - ProfAlias* alias = malloc(sizeof(struct prof_alias_t)); - alias->name = strdup(name); - alias->value = strdup(value); + ProfAlias* alias = g_new0(struct prof_alias_t, 1); + alias->name = g_strdup(name); + alias->value = g_strdup(value); result = g_list_insert_sorted(result, alias, (GCompareFunc)_alias_cmp); } @@ -1761,9 +1761,9 @@ prefs_get_aliases(void) void _free_alias(ProfAlias* alias) { - FREE_SET_NULL(alias->name); - FREE_SET_NULL(alias->value); - FREE_SET_NULL(alias); + GFREE_SET_NULL(alias->name); + GFREE_SET_NULL(alias->value); + GFREE_SET_NULL(alias); } void @@ -1781,7 +1781,7 @@ _save_prefs(void) // get the preference group for a specific preference // for example the PREF_BEEP setting ("beep" in .profrc, see _get_key) belongs // to the [ui] section. -static const char* +static const gchar* _get_group(preference_t pref) { switch (pref) { @@ -1942,7 +1942,7 @@ _get_group(preference_t pref) // get the key used in .profrc for the preference // for example the PREF_AUTOAWAY_MODE maps to "autoaway.mode" in .profrc -static const char* +static const gchar* _get_key(preference_t pref) { switch (pref) { @@ -2283,7 +2283,7 @@ _get_default_boolean(preference_t pref) // the default setting for a string type preference // if it is not specified in .profrc -static char* +static gchar* _get_default_string(preference_t pref) { switch (pref) { diff --git a/src/config/preferences.h b/src/config/preferences.h index eeb2d4bb..8c23c84d 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -203,16 +203,16 @@ typedef struct prof_winplacement_t int inputwin_pos; } ProfWinPlacement; -void prefs_load(const char* config_file); +void prefs_load(const gchar* config_file); void prefs_changes(void); void prefs_save(void); void prefs_close(void); void prefs_reload(void); -gchar* prefs_autocomplete_boolean_choice(const char* const prefix, gboolean previous, void* context); +gchar* prefs_autocomplete_boolean_choice(const gchar* const prefix, gboolean previous, void* context); void prefs_reset_boolean_choice(void); -gchar* prefs_autocomplete_room_trigger(const char* const prefix, gboolean previous, void* context); +gchar* prefs_autocomplete_room_trigger(const gchar* const prefix, gboolean previous, void* context); void prefs_reset_room_trigger_ac(void); gint prefs_get_gone(void); @@ -249,42 +249,42 @@ gint prefs_get_autoxa_time(void); void prefs_set_autoxa_time(gint value); gchar** prefs_get_plugins(void); -void prefs_add_plugin(const char* const name); -void prefs_remove_plugin(const char* const name); +void prefs_add_plugin(const gchar* const name); +void prefs_remove_plugin(const gchar* const name); gchar* prefs_get_otr_char(void); -gboolean prefs_set_otr_char(char* ch); +gboolean prefs_set_otr_char(gchar* ch); gchar* prefs_get_pgp_char(void); -gboolean prefs_set_pgp_char(char* ch); +gboolean prefs_set_pgp_char(gchar* ch); gchar* prefs_get_omemo_char(void); -gboolean prefs_set_omemo_char(char* ch); +gboolean prefs_set_omemo_char(gchar* ch); // XEP-0373: OpenPGP for XMPP char* prefs_get_ox_char(void); -gboolean prefs_set_ox_char(char* ch); +gboolean prefs_set_ox_char(gchar* ch); gchar* prefs_get_roster_header_char(void); -void prefs_set_roster_header_char(char* ch); +void prefs_set_roster_header_char(gchar* ch); void prefs_clear_roster_header_char(void); gchar* prefs_get_roster_contact_char(void); -void prefs_set_roster_contact_char(char* ch); +void prefs_set_roster_contact_char(gchar* ch); void prefs_clear_roster_contact_char(void); gchar* prefs_get_roster_resource_char(void); -void prefs_set_roster_resource_char(char* ch); +void prefs_set_roster_resource_char(gchar* ch); void prefs_clear_roster_resource_char(void); gchar* prefs_get_roster_private_char(void); -void prefs_set_roster_private_char(char* ch); +void prefs_set_roster_private_char(gchar* ch); void prefs_clear_roster_private_char(void); gchar* prefs_get_roster_room_char(void); -void prefs_set_roster_room_char(char* ch); +void prefs_set_roster_room_char(gchar* ch); void prefs_clear_roster_room_char(void); gchar* prefs_get_roster_room_private_char(void); -void prefs_set_roster_room_private_char(char* ch); +void prefs_set_roster_room_private_char(gchar* ch); void prefs_clear_roster_room_private_char(void); gchar* prefs_get_occupants_char(void); -void prefs_set_occupants_char(char* ch); +void prefs_set_occupants_char(gchar* ch); void prefs_clear_occupants_char(void); gchar* prefs_get_occupants_header_char(void); -void prefs_set_occupants_header_char(char* ch); +void prefs_set_occupants_header_char(gchar* ch); void prefs_clear_occupants_header_char(void); gint prefs_get_roster_contact_indent(void); @@ -297,21 +297,21 @@ gint prefs_get_occupants_indent(void); void prefs_set_occupants_indent(gint value); gchar* prefs_get_correction_char(void); -void prefs_set_correction_char(char* ch); +void prefs_set_correction_char(gchar* ch); -void prefs_add_login(const char* jid); +void prefs_add_login(const gchar* jid); void prefs_set_tray_timer(gint value); gint prefs_get_tray_timer(void); -gboolean prefs_add_alias(const char* const name, const char* const value); -gboolean prefs_remove_alias(const char* const name); -gchar* prefs_get_alias(const char* const name); +gboolean prefs_add_alias(const gchar* const name, const gchar* const value); +gboolean prefs_remove_alias(const gchar* const name); +gchar* prefs_get_alias(const gchar* const name); GList* prefs_get_aliases(void); void prefs_free_aliases(GList* aliases); -gboolean prefs_add_room_notify_trigger(const char* const text); -gboolean prefs_remove_room_notify_trigger(const char* const text); +gboolean prefs_add_room_notify_trigger(const gchar* const text); +gboolean prefs_remove_room_notify_trigger(const gchar* const text); GList* prefs_get_room_notify_triggers(void); ProfWinPlacement* prefs_get_win_placement(void); diff --git a/src/ui/console.c b/src/ui/console.c index bea715ac..85927f15 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1319,7 +1319,7 @@ cons_occupants_setting(void) else cons_show("Occupants wrap (/occupants) : OFF"); - auto_char char* occupants_ch = prefs_get_occupants_char(); + auto_gchar gchar* occupants_ch = prefs_get_occupants_char(); if (occupants_ch) { cons_show("Occupants char (/occupants) : %s", occupants_ch); } else { @@ -1332,7 +1332,7 @@ cons_occupants_setting(void) int size = prefs_get_occupants_size(); cons_show("Occupants size (/occupants) : %d", size); - auto_char char* header_ch = prefs_get_occupants_header_char(); + auto_gchar gchar* header_ch = prefs_get_occupants_header_char(); if (header_ch) { cons_show("Occupants header char (/occupants) : %s", header_ch); } else { @@ -1449,42 +1449,42 @@ cons_roster_setting(void) else cons_show("Roster offline (/roster) : hide"); - auto_char char* header_ch = prefs_get_roster_header_char(); + auto_gchar gchar* header_ch = prefs_get_roster_header_char(); if (header_ch) { cons_show("Roster header char (/roster) : %s", header_ch); } else { cons_show("Roster header char (/roster) : none"); } - auto_char char* contact_ch = prefs_get_roster_contact_char(); + auto_gchar gchar* contact_ch = prefs_get_roster_contact_char(); if (contact_ch) { cons_show("Roster contact char (/roster) : %s", contact_ch); } else { cons_show("Roster contact char (/roster) : none"); } - auto_char char* resource_ch = prefs_get_roster_resource_char(); + auto_gchar gchar* resource_ch = prefs_get_roster_resource_char(); if (resource_ch) { cons_show("Roster resource char (/roster) : %s", resource_ch); } else { cons_show("Roster resource char (/roster) : none"); } - auto_char char* room_ch = prefs_get_roster_room_char(); + auto_gchar gchar* room_ch = prefs_get_roster_room_char(); if (room_ch) { cons_show("Roster room char (/roster) : %s", room_ch); } else { cons_show("Roster room char (/roster) : none"); } - auto_char char* room_priv_ch = prefs_get_roster_room_private_char(); + auto_gchar gchar* room_priv_ch = prefs_get_roster_room_private_char(); if (room_priv_ch) { cons_show("Roster room private char (/roster) : %s", room_priv_ch); } else { cons_show("Roster room private char (/roster) : none"); } - auto_char char* private_ch = prefs_get_roster_private_char(); + auto_gchar gchar* private_ch = prefs_get_roster_private_char(); if (private_ch) { cons_show("Roster private char (/roster) : %s", private_ch); } else { diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c index 4a1ae264..501e0158 100644 --- a/src/ui/rosterwin.c +++ b/src/ui/rosterwin.c @@ -578,7 +578,7 @@ _rosterwin_resources(ProfLayoutSplit* layout, PContact contact, int current_inde g_string_append(msg, " "); this_indent--; } - auto_char char* ch = prefs_get_roster_resource_char(); + auto_gchar gchar* ch = prefs_get_roster_resource_char(); if (ch) { g_string_append_printf(msg, "%s", ch); } diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 72ea0e3d..d17d3dc8 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -244,7 +244,7 @@ _conn_apply_settings(const char* const jid, const char* const passwd, const char return FALSE; } - auto_char char* cert_path = prefs_get_tls_certpath(); + auto_gchar gchar* cert_path = prefs_get_tls_certpath(); if (cert_path) { xmpp_conn_set_capath(conn.xmpp_conn, cert_path); }