retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed building configuration form executable name in Windows. 

Installing the tabbed skin automatically enables it.


git-svn-id: http://voip.null.ro/svn/yate@862 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-06-12 12:16:29 +00:00
parent 34039d7a86
commit df552e71bf
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/yate-gtk2.conf.default Normal file
View File

@ -0,0 +1,5 @@
; This file is here just to set the default skin.
; You can replace it with a more complete version from yate.conf.sample
[client]
skin=tabbed

24
engine/Engine.cpp
View File

@ -145,7 +145,7 @@ static int s_maxworkers = 10;
static bool s_debug = true;
static bool s_sigabrt = false;
static const char* s_cfgfile = 0;
static String s_cfgfile;
static const char* s_logfile = 0;
static Configuration s_cfg;
static ObjList plugins;
@ -913,7 +913,7 @@ static void usage(bool client, FILE* f)
" -d Daemonify, suppress output unless logged\n"
" -s Supervised, restart if crashes or locks up\n"
#endif
,s_cfgfile);
,s_cfgfile.safe());
}
static void badopt(bool client, char chr, const char* opt)
@ -951,14 +951,14 @@ int Engine::main(int argc, const char** argv, const char** env, RunMode mode, bo
const char* workdir = 0;
int debug_level = debugLevel();
s_cfgfile = ::strrchr(argv[0],'/');
if (!s_cfgfile)
s_cfgfile = ::strrchr(argv[0],'\\');
if (s_cfgfile)
s_cfgfile++;
const char* cfgfile = ::strrchr(argv[0],'/');
if (!cfgfile)
cfgfile = ::strrchr(argv[0],'\\');
if (cfgfile)
cfgfile++;
if (!s_cfgfile)
s_cfgfile = argv[0][0] ? argv[0] : "yate";
if (!cfgfile)
cfgfile = argv[0][0] ? argv[0] : "yate";
int i;
bool inopt = true;
@ -1040,7 +1040,7 @@ int Engine::main(int argc, const char** argv, const char** env, RunMode mode, bo
return ENOENT;
}
pc = 0;
s_cfgfile=argv[++i];
cfgfile=argv[++i];
break;
case 'c':
if (i+1 >= argc) {
@ -1124,6 +1124,10 @@ int Engine::main(int argc, const char** argv, const char** env, RunMode mode, bo
if (fail)
return EINVAL;
s_cfgfile = cfgfile;
if (s_cfgfile.endsWith(".exe") || s_cfgfile.endsWith(".EXE"))
s_cfgfile = s_cfgfile.substr(0,s_cfgfile.length()-4);
if (workdir)
::chdir(workdir);

3
windows/yate.iss
View File

@ -107,11 +107,12 @@ Source: "..\yate.url"; DestDir: "{app}"
Source: "null_team.ico"; DestDir: "{app}"
Source: "..\conf.d\*.conf.sample"; DestDir: "{app}\conf.d"
Source: "..\modules\help\*.yhlp"; DestDir: "{app}\modules\help"; Components: client
Source: "..\modules\skin\default\gtk2client.??"; DestDir: "{app}\modules\skin\default"; Components: client
Source: "..\modules\skin\default\*.png"; DestDir: "{app}\modules\skin\default"; Components: client
Source: "..\modules\skin\tabbed\gtk2client.??"; DestDir: "{app}\modules\skin\tabbed"; Components: client\skin\tabbed
Source: "..\modules\skin\tabbed\*.png"; DestDir: "{app}\modules\skin\tabbed"; Components: client\skin\tabbed
Source: "..\modules\help\*.yhlp"; DestDir: "{app}\modules\help"; Components: client
Source: "..\conf.d\yate-gtk2.conf.tabbed"; DestName: "yate-gtk2.conf"; DestDir: "{app}\conf.d"; Components: client\skin\tabbed; Flags: skipifsourcedoesntexist
Source: "..\scripts\*.php"; DestDir: "{app}\scripts"; Components: external\php