From 869cae5039f91e7391172c1de4ea788d722e9777 Mon Sep 17 00:00:00 2001
From:  <alek@codeminders.com>
Date: Thu, 6 Mar 2008 17:26:28 +0000
Subject: [PATCH] Bug 2399 fixed

---
 src/gui/FWBMainWindow_q.ui | 3 ---
 src/gui/FWWindow.cpp       | 2 ++
 src/gui/ObjectTreeView.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/FWBMainWindow_q.ui b/src/gui/FWBMainWindow_q.ui
index f498641a2..2384657c0 100644
--- a/src/gui/FWBMainWindow_q.ui
+++ b/src/gui/FWBMainWindow_q.ui
@@ -34,9 +34,6 @@
   <property name="windowTitle" >
    <string>Firewall Builder</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <widget class="QWidget" name="widget" >
    <layout class="QGridLayout" >
     <property name="leftMargin" >
diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp
index 5ef116ede..c57e2015b 100644
--- a/src/gui/FWWindow.cpp
+++ b/src/gui/FWWindow.cpp
@@ -217,6 +217,8 @@ ProjectPanel *FWWindow::newProjectPanel()
     sub->setAttribute(Qt::WA_DeleteOnClose);
     m_space->addSubWindow(sub);
     sub->showMaximized();
+    QIcon p(":Icons/Firewall/icon-tree");
+    sub->setWindowIcon(p);
     return projectW;
 }
     
diff --git a/src/gui/ObjectTreeView.cpp b/src/gui/ObjectTreeView.cpp
index 4e0b168f9..ec153458c 100644
--- a/src/gui/ObjectTreeView.cpp
+++ b/src/gui/ObjectTreeView.cpp
@@ -520,7 +520,7 @@ FWObject *ObjectTreeView::getDropTarget(QDropEvent *ev, FWObject* dragobj)
     ObjectTreeViewItem *otvi=dynamic_cast<ObjectTreeViewItem*>(ovi);
     FWObject *trobj;
     if (otvi && (trobj = otvi->getFWObject()) && !trobj->isReadOnly() &&
-      ((Interface::isA(dragobj)) //Firewall::isA(trobj) && 
+      (Interface::isA(dragobj) //Firewall::isA(trobj) && 
           || (Interface::isA(trobj) && IPv4::isA(dragobj))))
         return trobj;
     return 0;