X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fgnome%2Fmodest-gnome-global-settings-dialog.c;h=c4e88c130e91593d87176917082c0fb877d5d03b;hp=d6e2a31143d0170a03a84b9d2659396e9fd0efa2;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=7ca19ec4d309e66adcc5c04790b29d72f85e4800

diff --git a/src/gnome/modest-gnome-global-settings-dialog.c b/src/gnome/modest-gnome-global-settings-dialog.c
index d6e2a31..c4e88c1 100644
--- 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 <gtk/gtknotebook.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkhseparator.h>
@@ -42,6 +41,8 @@
 #include <gtk/gtkspinbutton.h>
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "widgets/modest-combo-box.h"
+#include "modest-runtime.h"
+#include "modest-defs.h"
 #include "gnome/modest-gnome-global-settings-dialog.h"
 #include "widgets/modest-ui-constants.h"
 
@@ -60,6 +61,7 @@ enum {
 	LAST_SIGNAL
 };
 
+static void modest_gnome_global_settings_dialog_load_settings (ModestGlobalSettingsDialog *self);
 static GtkWidget* create_updating_page  (ModestGnomeGlobalSettingsDialog *self);
 static GtkWidget* create_composing_page (ModestGnomeGlobalSettingsDialog *self);
 static ModestConnectedVia current_connection (void);
@@ -125,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);
-	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);
@@ -144,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_widget_show_all (ppriv->notebook);
+	gtk_widget_show_all (ppriv->updating_page);
 }
 
 static void