onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 12:17:26 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3594"
BUILD_NUM="3595"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "5.0.2.3594"
#define VERSION "5.0.2.3595"
#define GENERATION "5.0"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 5.0.2.3594
%define version 5.0.2.3595
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
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
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 5.0.2.3594
%define version 5.0.2.3595
%define release 1
%if "%_vendor" == "MandrakeSoft"

1
qmake.inc.in
View File

@ -67,6 +67,7 @@ unix {
CONFIG += warn_on
# DEFINES += __STDC_FORMAT_MACROS
}
}

4
src/libgui/FWWindow.cpp
View File

@ -620,10 +620,6 @@ void FWWindow::showIntroDialog()
return;
}
#ifdef ELC
if (regCheck()) return;
#endif
if (!st->getBool("UI/NoStartTip"))
{
StartTipDialog *stdlg = new StartTipDialog(this);

9
src/libgui/HttpGet.cpp
View File

@ -113,13 +113,8 @@ bool HttpGet::get(const QUrl &_url)
#endif
#endif
QString reg = "u";
#ifdef ELC
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);
QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; u)")
.arg(VERSION).arg(os).arg(locale).arg(sig);
hdr.setValue("User-Agent", agent);
request_id = http.request(hdr, NULL, &strm);

2
src/libgui/ObjectManipulator_new_object_checks.cpp
View File

@ -34,7 +34,6 @@
using namespace std;
using namespace libfwbuilder;
#ifndef ELC
bool ObjectManipulator::isObjectAllowed(const QString&)
{
return true;
@ -46,4 +45,3 @@ bool ObjectManipulator::isObjectAllowed(FWObject*, FWObject*)
return true;
}
#endif

2
src/libgui/aboutdialog_q.ui
View File

@ -470,7 +470,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy>
</property>
<property name="text">
<string>Copyright 2002-2011 NetCitadel, LLC</string>
<string>Copyright 2002-2011 NetCitadel, Inc</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>