diff --git a/build_num b/build_num
index 5c41b2656..c07c01607 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2977
+#define BUILD_NUM 2978
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4bf7185ba..f2deb94c9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-12  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* GroupObjectDialog.h (class GroupObjectDialog): fixed #1499
+	"GroupObjectDialogTest.cpp does not compile with gcc 3.4.6" and SF
+	bug 3015307.  There is no reason to make method insertObject()
+	protected which caused problems (and hacky workaround) in the unit
+	test.
+
 	* IPTImporter.cpp (IPTImporter::finalize): fixed SF bug #3015305
 	"compile error XML validity ". The problem was introduced with a
 	change that made policy importer cabaple of reproducing default
diff --git a/src/gui/GroupObjectDialog.h b/src/gui/GroupObjectDialog.h
index d47f47cf2..a95a393d4 100644
--- a/src/gui/GroupObjectDialog.h
+++ b/src/gui/GroupObjectDialog.h
@@ -65,15 +65,15 @@ class GroupObjectDialog : public BaseObjectDialog
     void setupPopupMenu(const QPoint&);
     void saveColumnWidths();
 
- protected:
-    void insertObject(libfwbuilder::FWObject *o);
-
  public:
     GroupObjectDialog(QWidget *parent);
     ~GroupObjectDialog();
 
     enum viewType { Icon, List };
 
+    // making insertObject() public so we can use it in unit tests
+    void insertObject(libfwbuilder::FWObject *o);
+    
  public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
diff --git a/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp b/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
index 2376ad66d..81caeed32 100644
--- a/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
+++ b/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
@@ -160,18 +160,9 @@ template <class FWTYPE> FWTYPE* GroupObjectDialogTest::createObject(QString name
     return FWTYPE::cast(om->createObject(FWBTree().getStandardSlotForObject(findUserLibrary(), FWTYPE::TYPENAME), FWTYPE::TYPENAME, name));
 }
 
-class PublicGroupDialog: public GroupObjectDialog
-{
-public:
-    void insertObject(FWObject *o)
-    {
-        GroupObjectDialog::insertObject(o);
-    }
-};
-
 bool checkObjectInsertion(GroupObjectDialog *dlg, Group *grp, FWObject *obj)
 {
-    static_cast<PublicGroupDialog*>(dlg)->insertObject(obj);
+    dlg->insertObject(obj);
     for (Group::iterator i = grp->begin(); i!= grp->end(); i++)
     {
         if (FWObjectReference::cast(*i)->getPointer() == obj)
@@ -184,7 +175,7 @@ bool checkObjectInsertion(GroupObjectDialog *dlg, Group *grp, FWObject *obj)
 
 bool checkObjectInsertion2(GroupObjectDialog *dlg, ServiceGroup *grp, FWObject *obj)
 {
-    static_cast<PublicGroupDialog*>(dlg)->insertObject(obj);
+    dlg->insertObject(obj);
     for (ServiceGroup::iterator i = grp->begin(); i!= grp->end(); i++)
     {
         if (FWServiceReference::cast(*i)->getPointer() == obj)
diff --git a/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h b/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h
index 544f014ef..dc2d1c058 100644
--- a/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h
+++ b/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h
@@ -51,7 +51,8 @@
 
 class GroupObjectDialogTest : public QObject
 {
-    Q_OBJECT
+    Q_OBJECT;
+    
     libfwbuilder::Library* findUserLibrary();
     template <class FWTYPE> FWTYPE* createObject(QString name);
     ObjectManipulator *om;