diff options
author | Michael Vetter <jubalh@iodoru.org> | 2020-07-02 11:31:54 +0200 |
---|---|---|
committer | Michael Vetter <jubalh@iodoru.org> | 2020-07-02 11:34:12 +0200 |
commit | e5ac12afa63457316793fa797d1a04202483ea05 (patch) | |
tree | 1b959a098338a89083c48f6310de7960cfffb4c9 /src/ui | |
parent | 9774b0c5509193027d4f68df9dcb862455699cfc (diff) | |
download | profani-tty-e5ac12afa63457316793fa797d1a04202483ea05.tar.gz |
Remove prefs_free_string()
It just does a free. Related to b580b9ef119045f142fa4baa9689a1c5ce8864ef
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/console.c | 84 | ||||
-rw-r--r-- | src/ui/core.c | 4 | ||||
-rw-r--r-- | src/ui/rosterwin.c | 52 | ||||
-rw-r--r-- | src/ui/statusbar.c | 14 | ||||
-rw-r--r-- | src/ui/window.c | 6 |
5 files changed, 80 insertions, 80 deletions
diff --git a/src/ui/console.c b/src/ui/console.c index 47267e1c..3696de81 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -345,7 +345,7 @@ cons_show_incoming_room_message(const char *const nick, const char *const room, cons_alert(); } } - prefs_free_string(muc_show); + g_free(muc_show); } void @@ -367,7 +367,7 @@ cons_show_incoming_message(const char *const short_from, const int win_index, in cons_alert(); } - prefs_free_string(chat_show); + g_free(chat_show); } void @@ -389,7 +389,7 @@ cons_show_incoming_private_message(const char *const nick, const char *const roo cons_alert(); } - prefs_free_string(priv_show); + g_free(priv_show); } void @@ -1092,7 +1092,7 @@ cons_theme_setting(void) } else { cons_show("Theme (/theme) : %s", theme); } - prefs_free_string(theme); + g_free(theme); } void @@ -1182,15 +1182,15 @@ cons_console_setting(void) { char *chatsetting = prefs_get_string(PREF_CONSOLE_CHAT); cons_show("Console chat messages (/console) : %s", chatsetting); - prefs_free_string(chatsetting); + g_free(chatsetting); char *mucsetting = prefs_get_string(PREF_CONSOLE_MUC); cons_show("Console MUC messages (/console) : %s", mucsetting); - prefs_free_string(mucsetting); + g_free(mucsetting); char *privsetting = prefs_get_string(PREF_CONSOLE_PRIVATE); cons_show("Console private messages (/console) : %s", privsetting); - prefs_free_string(privsetting); + g_free(privsetting); } void @@ -1209,9 +1209,9 @@ cons_presence_setting(void) cons_show("Chat presence (/presence) : %s", chat); cons_show("Room presence (/presence) : %s", room); - prefs_free_string(console); - prefs_free_string(chat); - prefs_free_string(room); + g_free(console); + g_free(chat); + g_free(room); } void @@ -1309,7 +1309,7 @@ cons_autoconnect_setting(void) else cons_show("Autoconnect (/autoconnect) : OFF"); - prefs_free_string(pref_connect_account); + g_free(pref_connect_account); } void @@ -1320,53 +1320,53 @@ cons_time_setting(void) cons_show("Time console (/time) : OFF"); else cons_show("Time console (/time) : %s", pref_time_console); - prefs_free_string(pref_time_console); + g_free(pref_time_console); char *pref_time_chat = prefs_get_string(PREF_TIME_CHAT); if (g_strcmp0(pref_time_chat, "off") == 0) cons_show("Time chat (/time) : OFF"); else cons_show("Time chat (/time) : %s", pref_time_chat); - prefs_free_string(pref_time_chat); + g_free(pref_time_chat); char *pref_time_muc = prefs_get_string(PREF_TIME_MUC); if (g_strcmp0(pref_time_muc, "off") == 0) cons_show("Time MUC (/time) : OFF"); else cons_show("Time MUC (/time) : %s", pref_time_muc); - prefs_free_string(pref_time_muc); + g_free(pref_time_muc); char *pref_time_conf = prefs_get_string(PREF_TIME_CONFIG); if (g_strcmp0(pref_time_conf, "off") == 0) cons_show("Time config (/time) : OFF"); else cons_show("Time config (/time) : %s", pref_time_conf); - prefs_free_string(pref_time_conf); + g_free(pref_time_conf); char *pref_time_private = prefs_get_string(PREF_TIME_PRIVATE); if (g_strcmp0(pref_time_private, "off") == 0) cons_show("Time private (/time) : OFF"); else cons_show("Time private (/time) : %s", pref_time_private); - prefs_free_string(pref_time_private); + g_free(pref_time_private); char *pref_time_xml = prefs_get_string(PREF_TIME_XMLCONSOLE); if (g_strcmp0(pref_time_xml, "off") == 0) cons_show("Time XML Console (/time) : OFF"); else cons_show("Time XML Console (/time) : %s", pref_time_xml); - prefs_free_string(pref_time_xml); + g_free(pref_time_xml); char *pref_time_statusbar = prefs_get_string(PREF_TIME_STATUSBAR); if (g_strcmp0(pref_time_statusbar, "off") == 0) cons_show("Time statusbar (/time) : OFF"); else cons_show("Time statusbar (/time) : %s", pref_time_statusbar); - prefs_free_string(pref_time_statusbar); + g_free(pref_time_statusbar); char *pref_time_lastactivity = prefs_get_string(PREF_TIME_LASTACTIVITY); cons_show("Time last activity (/time) : %s", pref_time_lastactivity); - prefs_free_string(pref_time_lastactivity); + g_free(pref_time_lastactivity); } void @@ -1497,7 +1497,7 @@ cons_roster_setting(void) } else { cons_show("Roster count (/roster) : %s", count); } - prefs_free_string(count); + g_free(count); if (prefs_get_boolean(PREF_ROSTER_COUNT_ZERO)) cons_show("Roster count zero (/roster) : ON"); @@ -1506,11 +1506,11 @@ cons_roster_setting(void) char *by = prefs_get_string(PREF_ROSTER_BY); cons_show("Roster by (/roster) : %s", by); - prefs_free_string(by); + g_free(by); char *order = prefs_get_string(PREF_ROSTER_ORDER); cons_show("Roster order (/roster) : %s", order); - prefs_free_string(order); + g_free(order); char *unread = prefs_get_string(PREF_ROSTER_UNREAD); if (g_strcmp0(unread, "before") == 0) { @@ -1520,7 +1520,7 @@ cons_roster_setting(void) } else { cons_show("Roster unread (/roster) : OFF"); } - prefs_free_string(unread); + g_free(unread); if (prefs_get_boolean(PREF_ROSTER_ROOMS)) cons_show("Roster rooms (/roster) : show"); @@ -1535,23 +1535,23 @@ cons_roster_setting(void) } else { cons_show("Roster private (/roster) : OFF"); } - prefs_free_string(priv); + g_free(priv); char *rooms_pos = prefs_get_string(PREF_ROSTER_ROOMS_POS); cons_show("Roster rooms position (/roster) : %s", rooms_pos); - prefs_free_string(rooms_pos); + g_free(rooms_pos); char *rooms_by = prefs_get_string(PREF_ROSTER_ROOMS_BY); cons_show("Roster rooms by (/roster) : %s", rooms_by); - prefs_free_string(rooms_by); + g_free(rooms_by); char *rooms_use = prefs_get_string(PREF_ROSTER_ROOMS_USE_AS_NAME); cons_show("Roster rooms use (/roster) : %s", rooms_use); - prefs_free_string(rooms_use); + g_free(rooms_use); char *rooms_order = prefs_get_string(PREF_ROSTER_ROOMS_ORDER); cons_show("Roster rooms order (/roster) : %s", rooms_order); - prefs_free_string(rooms_order); + g_free(rooms_order); char *roomsunread = prefs_get_string(PREF_ROSTER_ROOMS_UNREAD); if (g_strcmp0(roomsunread, "before") == 0) { @@ -1561,7 +1561,7 @@ cons_roster_setting(void) } else { cons_show("Roster rooms unread (/roster) : OFF"); } - prefs_free_string(roomsunread); + g_free(roomsunread); int size = prefs_get_roster_size(); cons_show("Roster size (/roster) : %d", size); @@ -1833,15 +1833,15 @@ cons_statusbar_setting(void) } else { cons_show("Self statusbar display (/statusbar) : %s", pref_self); } - prefs_free_string(pref_self); + g_free(pref_self); char *pref_chat = prefs_get_string(PREF_STATUSBAR_CHAT); cons_show("Chat tab display (/statusbar) : %s", pref_chat); - prefs_free_string(pref_chat); + g_free(pref_chat); char *pref_room = prefs_get_string(PREF_STATUSBAR_ROOM); cons_show("Room tab display (/statusbar) : %s", pref_room); - prefs_free_string(pref_room); + g_free(pref_room); } void @@ -1906,7 +1906,7 @@ cons_autoaway_setting(void) } else { cons_show("Autoaway (/autoaway mode) : %s", pref_autoaway_mode); } - prefs_free_string(pref_autoaway_mode); + g_free(pref_autoaway_mode); int away_time = prefs_get_autoaway_time(); if (away_time == 1) { @@ -1930,7 +1930,7 @@ cons_autoaway_setting(void) } else { cons_show("Autoaway away message (/autoaway message) : \"%s\"", pref_autoaway_message); } - prefs_free_string(pref_autoaway_message); + g_free(pref_autoaway_message); char *pref_autoxa_message = prefs_get_string(PREF_AUTOXA_MESSAGE); if ((pref_autoxa_message == NULL) || (strcmp(pref_autoxa_message, "") == 0)) { @@ -1938,7 +1938,7 @@ cons_autoaway_setting(void) } else { cons_show("Autoaway xa message (/autoaway message) : \"%s\"", pref_autoxa_message); } - prefs_free_string(pref_autoxa_message); + g_free(pref_autoxa_message); if (prefs_get_boolean(PREF_AUTOAWAY_CHECK)) { cons_show("Autoaway check (/autoaway check) : ON"); @@ -2018,7 +2018,7 @@ cons_color_setting(void) cons_show("Consistent color generation for nicks (/color) : OFF"); } - prefs_free_string(color_pref); + g_free(color_pref); if (prefs_get_boolean(PREF_COLOR_NICK_OWN)) { cons_show("Consistent color generation for own nick (/color own) : ON"); @@ -2068,7 +2068,7 @@ cons_executable_setting(void) { char *avatar = prefs_get_string(PREF_AVATAR_CMD); cons_show("Default '/avatar open' command (/executable avatar) : %s", avatar); - prefs_free_string(avatar); + g_free(avatar); //TODO: there needs to be a way to get all the "locales"/schemes so we can //display the defualt openers for all filetypes @@ -2112,7 +2112,7 @@ cons_show_otr_prefs(void) char *policy_value = prefs_get_string(PREF_OTR_POLICY); cons_show("OTR policy (/otr policy) : %s", policy_value); - prefs_free_string(policy_value); + g_free(policy_value); char *log_value = prefs_get_string(PREF_OTR_LOG); if (strcmp(log_value, "on") == 0) { @@ -2122,7 +2122,7 @@ cons_show_otr_prefs(void) } else { cons_show("OTR logging (/otr log) : Redacted"); } - prefs_free_string(log_value); + g_free(log_value); char *ch = prefs_get_otr_char(); cons_show("OTR char (/otr char) : %s", ch); @@ -2151,7 +2151,7 @@ cons_show_pgp_prefs(void) } else { cons_show("PGP logging (/pgp log) : Redacted"); } - prefs_free_string(log_value); + g_free(log_value); char *ch = prefs_get_pgp_char(); cons_show("PGP char (/pgp char) : %s", ch); @@ -2174,7 +2174,7 @@ cons_show_omemo_prefs(void) char *policy_value = prefs_get_string(PREF_OMEMO_POLICY); cons_show("OMEMO policy (/omemo policy) : %s", policy_value); - prefs_free_string(policy_value); + g_free(policy_value); char *log_value = prefs_get_string(PREF_OMEMO_LOG); if (strcmp(log_value, "on") == 0) { @@ -2184,7 +2184,7 @@ cons_show_omemo_prefs(void) } else { cons_show("OMEMO logging (/omemo log) : Redacted"); } - prefs_free_string(log_value); + g_free(log_value); char *ch = prefs_get_omemo_char(); cons_show("OMEMO char (/omemo char) : %s", ch); diff --git a/src/ui/core.c b/src/ui/core.c index bf5248cf..b2256c56 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1070,8 +1070,8 @@ ui_contact_offline(char *barejid, char *resource, char *status) FREE_SET_NULL(chatwin->resource_override); } - prefs_free_string(show_console); - prefs_free_string(show_chat_win); + g_free(show_console); + g_free(show_chat_win); jid_destroy(jid); } diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c index 58d0bdf9..eb025c4e 100644 --- a/src/ui/rosterwin.c +++ b/src/ui/rosterwin.c @@ -118,7 +118,7 @@ rosterwin_roster(void) if (g_strcmp0(privpref, "group") == 0 || orphaned_privchats) { _rosterwin_private_chats(layout, orphaned_privchats); } - prefs_free_string(privpref); + g_free(privpref); g_list_free(orphaned_privchats); } @@ -148,7 +148,7 @@ rosterwin_roster(void) if (prefs_get_boolean(PREF_ROSTER_UNSUBSCRIBED)) { _rosteriwin_unsubscribed(layout); } - prefs_free_string(by); + g_free(by); } if (prefs_get_boolean(PREF_ROSTER_ROOMS) && (g_strcmp0(roomspos, "last") == 0)) { @@ -171,12 +171,12 @@ rosterwin_roster(void) if (g_strcmp0(privpref, "group") == 0 || orphaned_privchats) { _rosterwin_private_chats(layout, orphaned_privchats); } - prefs_free_string(privpref); + g_free(privpref); g_list_free(privchats); g_list_free(orphaned_privchats); } - prefs_free_string(roomspos); + g_free(roomspos); } static void @@ -190,7 +190,7 @@ _rosterwin_contacts_all(ProfLayoutSplit *layout) } else { contacts = roster_get_contacts(ROSTER_ORD_NAME); } - prefs_free_string(order); + g_free(order); GSList *filtered_contacts = _filter_contacts(contacts); g_slist_free(contacts); @@ -260,7 +260,7 @@ _rosterwin_contacts_by_group(ProfLayoutSplit *layout, char *group) } else { contacts = roster_get_group(group, ROSTER_ORD_NAME); } - prefs_free_string(order); + g_free(order); GSList *filtered_contacts = _filter_contacts(contacts); g_slist_free(contacts); @@ -324,7 +324,7 @@ _rosterwin_unsubscribed_item(ProfLayoutSplit *layout, ProfChatWin *chatwin) if ((g_strcmp0(unreadpos, "after") == 0) && unread > 0) { g_string_append_printf(msg, " (%d)", unread); } - prefs_free_string(unreadpos); + g_free(unreadpos); win_sub_newline_lazy(layout->subwin); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -391,7 +391,7 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact) unread = 0; } } - prefs_free_string(unreadpos); + g_free(unreadpos); win_sub_newline_lazy(layout->subwin); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -433,7 +433,7 @@ _rosterwin_presence(ProfLayoutSplit *layout, const char *presence, const char *s char *by = prefs_get_string(PREF_ROSTER_BY); gboolean by_presence = g_strcmp0(by, "presence") == 0; - prefs_free_string(by); + g_free(by); int presence_indent = prefs_get_roster_presence_indent(); if (presence_indent > 0) { @@ -538,7 +538,7 @@ _rosterwin_resources(ProfLayoutSplit *layout, PContact contact, int current_inde if ((g_strcmp0(unreadpos, "after") == 0) && unread > 0) { g_string_append_printf(msg, " (%d)", unread); } - prefs_free_string(unreadpos); + g_free(unreadpos); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); win_sub_print(layout->subwin, msg->str, FALSE, wrap, 0); @@ -566,7 +566,7 @@ _rosterwin_resources(ProfLayoutSplit *layout, PContact contact, int current_inde g_string_free(unreadmsg, TRUE); wattroff(layout->subwin, theme_attrs(presence_colour)); } - prefs_free_string(unreadpos); + g_free(unreadpos); int resource_indent = prefs_get_roster_resource_indent(); if (resource_indent > 0) { @@ -622,7 +622,7 @@ _rosterwin_resources(ProfLayoutSplit *layout, PContact contact, int current_inde g_string_free(unreadmsg, TRUE); wattroff(layout->subwin, theme_attrs(presence_colour)); } - prefs_free_string(unreadpos); + g_free(unreadpos); _rosterwin_presence(layout, presence, status, current_indent); } else { gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -639,7 +639,7 @@ _rosterwin_resources(ProfLayoutSplit *layout, PContact contact, int current_inde g_string_free(unreadmsg, TRUE); wattroff(layout->subwin, theme_attrs(presence_colour)); } - prefs_free_string(unreadpos); + g_free(unreadpos); } g_list_free(resources); @@ -660,7 +660,7 @@ _rosterwin_rooms(ProfLayoutSplit *layout, char *title, GList *rooms) } else { rooms_sorted = g_list_insert_sorted(rooms_sorted, mucwin, (GCompareFunc)_compare_rooms_name); } - prefs_free_string(order); + g_free(order); } curr_room = g_list_next(curr_room); } @@ -793,13 +793,13 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin) } } - prefs_free_string(use_as_name); - prefs_free_string(roombypref); + g_free(use_as_name); + g_free(roombypref); if ((g_strcmp0(unreadpos, "after") == 0) && mucwin->unread > 0) { g_string_append_printf(msg, " (%d)", mucwin->unread); } - prefs_free_string(unreadpos); + g_free(unreadpos); win_sub_newline_lazy(layout->subwin); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -861,7 +861,7 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin) if ((g_strcmp0(unreadpos, "after") == 0) && privwin->unread > 0) { g_string_append_printf(privmsg, " (%d)", privwin->unread); } - prefs_free_string(unreadpos); + g_free(unreadpos); const char *presence = "offline"; @@ -888,7 +888,7 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin) g_list_free(privs); } - prefs_free_string(privpref); + g_free(privpref); } static void @@ -902,7 +902,7 @@ _rosterwin_print_rooms(ProfLayoutSplit *layout) _rosterwin_rooms(layout, "Rooms", rooms); g_list_free(rooms); } - prefs_free_string(roomsbypref); + g_free(roomsbypref); } static void @@ -955,7 +955,7 @@ _rosterwin_private_chats(ProfLayoutSplit *layout, GList *orphaned_privchats) if ((g_strcmp0(unreadpos, "after") == 0) && privwin->unread > 0) { g_string_append_printf(privmsg, " (%d)", privwin->unread); } - prefs_free_string(unreadpos); + g_free(unreadpos); Jid *jidp = jid_create(privwin->fulljid); Occupant *occupant = muc_roster_item(jidp->barejid, jidp->resourcepart); @@ -1051,7 +1051,7 @@ _rosterwin_unsubscribed_header(ProfLayoutSplit *layout, GList *wins) g_string_append_printf(header, " (%d)", unreadcount); } } - prefs_free_string(countpref); + g_free(countpref); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -1101,7 +1101,7 @@ _rosterwin_contacts_header(ProfLayoutSplit *layout, const char *const title, GSL g_string_append_printf(header, " (%d)", unreadcount); } } - prefs_free_string(countpref); + g_free(countpref); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -1150,7 +1150,7 @@ _rosterwin_rooms_header(ProfLayoutSplit *layout, GList *rooms, char *title) } g_list_free(privwins); } - prefs_free_string(prefpriv); + g_free(prefpriv); curr = g_list_next(curr); } @@ -1161,7 +1161,7 @@ _rosterwin_rooms_header(ProfLayoutSplit *layout, GList *rooms, char *title) g_string_append_printf(header, " (%d)", unread); } } - prefs_free_string(countpref); + g_free(countpref); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); @@ -1206,7 +1206,7 @@ _rosterwin_private_header(ProfLayoutSplit *layout, GList *privs) g_string_append_printf(title_str, " (%d)", unreadcount); } } - prefs_free_string(countpref); + g_free(countpref); gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP); diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 4119ad10..d2c67483 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -210,7 +210,7 @@ _create_tab(const int win, win_type_t wintype, char *identifier, gboolean highli } else { tab->display_name = strdup(tab->identifier); } - prefs_free_string(pref); + g_free(pref); } } @@ -430,7 +430,7 @@ _status_bar_draw_time(int pos) { char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); if (g_strcmp0(time_pref, "off") == 0) { - prefs_free_string(time_pref); + g_free(time_pref); return pos; } @@ -461,7 +461,7 @@ _status_bar_draw_time(int pos) wattroff(statusbar_win, bracket_attrs); pos += 2; - prefs_free_string(time_pref); + g_free(time_pref); return pos; } @@ -493,7 +493,7 @@ _status_bar_draw_maintext(int pos) stop = true; } - prefs_free_string(pref); + g_free(pref); if (stop) { return; } @@ -594,7 +594,7 @@ _display_name(StatusBarTab *tab) } else { fullname = strdup(tab->identifier); } - prefs_free_string(pref); + g_free(pref); } else if (tab->window_type == WIN_CONFIG) { char *pref = prefs_get_string(PREF_STATUSBAR_ROOM); GString *display_str = g_string_new(""); @@ -607,7 +607,7 @@ _display_name(StatusBarTab *tab) g_string_append(display_str, tab->identifier); } - prefs_free_string(pref); + g_free(pref); g_string_append(display_str, " conf"); char *result = strdup(display_str->str); g_string_free(display_str, TRUE); @@ -627,7 +627,7 @@ _display_name(StatusBarTab *tab) } else { fullname = strdup(tab->identifier); } - prefs_free_string(pref); + g_free(pref); } else { fullname = strdup("window"); } diff --git a/src/ui/window.c b/src/ui/window.c index 81230801..9840716d 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -1067,7 +1067,7 @@ win_show_status_string(ProfWin *window, const char *const from, gchar *date_fmt = NULL; char *time_pref = prefs_get_string(PREF_TIME_LASTACTIVITY); date_fmt = g_date_time_format(last_activity, time_pref); - prefs_free_string(time_pref); + g_free(time_pref); assert(date_fmt != NULL); win_append(window, presence_colour, ", last activity: %s", date_fmt); @@ -1516,7 +1516,7 @@ _win_print_internal(ProfWin *window, const char *show_char, int pad_indent, GDat } else { date_fmt = g_date_time_format(time, time_pref); } - prefs_free_string(time_pref); + g_free(time_pref); assert(date_fmt != NULL); if(strlen(date_fmt) != 0){ @@ -1547,7 +1547,7 @@ _win_print_internal(ProfWin *window, const char *show_char, int pad_indent, GDat colour = theme_hash_attrs(from); } } - prefs_free_string(color_pref); + g_free(color_pref); if (flags & NO_COLOUR_FROM) { colour = 0; |