onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-10 23:22:33 +02:00
Code Issues Releases Wiki Activity

removed all ELC

Browse Source
This commit is contained in:
Vadim Kurland
2012-02-14 10:57:50 -08:00
parent 15565ade5d
commit 18eae7e63d
10 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
# build number is like "nano" version number. I am incrementing build # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3594" BUILD_NUM="3595"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
VERSION.h
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "5.0.2.3594" #define VERSION "5.0.2.3595"
#define GENERATION "5.0" #define GENERATION "5.0"
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 5.0.2.3594 %define version 5.0.2.3595
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
packaging/fwbuilder.control
+1 -1
View File
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 5.0.2.3594-1 Version: 5.0.2.3595-1
Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers
packaging/fwbuilder.spec
+1 -1
View File
@@ -1,6 +1,6 @@
%define name fwbuilder %define name fwbuilder
%define version 5.0.2.3594 %define version 5.0.2.3595
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
qmake.inc.in
+1
View File
@@ -67,6 +67,7 @@ unix {
CONFIG += warn_on CONFIG += warn_on
# DEFINES += __STDC_FORMAT_MACROS
} }
} }
src/libgui/FWWindow.cpp
-4
View File
@@ -620,10 +620,6 @@ void FWWindow::showIntroDialog()
return; return;
} }
#ifdef ELC
if (regCheck()) return;
#endif
if (!st->getBool("UI/NoStartTip")) if (!st->getBool("UI/NoStartTip"))
{ {
StartTipDialog *stdlg = new StartTipDialog(this); StartTipDialog *stdlg = new StartTipDialog(this);
src/libgui/HttpGet.cpp
+2 -7
View File
@@ -113,13 +113,8 @@ bool HttpGet::get(const QUrl &_url)
#endif #endif
#endif #endif
QString reg = "u"; QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; u)")
#ifdef ELC .arg(VERSION).arg(os).arg(locale).arg(sig);
if (getRegistrationStatus()==2) reg = "r";
#endif
QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; %6)")
.arg(VERSION).arg(os).arg(locale).arg(sig).arg(reg);
hdr.setValue("User-Agent", agent); hdr.setValue("User-Agent", agent);
request_id = http.request(hdr, NULL, &strm); request_id = http.request(hdr, NULL, &strm);
src/libgui/ObjectManipulator_new_object_checks.cpp
-2
View File
@@ -34,7 +34,6 @@
using namespace std; using namespace std;
using namespace libfwbuilder; using namespace libfwbuilder;
#ifndef ELC
bool ObjectManipulator::isObjectAllowed(const QString&) bool ObjectManipulator::isObjectAllowed(const QString&)
{ {
return true; return true;
@@ -46,4 +45,3 @@ bool ObjectManipulator::isObjectAllowed(FWObject*, FWObject*)
return true; return true;
} }
#endif
src/libgui/aboutdialog_q.ui
+1 -1
View File
@@ -470,7 +470,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Copyright 2002-2011 NetCitadel, LLC</string> <string>Copyright 2002-2011 NetCitadel, Inc</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>