onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00
Code Issues Releases Wiki Activity

fixes #2144 GUI crash when user clicks "Import firewall configuration" shortcut button; new build 3487

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-25 17:14:53 -08:00
parent 98a2f51d52
commit e0ac139d78
6 changed files with 9 additions and 5 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=0
# 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="3486" BUILD_NUM="3487"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3486" #define VERSION "4.2.0.3487"
#define GENERATION "4.2" #define GENERATION "4.2"

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

@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3486 %define version 4.2.0.3487
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %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 Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3486-1 Version: 4.2.0.3487-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

2
packaging/fwbuilder.spec
View File

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

4
src/libgui/DiscoveryDruid.cpp
View File

@ -95,6 +95,8 @@ using namespace libfwbuilder;
DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) : DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
QDialog(parent) QDialog(parent)
{ {
blockSignals(true);
m_dialog = new Ui::DiscoveryDruid_q; m_dialog = new Ui::DiscoveryDruid_q;
m_dialog->setupUi(this); m_dialog->setupUi(this);
@ -105,6 +107,8 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
m_dialog->cancelButton, m_dialog->cancelButton,
m_dialog->titleLabel); m_dialog->titleLabel);
blockSignals(false);
QTextCursor cursor(m_dialog->discoverylog->textCursor()); QTextCursor cursor(m_dialog->discoverylog->textCursor());
normal_format = cursor.charFormat(); normal_format = cursor.charFormat();