Build fix in gtk for calendar support

[modest] / src / widgets / modest-gtkhtml-msg-view.c

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 48f414f..43829fa 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -224,6 +224,7 @@ static void remove_attachment (ModestGtkhtmlMsgView *view, TnyMimePart *attachme
 static void request_fetch_images (ModestGtkhtmlMsgView *view);
 static void set_branding (ModestGtkhtmlMsgView *view, const gchar *brand_name, const GdkPixbuf *brand_icon);
 static gboolean has_blocked_external_images (ModestGtkhtmlMsgView *view);
+static void set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg);
 
 /* list properties */
 enum {
@@ -250,6 +251,10 @@ struct _ModestGtkhtmlMsgViewPrivate {
        GtkWidget   *priority_box;
        GtkWidget   *priority_icon;
 #endif
+       GtkWidget   *calendar_box;
+       GtkWidget   *calendar_icon;
+       GtkWidget   *calendar_actions_box;
+       GtkWidget   *calendar_actions_container;
 
        /* internal adjustments for set_scroll_adjustments */
        GtkAdjustment *hadj;
@@ -1239,6 +1244,20 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
                gtk_widget_hide_all (priv->priority_box);
        }
 #endif
+       priv->calendar_actions_box = NULL;
+       priv->calendar_icon = gtk_image_new ();
+       gtk_image_set_from_icon_name (GTK_IMAGE (priv->calendar_icon), MODEST_HEADER_ICON_CALENDAR, GTK_ICON_SIZE_MENU);
+       gtk_misc_set_alignment (GTK_MISC (priv->calendar_icon), 0.0, 0.5);
+       if (priv->calendar_icon) {
+               priv->calendar_box = (GtkWidget *)
+                       modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view),
+                                                                  _("mail_fi_invitation"),
+                                                                  priv->calendar_icon,
+                                                                  FALSE, FALSE);
+                                                                  
+               gtk_widget_hide_all (priv->calendar_box);
+       }
+
        if (priv->attachments_view) {
 #ifndef MODEST_TOOLKIT_HILDON2
                gchar *att_label = g_strconcat (_("mcen_me_viewer_attachments"), ":", NULL);
@@ -1255,6 +1274,11 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
                g_free (att_label);
        }
 
+       priv->calendar_actions_container = gtk_vbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priv->headers_box), priv->calendar_actions_container, FALSE, FALSE, 0);
+       gtk_widget_hide_all (priv->calendar_actions_container);
+       gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
+
 #ifndef MODEST_TOOLKIT_HILDON2
        separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);
@@ -1441,8 +1465,7 @@ set_hadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *hadj)
        if (!hadj)
                hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0));
        disconnect_hadjustment (self);
-       g_object_ref (G_OBJECT (hadj));
-       gtk_object_sink (GTK_OBJECT (hadj));
+       g_object_ref_sink (G_OBJECT (hadj));
        priv->hadj = hadj;
        set_hadjustment_values (self, &value_changed);
 
@@ -1470,8 +1493,7 @@ set_vadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *vadj)
        if (!vadj)
                vadj = (GtkAdjustment *) gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0);
        disconnect_vadjustment (self);
-       g_object_ref (G_OBJECT (vadj));
-       gtk_object_sink (GTK_OBJECT (vadj));
+       g_object_ref_sink (G_OBJECT (vadj));
        priv->vadj = vadj;
        set_vadjustment_values (self, &value_changed);
 
@@ -1826,6 +1848,8 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg, TnyMimePart *other_body)
 #ifdef MODEST_TOOKIT_HILDON2
                gtk_widget_hide_all (priv->priority_box);
 #endif
+               gtk_widget_hide_all (priv->calendar_box);
+               gtk_widget_hide_all (priv->calendar_actions_container);
                gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
                tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
 
@@ -1900,17 +1924,22 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg, TnyMimePart *other_body)
 
        /* Refresh priority */
        set_priority (self, tny_header_get_flags (header));
+       set_calendar (self, header, msg);
 
        gtk_widget_show (priv->body_view);
 #ifdef MODEST_TOOLKIT_HILDON2
        gtk_widget_set_no_show_all (priv->priority_box, TRUE);
 #endif
+       gtk_widget_set_no_show_all (priv->calendar_box, TRUE);
+       gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
        gtk_widget_set_no_show_all (priv->attachments_box, TRUE);
        gtk_widget_show_all (priv->mail_header_view);
        gtk_widget_set_no_show_all (priv->attachments_box, FALSE);
 #ifdef MODEST_TOOLKIT_HILDON2
        gtk_widget_set_no_show_all (priv->priority_box, FALSE);
 #endif
+       gtk_widget_set_no_show_all (priv->calendar_box, FALSE);
+       gtk_widget_set_no_show_all (priv->calendar_actions_container, FALSE);
        gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
 
        html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
@@ -1994,6 +2023,8 @@ set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
 #ifdef MODEST_TOOLKIT_HILDON2
        gtk_widget_hide_all (priv->priority_box);
 #endif
+       gtk_widget_hide_all (priv->calendar_box);
+       gtk_widget_hide_all (priv->calendar_actions_container);
        gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
        tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
        priv->idle_changes_count = 0;
@@ -2754,3 +2785,42 @@ modest_gtkhtml_msg_view_has_blocked_external_images_default (ModestMsgView *self
 {
        return has_blocked_external_images (MODEST_GTKHTML_MSG_VIEW (self));
 }
+
+static void
+set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg)
+{
+       ModestGtkhtmlMsgViewPrivate *priv;
+       TnyMimePart *calendar_part;
+
+       g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
+       priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+
+       if (priv->calendar_actions_box) {
+               gtk_widget_destroy (priv->calendar_actions_box);
+               priv->calendar_actions_box = NULL;
+       }
+
+       calendar_part = modest_tny_msg_find_calendar (TNY_MSG (msg));
+
+       if (calendar_part) {
+               gboolean retval = FALSE;
+               priv->calendar_actions_box = gtk_vbox_new (FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (priv->calendar_actions_container), priv->calendar_actions_box, FALSE, FALSE, 0);
+               g_signal_emit_by_name (G_OBJECT (self), "handle-calendar", calendar_part, priv->calendar_actions_box, &retval);
+               if (retval) {
+                       gtk_widget_show_all (priv->calendar_actions_container);
+                       gtk_widget_show (priv->calendar_actions_box);
+               } else {
+                       gtk_widget_hide_all (priv->calendar_actions_container);
+                       gtk_widget_hide (priv->calendar_actions_box);
+               }
+               gtk_widget_show_all  (priv->calendar_box);
+               g_object_unref (calendar_part);
+       } else {
+               gtk_widget_hide_all (priv->calendar_box);
+               gtk_widget_hide_all (priv->calendar_actions_container);
+               gtk_widget_hide (priv->calendar_actions_box);
+       }
+       
+
+}