onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

set version to 4.2.2

Browse Source 
see #2395, #2396  need to call fixTree() to fix pointers to the root of the tree after merge()
This commit is contained in:
Vadim Kurland
2011-05-11 09:53:11 -07:00
parent ceb6904e06
commit a2d64c733a
8 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+2 -2
View File
@@ -2,12 +2,12 @@
FWB_MAJOR_VERSION=4 FWB_MAJOR_VERSION=4
FWB_MINOR_VERSION=2 FWB_MINOR_VERSION=2
FWB_MICRO_VERSION=1 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="3540" BUILD_NUM="3541"
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 "4.2.1.3540" #define VERSION "4.2.2.3541"
#define GENERATION "4.2" #define GENERATION "4.2"
doc/ChangeLog
+14
View File
@@ -1,3 +1,17 @@
2011-05-11 vadim <vadim@netcitadel.com>
* newFirewallDialog.cpp (finishClicked): fixes #2395 "Crash when
setting installer directory location" and fixes #2396 "Crash when
changing firewall name". These two bug reports where the
manifestation of the same problem that was introduced by the fix
for #2380. When user hits OK in the newFirewallDialog and it
merges temporary object tree into the main object tree, it should
call fixTree() to fix all pointers to the root of the tree.
2011-05-10 vadim <vadim@netcitadel.com>
* v4.2.1 released
2011-05-09 Vadim Kurland <vadim@netcitadel.com> 2011-05-09 Vadim Kurland <vadim@netcitadel.com>
* FWCmdAddObject.cpp (redo): fixes #2391 "selecting 'new library' * FWCmdAddObject.cpp (redo): fixes #2391 "selecting 'new library'
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.1.3540 %define version 4.2.2.3541
%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: 4.2.1.3540-1 Version: 4.2.2.3541-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.3.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 4.2.1.3540 %define version 4.2.2.3541
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"
src/libgui/ObjectManipulator_create_new.cpp
+1
View File
@@ -504,6 +504,7 @@ FWObject* ObjectManipulator::newFirewall(QUndoCommand* macro)
FWCmdAddObject *cmd = new FWCmdAddObject( FWCmdAddObject *cmd = new FWCmdAddObject(
m_project, parent, NULL, QObject::tr("Create new Firewall"), macro); m_project, parent, NULL, QObject::tr("Create new Firewall"), macro);
FWObject *new_state = cmd->getNewState(); FWObject *new_state = cmd->getNewState();
parent->remove(nfw, false); parent->remove(nfw, false);
new_state->add(nfw); new_state->add(nfw);
} }
src/libgui/newFirewallDialog.cpp
+3
View File
@@ -1276,6 +1276,9 @@ void newFirewallDialog::finishClicked()
CompareObjectsDialog cod(this); CompareObjectsDialog cod(this);
db_orig->merge(db_copy, &cod); db_orig->merge(db_copy, &cod);
db_orig->fixTree();
nfw = Firewall::cast(db_orig->findInIndex(nfw->getId()));
if (tmpldb!=NULL) if (tmpldb!=NULL)