Fixes NB#108253, fixes a G_CRITICAL

[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 f68366a..544bfcb 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -1347,6 +1347,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        GtkWidget *sizes_menu;
        GtkWidget *fonts_menu;
        gchar *markup;
+       GtkWidget *arrow;
+       GtkWidget *hbox;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
@@ -1383,9 +1385,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
                              size_text, "</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+       gtk_misc_set_alignment (GTK_MISC (priv->size_tool_button_label), 1.0, 0.5);
        g_free (markup);
        hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont");
-       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->size_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        sizes_menu = gtk_menu_new ();
        priv->sizes_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) {
@@ -1414,9 +1423,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        priv->font_tool_button_label = gtk_label_new (NULL);
        markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+       gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5);
        g_free(markup);
        hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont");
-       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        fonts_menu = gtk_menu_new ();
        priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (font_index = 0; font_index < wp_get_font_count (); font_index++) {
@@ -1784,9 +1800,11 @@ modest_msg_edit_window_get_format_state (ModestMsgEditWindow *self)
 {
        ModestMsgEditFormatState *format_state = NULL;
        ModestMsgEditWindowPrivate *priv;
-       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
+       WPTextBufferFormat *buffer_format;
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self), NULL);
+
+       buffer_format = g_new0 (WPTextBufferFormat, 1);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, TRUE);
@@ -2564,6 +2582,7 @@ font_size_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_size"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_index;
@@ -2619,6 +2638,7 @@ font_face_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_face"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_font_index;