aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-07-25 00:59:38 +01:00
commit 48826cfd9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/window_list.c
View File

@ -61,8 +61,7 @@ static int _wins_get_next_available_num(GList *used);
void void
wins_init(void) wins_init(void)
{ {
windows = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, windows = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)win_free);
(GDestroyNotify)win_free);
ProfWin *console = win_create_console(); ProfWin *console = win_create_console();
g_hash_table_insert(windows, GINT_TO_POINTER(1), console); g_hash_table_insert(windows, GINT_TO_POINTER(1), console);
@ -1000,6 +999,7 @@ wins_tidy(void)
GList *curr = keys; GList *curr = keys;
while (curr) { while (curr) {
ProfWin *window = g_hash_table_lookup(windows, curr->data); ProfWin *window = g_hash_table_lookup(windows, curr->data);
g_hash_table_steal(windows, curr->data);
if (num == 10) { if (num == 10) {
g_hash_table_insert(new_windows, GINT_TO_POINTER(0), window); g_hash_table_insert(new_windows, GINT_TO_POINTER(0), window);
if (win_unread(window) > 0) { if (win_unread(window) > 0) {
@ -1019,6 +1019,7 @@ wins_tidy(void)
curr = g_list_next(curr); curr = g_list_next(curr);
} }
g_hash_table_destroy(windows);
windows = new_windows; windows = new_windows;
current = 1; current = 1;
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();