diff --git a/VERSION b/VERSION index 9416b95b0..694780ca3 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3444" +BUILD_NUM="3445" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 799ec4514..62714851f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3444" +#define VERSION "4.2.0.3445" #define GENERATION "4.2" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 10fb198ac..6d5ccc50d 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3444 +%define version 4.2.0.3445 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 09140a604..90b96a646 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -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: 4.2.0.3444-1 +Version: 4.2.0.3445-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index 964705acc..6da906425 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3444 +%define version 4.2.0.3445 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/ObjectManipulator.cpp b/src/libgui/ObjectManipulator.cpp index 067241775..a64fa6a40 100644 --- a/src/libgui/ObjectManipulator.cpp +++ b/src/libgui/ObjectManipulator.cpp @@ -749,7 +749,7 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos) delMenuItem, newMenuItem, inDeletedObjects); if (dupID) dupID->setEnabled(dupMenuItem); -// movetargets->setEnabled(moveMenuItem); + copyID->setEnabled(copyMenuItem); pasteID->setEnabled(pasteMenuItem); @@ -757,7 +757,8 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos) delID->setEnabled(delMenuItem); // can not move object if can not delete it - movetargets->setEnabled(delMenuItem); + if (movetargets) + movetargets->setEnabled(delMenuItem); QList::iterator iter; for (iter=AddObjectActions.begin(); iter!=AddObjectActions.end(); iter++)