devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Cleanup char* to auto_gchar gchar* for prefs_get_string

Browse Source 
Necessity explained in #1819
This commit is contained in:
John Hernandez
2023-06-13 22:01:08 +02:00
parent 1c102fec27
commit 4a70f5f513
19 changed files with 133 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xmpp/roster_list.c
View File

@@ -191,12 +191,12 @@ roster_get_display_name(const char* const barejid)
return g_string_free(result, FALSE);
}
char*
gchar*
roster_get_msg_display_name(const char* const barejid, const char* const resource)
{
assert(roster != NULL);
char* incoming_str = prefs_get_string(PREF_INCOMING_STAMP);
gchar* incoming_str = prefs_get_string(PREF_INCOMING_STAMP);
if (incoming_str) {
return incoming_str;

2
src/xmpp/roster_list.h
View File

@@ -71,7 +71,7 @@ char* roster_group_autocomplete(const char* const search_str, gboolean previous,
char* roster_barejid_autocomplete(const char* const search_str, gboolean previous, void* context);
GSList* roster_get_contacts_by_presence(const char* const presence);
char* roster_get_display_name(const char* const barejid);
char* roster_get_msg_display_name(const char* const barejid, const char* const resource);
gchar* roster_get_msg_display_name(const char* const barejid, const char* const resource);
gint roster_compare_name(PContact a, PContact b);
gint roster_compare_presence(PContact a, PContact b);
void roster_process_pending_presence(void);

13
src/xmpp/session.c
View File

@@ -416,7 +416,7 @@ session_check_autoaway(void)
return;
}
char* mode = prefs_get_string(PREF_AUTOAWAY_MODE);
auto_gchar gchar* mode = prefs_get_string(PREF_AUTOAWAY_MODE);
gboolean check = prefs_get_boolean(PREF_AUTOAWAY_CHECK);
gint away_time = prefs_get_autoaway_time();
gint xa_time = prefs_get_autoxa_time();
@@ -425,7 +425,7 @@ session_check_autoaway(void)
char* account = session_get_account_name();
resource_presence_t curr_presence = accounts_get_last_presence(account);
char* curr_status = accounts_get_last_status(account);
auto_char char* curr_status = accounts_get_last_status(account);
unsigned long idle_ms = ui_get_idle_time();
@@ -448,7 +448,7 @@ session_check_autoaway(void)
}
// send away presence with last activity
char* message = prefs_get_string(PREF_AUTOAWAY_MESSAGE);
auto_gchar gchar* message = prefs_get_string(PREF_AUTOAWAY_MESSAGE);
connection_set_presence_msg(message);
if (prefs_get_boolean(PREF_LASTACTIVITY)) {
cl_ev_presence_send(RESOURCE_AWAY, idle_ms / 1000);
@@ -462,7 +462,6 @@ session_check_autoaway(void)
} else {
cons_show("Idle for %d minutes, status set to away (priority %d).", away_time, pri);
}
g_free(message);
title_bar_set_presence(CONTACT_AWAY);
}
@@ -491,7 +490,7 @@ session_check_autoaway(void)
activity_state = ACTIVITY_ST_XA;
// send extended away presence with last activity
char* message = prefs_get_string(PREF_AUTOXA_MESSAGE);
auto_gchar gchar* message = prefs_get_string(PREF_AUTOXA_MESSAGE);
connection_set_presence_msg(message);
if (prefs_get_boolean(PREF_LASTACTIVITY)) {
cl_ev_presence_send(RESOURCE_XA, idle_ms / 1000);
@@ -505,7 +504,6 @@ session_check_autoaway(void)
} else {
cons_show("Idle for %d minutes, status set to xa (priority %d).", xa_time, pri);
}
g_free(message);
title_bar_set_presence(CONTACT_XA);
} else if (check && (idle_ms < away_time_ms)) {
@@ -534,9 +532,6 @@ session_check_autoaway(void)
}
break;
}
free(curr_status);
g_free(mode);
}
static struct