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

Removed titlebar version property and allow disabling of titlebar display

Browse Source
This commit is contained in:
James Booth
2014-04-03 21:46:43 +01:00
parent 95c081666a
commit 561d96c711
6 changed files with 28 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/command/command.c
View File

@@ -56,7 +56,6 @@ static void _cmd_complete_parameters(char *input, int *size);
static char * _sub_autocomplete(char *input, int *size);
static char * _notify_autocomplete(char *input, int *size);
static char * _titlebar_autocomplete(char *input, int *size);
static char * _theme_autocomplete(char *input, int *size);
static char * _autoaway_autocomplete(char *input, int *size);
static char * _autoconnect_autocomplete(char *input, int *size);
@@ -528,12 +527,11 @@ static struct cmd_t command_defs[] =
NULL } } },
{ "/titlebar",
cmd_titlebar, parse_args, 2, 2, &cons_titlebar_setting,
{ "/titlebar property on|off", "Show various properties in the window title bar.",
{ "/titlebar property on|off",
"-------------------------",
"Show various properties in the window title bar.",
"Currently The only supported property is 'version'.",
cmd_titlebar, parse_args, 1, 1, &cons_titlebar_setting,
{ "/titlebar on|off", "Show information in the window title bar.",
{ "/titlebar on|off",
"----------------",
"Show information in the window title bar.",
NULL } } },
{ "/mouse",
@@ -1406,7 +1404,7 @@ _cmd_complete_parameters(char *input, int *size)
// autocomplete boolean settings
gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype",
"/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history",
"/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history", "/titlebar",
"/vercheck" };
for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
@@ -1493,7 +1491,7 @@ _cmd_complete_parameters(char *input, int *size)
}
autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete,
_autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete,
_autoaway_autocomplete, _theme_autocomplete,
_account_autocomplete, _roster_autocomplete, _group_autocomplete,
_bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete,
_connect_autocomplete, _statuses_autocomplete, _alias_autocomplete,
@@ -1664,23 +1662,6 @@ _notify_autocomplete(char *input, int *size)
return NULL;
}
static char *
_titlebar_autocomplete(char *input, int *size)
{
char *result = NULL;
result = autocomplete_param_with_func(input, size, "/titlebar version",
prefs_autocomplete_boolean_choice);
if (result != NULL) {
return result;
}
result = autocomplete_param_with_ac(input, size, "/titlebar", titlebar_ac);
if (result != NULL) {
return result;
}
return NULL;
}
static char *
_autoaway_autocomplete(char *input, int *size)
{

9
src/command/commands.c
View File

@@ -2162,13 +2162,10 @@ cmd_states(gchar **args, struct cmd_help_t help)
gboolean
cmd_titlebar(gchar **args, struct cmd_help_t help)
{
if (strcmp(args[0], "version") != 0) {
cons_show("Usage: %s", help.usage);
return TRUE;
} else {
return _cmd_set_boolean_preference(args[1], help,
"Show version in window title", PREF_TITLEBARVERSION);
if (g_strcmp0(args[0], "off") == 0) {
ui_clear_win_title();
}
return _cmd_set_boolean_preference(args[0], help, "Titlebar", PREF_TITLEBAR);
}
gboolean