Change margins in gtk settings dialog.

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

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index bc8bb5b..f8dcb8b 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -363,7 +363,7 @@ modest_msg_edit_window_get_type (void)
 #ifdef MODEST_TOOLKIT_HILDON2
                                                  MODEST_TYPE_HILDON2_WINDOW,
 #else
-                                                 MODEST_TYPE_WINDOW,
+                                                 MODEST_TYPE_SHELL_WINDOW,
 #endif
                                                  "ModestMsgEditWindow",
                                                  &my_info, 0);
@@ -892,10 +892,6 @@ init_window (ModestMsgEditWindow *obj)
                g_clear_error (&error);
        }
 
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
        parent_priv->menubar = NULL;
 
        title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -1275,7 +1271,9 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                        if (pixbuf != NULL) {
                                priv->images_count ++;
                                priv->images_size += stream_size;
+#ifndef MODEST_HAVE_LIBWPEDITOR_PLUS
                                wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+#endif
                                g_object_unref (pixbuf);
                        }
                }
@@ -3887,14 +3885,14 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
                result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_COMPLETE);
        } else {
                GtkTextIter buffer_start;
                gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
                result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_NO_MATCHES);
        }
 
        /* Mark as selected the string found in search */
@@ -4196,6 +4194,7 @@ typedef struct _MessageSettingsHelper {
        GtkToggleButton *current_format;
 } MessageSettingsHelper;
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static void
 on_priority_toggle (GtkToggleButton *button, 
                    MessageSettingsHelper *helper)
@@ -4264,6 +4263,7 @@ on_format_toggle (GtkToggleButton *button,
        }
 
 }
+#endif
 
 static void
 modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
@@ -4292,7 +4292,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
 
        dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL,
                                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
+                                             _HL_DONE, GTK_RESPONSE_ACCEPT, NULL);
        vbox = gtk_vbox_new (FALSE, 0);
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
@@ -4415,6 +4415,7 @@ on_message_settings (GtkAction *action,
        modest_msg_edit_window_show_msg_settings_dialog (window);
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static void
 on_cc_button_toggled (GtkWidget *button,
                      ModestMsgEditWindow *window)
@@ -4434,8 +4435,9 @@ on_bcc_button_toggled (GtkWidget *button,
        modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
                                        modest_togglable_get_active (button));
 }
+#endif
 
-static void 
+static void
 setup_menu (ModestMsgEditWindow *self)
 {
        ModestMsgEditWindowPrivate *priv = NULL;