mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into osx-functional
This commit is contained in:
commit
cca929f586
@ -154,7 +154,9 @@ cmd_execute_alias(ProfWin *window, const char *const inp, gboolean *ran)
|
|||||||
free(alias);
|
free(alias);
|
||||||
if (value) {
|
if (value) {
|
||||||
*ran = TRUE;
|
*ran = TRUE;
|
||||||
return cmd_process_input(window, value);
|
gboolean result = cmd_process_input(window, value);
|
||||||
|
prefs_free_string(value);
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
*ran = FALSE;
|
*ran = FALSE;
|
||||||
|
@ -139,6 +139,7 @@ prefs_load(void)
|
|||||||
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room", FALSE);
|
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room", FALSE);
|
||||||
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room.mention", TRUE);
|
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room.mention", TRUE);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
_save_prefs();
|
_save_prefs();
|
||||||
|
@ -74,7 +74,7 @@ theme_init(const char *const theme_name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
str_to_pair = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
|
str_to_pair = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
|
||||||
defaults = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
|
defaults = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
|
||||||
|
|
||||||
g_hash_table_insert(defaults, strdup("main.text"), strdup("white"));
|
g_hash_table_insert(defaults, strdup("main.text"), strdup("white"));
|
||||||
g_hash_table_insert(defaults, strdup("main.text.me"), strdup("white"));
|
g_hash_table_insert(defaults, strdup("main.text.me"), strdup("white"));
|
||||||
|
@ -116,6 +116,7 @@ sv_ev_roster_received(void)
|
|||||||
}
|
}
|
||||||
free(err_str);
|
free(err_str);
|
||||||
}
|
}
|
||||||
|
account_free(account);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// send initial presence
|
// send initial presence
|
||||||
|
@ -759,6 +759,7 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
|
|||||||
} else {
|
} else {
|
||||||
g_string_append(msg, mucwin->roomjid);
|
g_string_append(msg, mucwin->roomjid);
|
||||||
}
|
}
|
||||||
|
prefs_free_string(roombypref);
|
||||||
if ((g_strcmp0(unreadpos, "after") == 0) && mucwin->unread > 0) {
|
if ((g_strcmp0(unreadpos, "after") == 0) && mucwin->unread > 0) {
|
||||||
g_string_append_printf(msg, " (%d)", mucwin->unread);
|
g_string_append_printf(msg, " (%d)", mucwin->unread);
|
||||||
}
|
}
|
||||||
|
@ -628,6 +628,7 @@ wins_do_notify_remind(void)
|
|||||||
}
|
}
|
||||||
curr = g_list_next(curr);
|
curr = g_list_next(curr);
|
||||||
}
|
}
|
||||||
|
g_list_free(values);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user