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

Rename mucconf wins into conf wins

Browse Source 
Configuration windows are now being used by both muc and cmd.
This commit is contained in:
Paul Fariello
2018-04-11 22:17:50 +05:20
parent 7123e94e82
commit a952776b89
29 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/window_list.c
View File

@@ -139,16 +139,16 @@ wins_get_chat_unsubscribed(void)
return result;
}
ProfMucConfWin*
wins_get_muc_conf(const char *const roomjid)
ProfConfWin*
wins_get_conf(const char *const roomjid)
{
GList *values = g_hash_table_get_values(windows);
GList *curr = values;
while (curr) {
ProfWin *window = curr->data;
if (window->type == WIN_MUC_CONFIG) {
ProfMucConfWin *confwin = (ProfMucConfWin*)window;
if (window->type == WIN_CONFIG) {
ProfConfWin *confwin = (ProfConfWin*)window;
if (g_strcmp0(confwin->roomjid, roomjid) == 0) {
g_list_free(values);
return confwin;
@@ -584,7 +584,7 @@ wins_close_by_num(int i)
autocomplete_remove(wins_close_ac, pluginwin->tag);
break;
}
case WIN_MUC_CONFIG:
case WIN_CONFIG:
default:
break;
}
@@ -657,12 +657,12 @@ wins_new_muc(const char *const roomjid)
}
ProfWin*
wins_new_muc_config(const char *const roomjid, DataForm *form)
wins_new_config(const char *const roomjid, DataForm *form)
{
GList *keys = g_hash_table_get_keys(windows);
int result = _wins_get_next_available_num(keys);
g_list_free(keys);
ProfWin *newwin = win_create_muc_config(roomjid, form);
ProfWin *newwin = win_create_config(roomjid, form);
g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin);
return newwin;
}
@@ -812,7 +812,7 @@ wins_get_prune_wins(void)
ProfWin *window = curr->data;
if (win_unread(window) == 0 &&
window->type != WIN_MUC &&
window->type != WIN_MUC_CONFIG &&
window->type != WIN_CONFIG &&
window->type != WIN_XML &&
window->type != WIN_CONSOLE) {
result = g_slist_append(result, window);