[fwbuilder-commits] r2088 - in branches/v3_1: . src/gui

[<va...@in...>]

Author: vadim
Date: 2009-12-10 14:14:05 -0800 (Thu, 10 Dec 2009)
New Revision: 2088

Modified:
   branches/v3_1/build_num
   branches/v3_1/src/gui/FWBSettings.cpp
   branches/v3_1/src/gui/FWBSettings.h
   branches/v3_1/src/gui/HttpGet.cpp
   branches/v3_1/src/gui/global.h
   branches/v3_1/src/gui/main.cpp
Log:
fixes #839 

Modified: branches/v3_1/build_num
===================================================================
--- branches/v3_1/build_num	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/build_num	2009-12-10 22:14:05 UTC (rev 2088)
@@ -1 +1 @@
-#define BUILD_NUM 2084
+#define BUILD_NUM 2087

Modified: branches/v3_1/src/gui/FWBSettings.cpp
===================================================================
--- branches/v3_1/src/gui/FWBSettings.cpp	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/src/gui/FWBSettings.cpp	2009-12-10 22:14:05 UTC (rev 2088)
@@ -117,7 +117,7 @@
  * in the Windows installer/uninstaller scripts.
  */
 FWBSettings::FWBSettings() :
-    QSettings(QSettings::UserScope, "netcitadel.com", "Firewall Builder 3.1")
+    QSettings(QSettings::UserScope, "netcitadel.com", getApplicationNameForSettings())
 {
 }
 

Modified: branches/v3_1/src/gui/FWBSettings.h
===================================================================
--- branches/v3_1/src/gui/FWBSettings.h	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/src/gui/FWBSettings.h	2009-12-10 22:14:05 UTC (rev 2088)
@@ -60,6 +60,8 @@
 
     FWBSettings();
 
+    static QString getApplicationNameForSettings() { return "FirewallBuilder3.1"; }
+
     void init();
     void save();
 

Modified: branches/v3_1/src/gui/HttpGet.cpp
===================================================================
--- branches/v3_1/src/gui/HttpGet.cpp	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/src/gui/HttpGet.cpp	2009-12-10 22:14:05 UTC (rev 2088)
@@ -36,6 +36,8 @@
 
 using namespace std;
 
+extern int getRegistrationStatus();
+
 HttpGet::HttpGet(QObject *parent) : QObject(parent), strm(&contents)
 {
     last_error = "";
@@ -106,8 +108,8 @@
     agent += locale;
     agent += QString("; b:%1; ").arg(build_num);
 #ifdef ELC
-    if (registered==2) agent += "r";
-    else               agent += "u";
+    if (getRegistrationStatus()==2) agent += "r";
+    else                            agent += "u";
 #else
     agent += "u";
 #endif

Modified: branches/v3_1/src/gui/global.h
===================================================================
--- branches/v3_1/src/gui/global.h	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/src/gui/global.h	2009-12-10 22:14:05 UTC (rev 2088)
@@ -50,7 +50,6 @@
 extern std::string     argv0;
 extern std::string     ee;
 extern int             fwbdebug;
-extern int             registered;
 extern QString         build_num;
 extern QString         user_name;
 

Modified: branches/v3_1/src/gui/main.cpp
===================================================================
--- branches/v3_1/src/gui/main.cpp	2009-12-10 22:04:21 UTC (rev 2087)
+++ branches/v3_1/src/gui/main.cpp	2009-12-10 22:14:05 UTC (rev 2088)
@@ -112,10 +112,11 @@
 #include "../common/init.cpp"
 
 #ifdef ELC
-extern int init2(const std::string &a1,
-                 const std::string &moduleName,
-                 const std::string &rp,
-                 const std::string &rp1,
+extern int init2(const QString &a1,
+                 const QString &moduleName,
+                 const QString &rp1,
+                 const QString &rp2,
+                 const QString &rp3,
                  bool f1, bool f2, bool d);
 #endif
 
@@ -135,7 +136,6 @@
 FWBSettings *st = NULL;
 int fwbdebug = 0;
 bool safemode = false;
-int registered = 0;
 bool cli_print = false;
 QString cli_print_fwname = "";
 
@@ -610,11 +610,12 @@
 //        app->setFont(st->getTreeFont());
 
 #ifdef ELC
-    registered = init2(argv0,
-                       "Firewall Builder",
-                       "fwb_gui30",
-                       "3.1",
-                       true, true, fwbdebug);
+    init2(argv0.c_str(),
+          "Firewall Builder",
+          "fwb_gui30",
+          FWBSettings::getApplicationNameForSettings(),
+          "3.1",
+          true, true, fwbdebug);
 #endif
 
     string full_res_path = respath + FS_SEPARATOR + "resources.xml";