Several build fixes for the diablo version

pmo-drop-split-view-r6795

diff --git a/src/modest-datetime-formatter.c b/src/modest-datetime-formatter.c
index 277fea1..e39d055 100644 (file)
--- a/src/modest-datetime-formatter.c
+++ b/src/modest-datetime-formatter.c
@@ -31,10 +31,10 @@
 #include <modest-datetime-formatter.h>
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <gconf/gconf-client.h>
-#include <glib/gi18n.h>
-#include <modest-text-utils.h>
 #include <gtk/gtkmarshal.h>
 #endif
+#include <glib/gi18n.h>
+#include "modest-text-utils.h"
 
 typedef enum {
        DATETIME_FORMAT_12H,
@@ -116,7 +116,7 @@ modest_datetime_formatter_class_init (ModestDatetimeFormatterClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestDatetimeFormatterClass, format_changed),
                              NULL, NULL,
-                             gtk_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 6b4b5e7..79cc383 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1148,6 +1148,7 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
        return dimmed;
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
 gboolean 
 modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data)
 {
@@ -1166,7 +1167,7 @@ modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer us
        if (!dimmed) {
                GtkWidget *header_view;
                TnyFolder *folder;
-               
+
                header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
                folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
                if (folder) {
@@ -1177,6 +1178,7 @@ modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer us
 
        return dimmed;
 }
+#endif
 
 gboolean 
 modest_ui_dimming_rules_on_find_msg (ModestWindow *win, gpointer user_data)

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index 165e11d..846a901 100644 (file)
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -60,7 +60,6 @@ gboolean modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpoin
 gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data);
@@ -88,6 +87,9 @@ gboolean modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer us
 gboolean modest_ui_dimming_rules_on_editor_paste_show_menu (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_insert_image (ModestWindow *win, gpointer user_data);
+#ifdef MODEST_TOOLKIT_HILDON2
+gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data);
+#endif
 
 G_END_DECLS
 #endif 

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 5b60543..4848c89 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -189,7 +189,6 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        TnyHeaderFlags flags;
        guint date, date_col;
        gboolean received = GPOINTER_TO_INT(user_data);
-       ModestHeaderView *header_view;
 
        if (received)
                date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
@@ -200,11 +199,17 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
                            TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
                            date_col, &date,
                            -1);
-       
+
+#if GTK_CHECK_VERSION (2, 12, 0)
+       ModestHeaderView *header_view;
        header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
-       set_cell_text (renderer, 
+       set_cell_text (renderer,
                       _modest_header_view_get_display_date (header_view, date),
                       flags, RENDER_CELL_STYLE_DEFAULT);
+#else
+       set_cell_text (renderer, modest_text_utils_get_display_date (date),
+                      flags, RENDER_CELL_STYLE_DEFAULT);
+#endif
 }
 
 void
@@ -261,15 +266,12 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                *recipient_box, *subject_box = NULL;
        TnyHeader *msg_header = NULL;
        TnyHeaderFlags prio = 0;
-       ModestHeaderView *header_view;
 
 
        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));
 
-       header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
-
 #ifdef MAEMO_CHANGES
 #ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
        hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column));
@@ -343,11 +345,19 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                
                status_str = get_status_string (status);
                set_cell_text (date_or_status_cell, status_str, flags, RENDER_CELL_STYLE_GREY);
-       } else {                
-               set_cell_text (date_or_status_cell, date ? _modest_header_view_get_display_date (header_view, date) : "",
+       } else {
+#if GTK_CHECK_VERSION (2, 12, 0)
+               ModestHeaderView *header_view;
+               header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
+               set_cell_text (date_or_status_cell, 
+                              date ? _modest_header_view_get_display_date (header_view, date) : "",
                               flags, RENDER_CELL_STYLE_GREY);
+#else
+               set_cell_text (date_or_status_cell, 
+                              date ? modest_text_utils_get_display_date (date) : "",
+                              flags, RENDER_CELL_STYLE_GREY);
+#endif
        }
-       
        if (msg_header != NULL)
                g_object_unref (msg_header);
 }