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

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

Browse Source 
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
parent c64484c6ed 22cc641905
commit 0d0ed9b7ca
11 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/commands.c
View File

@@ -3252,14 +3252,18 @@ cmd_states(gchar **args, struct cmd_help_t help)
gboolean
cmd_titlebar(gchar **args, struct cmd_help_t help)
{
if (g_strcmp0(args[0], "show") != 0) {
if (g_strcmp0(args[0], "show") != 0 && g_strcmp0(args[0], "goodbye") != 0) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
if (g_strcmp0(args[1], "off") == 0) {
if (g_strcmp0(args[0], "show") == 0 && g_strcmp0(args[1], "off") == 0) {
ui_clear_win_title();
}
return _cmd_set_boolean_preference(args[1], help, "Titlebar show", PREF_TITLEBAR_SHOW);
if (g_strcmp0(args[0], "show") == 0) {
return _cmd_set_boolean_preference(args[1], help, "Titlebar show", PREF_TITLEBAR_SHOW);
} else {
return _cmd_set_boolean_preference(args[1], help, "Titlebar goodbye", PREF_TITLEBAR_GOODBYE);
}
}
gboolean