Merge remote-tracking branch 'incertia/exit-title'

Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
This commit is contained in:
James Booth
2015-01-12 01:12:42 +00:00
11 changed files with 45 additions and 8 deletions

View File

@@ -292,7 +292,13 @@ _init(const int disable_tls, char *log_level)
static void
_shutdown(void)
{
ui_clear_win_title();
if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
ui_goodbye_title();
} else {
ui_clear_win_title();
}
}
ui_close_all_wins();
jabber_disconnect();
jabber_shutdown();