GNOME.org
 

[glom] 1.12.4

commit a598e5f297c4c21cc383befe19a9c68c3ae4bc9b
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 31 09:57:37 2009 +0100

    1.12.4

 ChangeLog                                |    4 +++
 Makefile_tests.am                        |   27 +++++++++++------------
 NEWS                                     |   33 ++++++++++++++++++++++++++++++
 configure.ac                             |    2 +-
 glom/utility_widgets/flowtable_dnd.cc    |   10 ++++----
 glom/utility_widgets/placeholder-glom.cc |    4 +-
 6 files changed, 58 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ff64d44..80a58fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
+1.12.4:
+
 2009-12-30  Murray Cumming  <murrayc murrayc com>
 
   Dnd layout: Avoid a crash when dragging to empty space.
   
 	* glom/utility_widgets/flowtable_dnd.cc: on_drag_data_received():
 	Avoid dereferencing a null group.
+	Bug #599232
 
 2009-12-30  Murray Cumming  <murrayc murrayc com>
 
@@ -11,6 +14,7 @@
 
 	* glom/utility_widgets/flowtable_dnd.cc: on_drag_data_received():
 	Use a dynamic_cast<> to avoid memory corruption with the MI class.
+	Bug #599232
 
 2009-12-16  Armin Burgmeier  <armin arbur net>
 
diff --git a/Makefile_tests.am b/Makefile_tests.am
index e5eafcf..c3df9f4 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -20,7 +20,6 @@ check_PROGRAMS =						\
 	glom/libglom/test_document				\
 	glom/libglom/test_sharedptr_layoutitem			\
 	glom/utility_widgets/test_flowtable			\
-	glom/utility_widgets/test_flowtable_dnd			\
 	glom/utility_widgets/egg/toolpalette/testtoolpalette	\
 	glom/test_pyembed					\
 	tests/test_parsing_time			\
@@ -92,19 +91,19 @@ EGGTOOLPALETTE_LIBS = glom/utility_widgets/egg/toolpalette/libeggtoolpalette.a\
 
 # You must remove PlaceholderGlom::get_application() to avoid having to specify 
 # a huge set of .cc files when building this test:
-glom_utility_widgets_test_flowtable_dnd_SOURCES =	\
-	glom/utility_widgets/flowtable.cc	\
-	glom/utility_widgets/flowtable.h	\
-	glom/utility_widgets/flowtable_dnd.cc	\
-	glom/utility_widgets/flowtable_dnd.h	\
-	glom/utility_widgets/layoutwidgetutils.h \
-	glom/utility_widgets/layoutwidgetutils.cc \
-	glom/utility_widgets/layoutwidgetbase.h \
-	glom/utility_widgets/layoutwidgetbase.cc \
-	glom/utility_widgets/placeholder-glom.h \
-	glom/utility_widgets/placeholder-glom.cc \
-	glom/utility_widgets/test_flowtable_dnd.cc
-glom_utility_widgets_test_flowtable_dnd_LDADD = $(LIBGLOM_LA) $(GLOM_LIBS) $(EGGTOOLPALETTE_LIBS)
+#glom_utility_widgets_test_flowtable_dnd_SOURCES =	\
+#	glom/utility_widgets/flowtable.cc	\
+#	glom/utility_widgets/flowtable.h	\
+#	glom/utility_widgets/flowtable_dnd.cc	\
+#	glom/utility_widgets/flowtable_dnd.h	\
+#	glom/utility_widgets/layoutwidgetutils.h \
+#	glom/utility_widgets/layoutwidgetutils.cc \
+#	glom/utility_widgets/layoutwidgetbase.h \
+#	glom/utility_widgets/layoutwidgetbase.cc \
+#	glom/utility_widgets/placeholder-glom.h \
+#	glom/utility_widgets/placeholder-glom.cc \
+#	glom/utility_widgets/test_flowtable_dnd.cc
+# glom_utility_widgets_test_flowtable_dnd_LDADD = $(LIBGLOM_LA) $(GLOM_LIBS) $(EGGTOOLPALETTE_LIBS)
 
 glom_utility_widgets_egg_toolpalette_testtoolpalette_SOURCES =	\
 	glom/utility_widgets/egg/toolpalette/testtoolpalette.c
diff --git a/NEWS b/NEWS
index 1ad5c20..f069c89 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+1.12.4 (stable):
+
+* Drag and drop layout: Fix some crashes. This feature still has some problems,
+  so the layout dialog is still available.
+   (Murray Cumming) Bug #599232
+* Field Definitions: Show the default value entry even for date fields. 
+* Python calculations/scripts:
+  Fix a crash when calling python functions that return dates.
+  (Murray Cumming) Bug #603686. (Andrew Ruthven)
+* Details layout:
+  - Related records layout definition: 
+  When defining drop-down choices in the custom formatting, show the correct 
+  relationships. Noticed by Michael Hasselmann and Andrew Ruthven.
+  (Murray Cumming)
+  - Fix a crash when specifying a static image on the layout.
+  (Murray Cumming) Bug #600954 (Michael Hasselmann).
+* Saving: Always add the xmlns ID to the document, to make MIME-type detection 
+  easier. (Murray Cumming)
+* Do not mark an empty string for translation.
+  (Murray Cumming) Bug #599868 (André Klapper).
+* Avoid some runtime warnings.
+  (Murray Cumming)
+* Examples: Film Manager: Add silly example data.
+  (Murray Cumming) Bug #600859 (Michael Hasselmann)
+* Windows build: Add missing libpangoft2-1.0-0.dll to the installer.
+  (Armin Burgmeier) Bug #599966 (Akishi Soda, Cinna)  
+* Maemo build: Don't depend on libgettextpo.
+  (David King)
+* Developer documentation:
+  Correct the DTD and add a unit test to make sure it and the 
+  examples are correct.
+  (Michael Hasselmann, Murray Cumming)
+  
 1.12.3 (stable):
 
 * List: Fix zero-width columns. That regression was introduced in 1.12.2.
diff --git a/configure.ac b/configure.ac
index 92eb163..1eb0aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.12.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.12.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])
diff --git a/glom/utility_widgets/flowtable_dnd.cc b/glom/utility_widgets/flowtable_dnd.cc
index e0dd5bc..1b63278 100644
--- a/glom/utility_widgets/flowtable_dnd.cc
+++ b/glom/utility_widgets/flowtable_dnd.cc
@@ -153,20 +153,20 @@ bool FlowTableDnd::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& /* drag_
   return false;
 }
 
-void FlowTableDnd::on_dnd_add_layout_item_by_type(int item_type, Gtk::Widget* above)
+void FlowTableDnd::on_dnd_add_layout_item_by_type(int /* item_type */, Gtk::Widget* /* above */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_layout_item_by_type(): Not implemented. Derived classes should implement this." << std::endl;
 }
 
-void FlowTableDnd::on_dnd_add_layout_item(LayoutWidgetBase* above, const sharedptr<LayoutItem>& item)
+void FlowTableDnd::on_dnd_add_layout_item(LayoutWidgetBase* /* above */, const sharedptr<LayoutItem>& /* item */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_layout_item(): Not implemented. Derived classes should implement this." << std::endl;
 
 }
 
-void FlowTableDnd::on_dnd_add_placeholder(Gtk::Widget* above)
+void FlowTableDnd::on_dnd_add_placeholder(Gtk::Widget* /* above */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_placeholder(): Not implemented. Derived classes should implement this." << std::endl;
@@ -417,12 +417,12 @@ void FlowTableDnd::on_child_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&
                       sizeof(gpointer*));
 }
 
-void FlowTableDnd::set_child_widget_dnd_in_progress(Gtk::Widget* child, bool in_progress)
+void FlowTableDnd::set_child_widget_dnd_in_progress(Gtk::Widget* /* child */, bool /* in_progress */)
 {
   //To be reimplemented by derived classes.
 }
 
-bool FlowTableDnd::get_child_widget_dnd_in_progress(Gtk::Widget* child) const
+bool FlowTableDnd::get_child_widget_dnd_in_progress(Gtk::Widget* /* child */) const
 {
   //To be reimplemented by derived classes.
   return false;
diff --git a/glom/utility_widgets/placeholder-glom.cc b/glom/utility_widgets/placeholder-glom.cc
index 9688bb6..3d0656d 100644
--- a/glom/utility_widgets/placeholder-glom.cc
+++ b/glom/utility_widgets/placeholder-glom.cc
@@ -25,7 +25,7 @@
 #include "placeholder-glom.h"
 #include "labelglom.h"
 #include <gtkmm/messagedialog.h>
-//#include <glom/application.h>
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 #include <string.h> // for memset
 
@@ -55,7 +55,7 @@ App_Glom* PlaceholderGlom::get_application()
   Gtk::Container* pWindow = get_toplevel();
   //TODO: This only works when the child widget is already in its parent.
 
-  return 0; //dynamic_cast<App_Glom*>(pWindow);
+  return dynamic_cast<App_Glom*>(pWindow);
 }
 
 void PlaceholderGlom::on_size_request(Gtk::Requisition* requisition)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]