2007-05-31 Murray Cumming <murrayc@murrayc.com>

* src/widgets/modest-hbox-cell-renderer.c:
        (modest_hbox_cell_renderer_append):
        * src/widgets/modest-vbox-cell-renderer.c:
        (modest_vbox_cell_renderer_append):
        Fix the last commit by doing an extra ref.

pmo-trunk-r2005

diff --git a/ChangeLog2 b/ChangeLog2
index e8f5831..c820e82 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -4,6 +4,14 @@
        (modest_hbox_cell_renderer_append):
        * src/widgets/modest-vbox-cell-renderer.c:
        (modest_vbox_cell_renderer_append):
+       Fix the last commit by doing an extra ref.
+
+2007-05-31  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/widgets/modest-hbox-cell-renderer.c:
+       (modest_hbox_cell_renderer_append):
+       * src/widgets/modest-vbox-cell-renderer.c:
+       (modest_vbox_cell_renderer_append):
        For glib < 2.10, use gtk_object_sink() instead of g_object_ref_sink(), 
        to fix the build with Maemo Bora.
        However, there seems to be a remaining crash, probably due to reference 

diff --git a/src/widgets/modest-hbox-cell-renderer.c b/src/widgets/modest-hbox-cell-renderer.c
index 4f443cd..f177910 100644 (file)
--- a/src/widgets/modest-hbox-cell-renderer.c
+++ b/src/widgets/modest-hbox-cell-renderer.c
@@ -187,6 +187,7 @@ modest_hbox_cell_renderer_append (ModestHBoxCellRenderer *hbox_renderer,
 #if GLIB_CHECK_VERSION(2, 10, 0) /* g_object_ref_sink() was added in glib 2.10: */
        g_object_ref_sink (G_OBJECT (cell));
 #else
+       g_object_ref (G_OBJECT (cell));
        gtk_object_sink (GTK_OBJECT (cell));
 #endif
 }

diff --git a/src/widgets/modest-vbox-cell-renderer.c b/src/widgets/modest-vbox-cell-renderer.c
index e365606..88c625e 100644 (file)
--- a/src/widgets/modest-vbox-cell-renderer.c
+++ b/src/widgets/modest-vbox-cell-renderer.c
@@ -187,6 +187,7 @@ modest_vbox_cell_renderer_append (ModestVBoxCellRenderer *vbox_renderer,
 #if GLIB_CHECK_VERSION(2, 10, 0) /* g_object_ref_sink() was added in glib 2.10: */
        g_object_ref_sink (G_OBJECT (cell));
 #else
+       g_object_ref (G_OBJECT (cell));
        gtk_object_sink (GTK_OBJECT (cell));
 #endif
 }