From aa8f7edc7f62f3321a771acdf26729ff001cc3d1 Mon Sep 17 00:00:00 2001
From: Vadim Kurland
Date: Tue, 15 Nov 2011 11:38:11 -0800
Subject: [PATCH] fixes #2669 "Cant inspect custom Service object in Standard
objects library".
---
VERSION | 2 +-
VERSION.h | 2 +-
doc/ChangeLog | 5 +++++
packaging/fwbuilder-static-qt.spec | 2 +-
packaging/fwbuilder.control | 2 +-
packaging/fwbuilder.spec | 2 +-
src/libgui/CustomServiceDialog.cpp | 4 ++--
src/res/help/en_US/release_notes_5.0.1.html | 7 +++++++
8 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/VERSION b/VERSION
index 3986f1da4..6a3e4f8af 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
-BUILD_NUM="3585"
+BUILD_NUM="3586"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
diff --git a/VERSION.h b/VERSION.h
index 479282615..a3fbe7002 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION "5.0.1.3585"
+#define VERSION "5.0.1.3586"
#define GENERATION "5.0"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 052312cde..0d121bf4e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-15 Vadim Kurland
+
+ * CustomServiceDialog.cpp (loadFWObject): fixes #2669 "Cant
+ inspect custom Service object in Standard objects library".
+
2011-11-10 Vadim Kurland
* configlets/linux24/check_utilities: fixes #2664 Update error
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index aad4265e8..d9576281c 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
%define name fwbuilder
-%define version 5.0.1.3585
+%define version 5.0.1.3586
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index a3f1c84d0..3546c5d88 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: 5.0.1.3585-1
+Version: 5.0.1.3586-1
Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 90b11d137..34f7820a6 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
%define name fwbuilder
-%define version 5.0.1.3585
+%define version 5.0.1.3586
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/CustomServiceDialog.cpp b/src/libgui/CustomServiceDialog.cpp
index f4fcddd8c..2cf2609e8 100644
--- a/src/libgui/CustomServiceDialog.cpp
+++ b/src/libgui/CustomServiceDialog.cpp
@@ -152,8 +152,8 @@ void CustomServiceDialog::loadFWObject(FWObject *o)
m_dialog->code->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->code);
- m_dialog->platform->setEnabled(!o->isReadOnly());
- setDisabledPalette(m_dialog->platform);
+ // do not make "platform" widget disabled when object is read-only
+ // to let the user flip between platforms to see the configuration. See #2669
m_dialog->protocol->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->protocol);
diff --git a/src/res/help/en_US/release_notes_5.0.1.html b/src/res/help/en_US/release_notes_5.0.1.html
index ab158743a..d40dafda1 100644
--- a/src/res/help/en_US/release_notes_5.0.1.html
+++ b/src/res/help/en_US/release_notes_5.0.1.html
@@ -186,6 +186,13 @@
+
+
+ fixes #2669 "Cant inspect custom Service object in Standard
+ objects library".
+
+
+