* Removed invalid conic include

[modest] / src / maemo / modest-maemo-global-settings-dialog.c

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index 4d6286f..3d192ea 100644 (file)
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -31,10 +31,6 @@
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
-#ifdef MODEST_HAVE_CONIC
-#include <coniciap.h>
-#endif /*MODEST_HAVE_CONIC*/
-
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
 
@@ -52,7 +48,6 @@
 #include "maemo/modest-maemo-global-settings-dialog.h"
 #include "widgets/modest-ui-constants.h"
 #include <tny-account-store.h>
-#include <tny-maemo-conic-device.h>
 
 
 #define MSG_SIZE_MAX_VAL 5000
@@ -217,7 +212,11 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 
        ppriv->updating_page = create_updating_page (self);
        ppriv->composing_page = create_composing_page (self);
-    
+
+       /* Add the buttons: */
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+
        /* Set the default focusable widgets */
        g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,
                           (gpointer)ppriv->auto_update);
@@ -510,7 +509,7 @@ on_inner_tabs_key_pressed (GtkWidget *widget,
 
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
 
-       if (widget == user_data) {
+       if (widget == ppriv->notebook) {
                if (event->keyval == GDK_Right) {
                        gtk_notebook_next_page (GTK_NOTEBOOK (ppriv->notebook));
                        retval = TRUE;