Remove formatting tab in global settings of gnome port

diff --git a/src/gnome/modest-gnome-global-settings-dialog.c b/src/gnome/modest-gnome-global-settings-dialog.c
index 600999d..c4e88c1 100644 (file)
--- a/src/gnome/modest-gnome-global-settings-dialog.c
+++ b/src/gnome/modest-gnome-global-settings-dialog.c
@@ -34,7 +34,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkvbox.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkvbox.h>

-#include <gtk/gtknotebook.h>

 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkhseparator.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkhseparator.h>

@@ -128,15 +127,9 @@ modest_gnome_global_settings_dialog_init (ModestGnomeGlobalSettingsDialog *self)
        gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 
        ppriv->updating_page = create_updating_page (self);
        gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 
        ppriv->updating_page = create_updating_page (self);

-       ppriv->composing_page = create_composing_page (self);
+       ppriv->composing_page = NULL;

     
     

-       /* Add the notebook pages: */
-       gtk_notebook_append_page (GTK_NOTEBOOK (ppriv->notebook), ppriv->updating_page, 
-               gtk_label_new (_("mcen_ti_options_updating")));
-       gtk_notebook_append_page (GTK_NOTEBOOK (ppriv->notebook), ppriv->composing_page, 
-               gtk_label_new (_("mcen_ti_options_composing")));
-               
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->updating_page);

        gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (self)->vbox), 12);
        gtk_container_set_border_width (GTK_CONTAINER (self), 12);
        gtk_window_set_default_size (GTK_WINDOW (self), 480, -1);
        gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (self)->vbox), 12);
        gtk_container_set_border_width (GTK_CONTAINER (self), 12);
        gtk_window_set_default_size (GTK_WINDOW (self), 480, -1);

@@ -147,7 +140,7 @@ modest_gnome_global_settings_dialog_init (ModestGnomeGlobalSettingsDialog *self)
        gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
        gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
     
        gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
        gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
     

-       gtk_widget_show_all (ppriv->notebook);
+       gtk_widget_show_all (ppriv->updating_page);

 }
 
 static void
 }
 
 static void

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 77892e7..60a6787 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -294,9 +294,15 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
        state->play_sound = priv->initial_state.play_sound;
 #else
        state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound));
        state->play_sound = priv->initial_state.play_sound;
 #else
        state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound));

+#ifndef MODEST_TOOLKIT_GTK

        id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format));
 #endif
        id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format));
 #endif

+#endif
+#ifdef MODEST_TOOLKIT_GTK
+       state->prefer_formatted_text = FALSE;
+#else

        state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE;
        state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE;

+#endif

 }
 
 static gboolean
 }
 
 static gboolean