* Fixed build, and therefore finally fixes #6317 again :-)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41887 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2011-06-03 20:38:38 +00:00
parent 6e0cca2f96
commit 497beb0e26

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2007, Haiku Inc. All Rights Reserved. * Copyright 2007-2011, Haiku Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@ -15,16 +15,12 @@
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
#include <String.h> #include <String.h>
namespace BPrivate { #include <private/interface/DecoratorPrivate.h>
int32 count_decorators(void);
int32 get_decorator(void);
status_t get_decorator_name(const int32 &index, BString &name);
status_t get_decorator_preview(const int32 &index, BBitmap *bitmap);
status_t set_decorator(const int32 &index);
}
using namespace BPrivate; using namespace BPrivate;
static int sColorWhich = -1; static int sColorWhich = -1;
static struct option const kLongOptions[] = { static struct option const kLongOptions[] = {
{"activetab", required_argument, &sColorWhich, B_WINDOW_TAB_COLOR}, {"activetab", required_argument, &sColorWhich, B_WINDOW_TAB_COLOR},
@ -67,13 +63,13 @@ I(window_tab_color, B_WINDOW_TAB_COLOR),
I(window_text_color, B_WINDOW_TEXT_COLOR), I(window_text_color, B_WINDOW_TEXT_COLOR),
I(window_inactive_tab_color, B_WINDOW_INACTIVE_TAB_COLOR), I(window_inactive_tab_color, B_WINDOW_INACTIVE_TAB_COLOR),
I(window_inactive_text_color, B_WINDOW_INACTIVE_TEXT_COLOR), I(window_inactive_text_color, B_WINDOW_INACTIVE_TEXT_COLOR),
{"sum", required_argument, 0, 's'}, {"sum", required_argument, 0, 's'},
{"refresh", no_argument, 0, 'r'}, {"refresh", no_argument, 0, 'r'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{NULL} {NULL}
}; };
extern const char *__progname; extern const char *__progname;
static const char *sProgramName = __progname; static const char *sProgramName = __progname;
@ -141,9 +137,14 @@ main(int argc, char **argv)
return 1; return 1;
case 'r': case 'r':
{
// TODO: refresh (but shouldn't be needed) // TODO: refresh (but shouldn't be needed)
set_decorator(get_decorator()); BString name;
if (get_decorator(name))
set_decorator(name);
break; break;
}
case 's': case 's':
// IGNORED, for compatibility with original app // IGNORED, for compatibility with original app
break; break;