* Use osso_abook_aggregator_get_default to open the addressbook

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index e3e6b75..9f0c4c4 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -330,6 +330,7 @@ struct _ModestMsgEditWindowPrivate {
 
        GtkWidget   *brand_icon;
        GtkWidget   *brand_label;
+       GtkWidget   *brand_container;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -941,6 +942,7 @@ init_window (ModestMsgEditWindow *obj)
        priv->brand_icon = gtk_image_new ();
        gtk_misc_set_alignment (GTK_MISC (priv->brand_icon), 0.5, 0.5);
        priv->brand_label = gtk_label_new (NULL);
+       hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont");
        gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 0.0, 0.5);
        gtk_widget_set_no_show_all (priv->brand_icon, TRUE);
        gtk_widget_set_no_show_all (priv->brand_label, TRUE);
@@ -950,8 +952,14 @@ init_window (ModestMsgEditWindow *obj)
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0);
 
        branding_box = gtk_hbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       gtk_widget_show (branding_box);
+       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_icon, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, TRUE, TRUE, 0);
+
+       priv->brand_container = gtk_alignment_new (0.0, 0.5, 0.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (priv->brand_container), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+       gtk_container_add (GTK_CONTAINER (priv->brand_container), branding_box);
+       gtk_widget_set_no_show_all (priv->brand_container, TRUE);
 
 
        gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0);
@@ -960,7 +968,7 @@ init_window (ModestMsgEditWindow *obj)
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (priv->header_box), branding_box, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priv->header_box), priv->brand_container, FALSE, FALSE, 0);
        gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
        init_wp_text_view_style ();
@@ -1098,8 +1106,6 @@ modest_msg_edit_window_finalize (GObject *obj)
        g_free (priv->last_search);
        g_free (priv->references);
        g_free (priv->in_reply_to);
-       g_object_unref (priv->faces_model);
-       g_object_unref (priv->sizes_model);
        g_object_unref (priv->attachments);
        g_object_unref (priv->images);
 
@@ -2602,8 +2608,8 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {
-                               modest_platform_information_banner (NULL, NULL, 
-                                                                   _FM("sfil_ib_opening_not_allowed"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_error_attachment_size"));
                                g_free (filename);
                                return 0;
                        }
@@ -4012,6 +4018,7 @@ static void update_branding (ModestMsgEditWindow *self,
        ModestAccountMgr *mgr;
        const GdkPixbuf *new_icon = NULL;
        gchar *new_label = NULL;
+       gboolean show = FALSE;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
@@ -4021,6 +4028,7 @@ static void update_branding (ModestMsgEditWindow *self,
        if (new_icon) {
                gtk_image_set_from_pixbuf (GTK_IMAGE (priv->brand_icon), (GdkPixbuf *) new_icon);
                gtk_widget_show (priv->brand_icon);
+               show = TRUE;
        } else {
                gtk_widget_hide (priv->brand_icon);
        }
@@ -4028,9 +4036,15 @@ static void update_branding (ModestMsgEditWindow *self,
                gtk_label_set_text (GTK_LABEL (priv->brand_label), new_label);
                gtk_widget_show (priv->brand_label);
                g_free (new_label);
+               show = TRUE;
        } else {
                gtk_widget_hide (priv->brand_label);
        }
+
+       if (show)
+               gtk_widget_show (priv->brand_container);
+       else
+               gtk_widget_hide (priv->brand_container);
 }
 
 static void