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

Tidy up some code

Browse Source 
Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2023-11-14 14:55:29 +01:00
parent 847a86de50
commit 835ea397ac
6 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.c
View File

@@ -652,7 +652,7 @@ format_call_external_argv(const char* template, const char* url, const char* fil
return argv; return argv;
} }
gchar* static gchar*
_unique_filename(const char* filename) _unique_filename(const char* filename)
{ {
gchar* unique = g_strdup(filename); gchar* unique = g_strdup(filename);
@@ -676,7 +676,7 @@ _unique_filename(const char* filename)
return unique; return unique;
} }
bool static bool
_has_directory_suffix(const char* path) _has_directory_suffix(const char* path)
{ {
return (g_str_has_suffix(path, ".") return (g_str_has_suffix(path, ".")

3
src/event/server_events.c
View File

@@ -190,8 +190,7 @@ sv_ev_roster_received(void)
connection_set_presence_msg(status_message); connection_set_presence_msg(status_message);
cl_ev_presence_send(conn_presence, diff_secs); cl_ev_presence_send(conn_presence, diff_secs);
const char* fulljid = connection_get_fulljid(); plugins_on_connect(account_name, connection_get_fulljid());
plugins_on_connect(account_name, fulljid);
} }
void void

4
src/plugins/plugins.c
View File

@@ -252,9 +252,7 @@ plugins_load(const char* const name, GString* error_message)
if (plugin) { if (plugin) {
g_hash_table_insert(plugins, strdup(name), plugin); g_hash_table_insert(plugins, strdup(name), plugin);
if (connection_get_status() == JABBER_CONNECTED) { if (connection_get_status() == JABBER_CONNECTED) {
const char* account_name = session_get_account_name(); plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, session_get_account_name(), connection_get_fulljid());
const char* fulljid = connection_get_fulljid();
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid);
} else { } else {
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL); plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL);
} }

3
src/ui/console.c
View File

@@ -458,8 +458,7 @@ cons_show_login_success(ProfAccount* account, gboolean secured)
{ {
ProfWin* console = wins_get_console(); ProfWin* console = wins_get_console();
const char* fulljid = connection_get_fulljid(); win_print(console, THEME_DEFAULT, "-", "%s logged in successfully, ", connection_get_fulljid());
win_print(console, THEME_DEFAULT, "-", "%s logged in successfully, ", fulljid);
resource_presence_t presence = accounts_get_login_presence(account->name); resource_presence_t presence = accounts_get_login_presence(account->name);
const char* presence_str = string_from_resource_presence(presence); const char* presence_str = string_from_resource_presence(presence);

4
src/xmpp/connection.c
View File

@@ -836,9 +836,7 @@ connection_create_stanza_id(void)
(guchar*)prof_identifier, strlen(prof_identifier), (guchar*)prof_identifier, strlen(prof_identifier),
rndid, strlen(rndid)); rndid, strlen(rndid));
char* ret = g_strdup_printf("%s%s", rndid, hmac); return g_strdup_printf("%s%s", rndid, hmac);
return ret;
} }
char* char*

4
src/xmpp/session.c
View File

@@ -209,9 +209,7 @@ session_disconnect(void)
if (connection_get_status() == JABBER_CONNECTED) { if (connection_get_status() == JABBER_CONNECTED) {
log_info("Closing connection"); log_info("Closing connection");
char* account_name = session_get_account_name(); plugins_on_disconnect(session_get_account_name(), connection_get_fulljid());
const char* fulljid = connection_get_fulljid();
plugins_on_disconnect(account_name, fulljid);
accounts_set_last_activity(session_get_account_name()); accounts_set_last_activity(session_get_account_name());