2007-07-27 Murray Cumming <murrayc@murrayc.com>

* src/widgets/modest-header-view-render.c:
(_modest_header_view_compact_header_cell_data):
Some checks and initialization to try to deal with a crash,
probably ineffective.

pmo-trunk-r2829

diff --git a/ChangeLog2 b/ChangeLog2
index 64bd9fa..3fb7900 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,12 @@
 2007-07-27  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/widgets/modest-header-view-render.c:
+       (_modest_header_view_compact_header_cell_data):
+       Some checks and initialization to try to deal with a crash, 
+       probably ineffective.
+
+2007-07-27  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-maemo-utils.c:
        (modest_maemo_utils_get_supported_secure_authentication_methods):
        Make sure that we have a connection, asking the user for one 

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index e8dfe27..890dd07 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -259,13 +259,24 @@ void
 _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                                               GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
-       TnyHeaderFlags flags, prior_flags;
-       gchar *address, *subject, *header;
-       time_t date;
-       ModestHeaderViewCompactHeaderMode header_mode;
+       g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
+       g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
+       g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
+       
+       /* Note that GtkTreeModel is a GtkTreeModelFilter. */
+       
+       /* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
+       
+       TnyHeaderFlags flags = 0;
+       TnyHeaderFlags prior_flags = 0;
+       gchar *address = NULL;
+       gchar *subject = NULL;
+       gchar *header = NULL;
+       time_t date = 0;
+       
        GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
                *attach_cell, *priority_cell,
-               *recipient_box, *subject_box;
+               *recipient_box, *subject_box = NULL;
        TnyHeader *msg_header = NULL;
        gchar *display_date = NULL, *tmp_date = NULL;
 
@@ -277,7 +288,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
        date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
 
-       header_mode = GPOINTER_TO_INT (user_data); 
+       ModestHeaderViewCompactHeaderMode header_mode = GPOINTER_TO_INT (user_data); 
 
        if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN)
                gtk_tree_model_get (tree_model, iter,