mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-14 17:09:11 +02:00
init2 returns int instead of bool so we can separate case when there is no license file from the case when the file exist but is invalid
This commit is contained in:
@@ -32,8 +32,18 @@ public:
|
||||
libfwbuilder::Constants::getLibraryVersion().c_str() ) );
|
||||
|
||||
#ifdef ELC
|
||||
if (registered) m_aboutDialog->reg->setText(tr("Registered"));
|
||||
else m_aboutDialog->reg->setText(tr("Unregistered"));
|
||||
switch (registered)
|
||||
{
|
||||
case 1:
|
||||
m_aboutDialog->reg->setText(tr("Invalid license"));
|
||||
break;
|
||||
case 2:
|
||||
m_aboutDialog->reg->setText(tr("Registered"));
|
||||
break;
|
||||
default:
|
||||
m_aboutDialog->reg->setText(tr("Unregistered"));
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
setWindowTitle(QString("Firewall Builder: About..."));
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ extern std::string tempfname;
|
||||
extern std::string argv0;
|
||||
extern std::string ee;
|
||||
extern int fwbdebug;
|
||||
extern bool registered;
|
||||
extern int registered;
|
||||
extern bool gui_experiment1;
|
||||
|
||||
#define SETTINGS_PATH_PREFIX "/3.0"
|
||||
|
||||
+6
-6
@@ -114,11 +114,11 @@
|
||||
#include "../common/init.cpp"
|
||||
|
||||
#ifdef ELC
|
||||
extern bool init2(const std::string &a1,
|
||||
const std::string &moduleName,
|
||||
const std::string &rp,
|
||||
const std::string &rp1,
|
||||
bool f1, bool f2, bool d);
|
||||
extern int init2(const std::string &a1,
|
||||
const std::string &moduleName,
|
||||
const std::string &rp,
|
||||
const std::string &rp1,
|
||||
bool f1, bool f2, bool d);
|
||||
#endif
|
||||
|
||||
#if defined(Q_WS_MAC)
|
||||
@@ -137,7 +137,7 @@ FWWindow *mw = NULL;
|
||||
FWBSettings *st = NULL;
|
||||
int fwbdebug = 0;
|
||||
bool safemode = false;
|
||||
bool registered = false;
|
||||
int registered = 0;
|
||||
bool gui_experiment1 = false;
|
||||
bool cli_print = false;
|
||||
QString cli_print_fwname = "";
|
||||
|
||||
Reference in New Issue
Block a user