diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/core/window-items.c | 4 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-channels.c | 4 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-query.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index 0c71a0e4..c87be0bf 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -241,7 +241,9 @@ void window_item_create(WI_ITEM_REC *item, int automatic) str = item->server == NULL ? NULL : g_strdup_printf("%s %s", ((SERVER_REC *) item->server)->tag, item->name); - reuse_unused_windows = settings_get_bool("reuse_unused_windows"); + reuse_unused_windows = + settings_get_bool("autoclose_windows") && + settings_get_bool("reuse_unused_windows") ; clear_waiting = TRUE; window = NULL; diff --git a/src/fe-common/irc/fe-channels.c b/src/fe-common/irc/fe-channels.c index 8eb1ebf9..7a895b4f 100644 --- a/src/fe-common/irc/fe-channels.c +++ b/src/fe-common/irc/fe-channels.c @@ -59,7 +59,7 @@ static void signal_channel_destroyed(CHANNEL_REC *channel) window_remove_item(window, (WI_ITEM_REC *) channel); if (windows->next != NULL && (!channel->joined || channel->left) && - settings_get_bool("window_close_on_part")) { + settings_get_bool("autoclose_windows")) { window_destroy(window); } } @@ -250,7 +250,7 @@ static void cmd_channel_remove(const char *data) void fe_channels_init(void) { - settings_add_bool("lookandfeel", "window_close_on_part", TRUE); + settings_add_bool("lookandfeel", "autoclose_windows", TRUE); signal_add("channel created", (SIGNAL_FUNC) signal_channel_created); signal_add("channel destroyed", (SIGNAL_FUNC) signal_channel_destroyed); diff --git a/src/fe-common/irc/fe-query.c b/src/fe-common/irc/fe-query.c index c87f7998..f2206726 100644 --- a/src/fe-common/irc/fe-query.c +++ b/src/fe-common/irc/fe-query.c @@ -72,7 +72,7 @@ static void signal_query_destroyed(QUERY_REC *query) window_remove_item(window, (WI_ITEM_REC *) query); if (windows->next != NULL && !query->unwanted && - settings_get_bool("window_close_on_part")) + settings_get_bool("autoclose_windows")) window_destroy(window); } } |