X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.c;h=69b0ef57878151941c6314d7f8b81c78881a80ab;hp=83e221b16341bd19a37753e8dd8ce5ed1fb44a3d;hb=f6d386ff93e929092ba105385a29d760aeba9ff7;hpb=11a7e8bd60ce134adc068ecedefd64faa1dd7ddf diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c index 83e221b..69b0ef5 100644 --- a/src/widgets/modest-global-settings-dialog.c +++ b/src/widgets/modest-global-settings-dialog.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "widgets/modest-global-settings-dialog.h" #include "widgets/modest-global-settings-dialog-priv.h" #include "modest-defs.h" @@ -41,12 +42,12 @@ #include "modest-tny-msg.h" #include "modest-platform.h" #include "widgets/modest-combo-box.h" -#ifdef MODEST_PLATFORM_MAEMO -#ifdef MODEST_HILDON_VERSION_0 +#ifndef MODEST_TOOLKIT_GTK +#if MODEST_HILDON_API == 0 #include #else #include -#endif /*MODEST_HILDON_VERSION_0*/ +#endif /*MODEST_HILDON_API = 0*/ #endif /* include other impl specific header files */ @@ -124,12 +125,7 @@ modest_global_settings_dialog_init (ModestGlobalSettingsDialog *self) priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self); priv->notebook = gtk_notebook_new (); - priv->changed = FALSE; - /* Add the buttons: */ - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK); - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - /* Connect to the dialog's response signal: */ g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self); @@ -166,17 +162,23 @@ add_to_modest_pair_list (const gint num, const gchar *str, GSList **list) *list = g_slist_prepend (*list, pair); } -/* - * Gets a list of pairs - */ ModestPairList * _modest_global_settings_dialog_get_connected_via (void) { GSList *list = NULL; + const gchar *message; - add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, - _("mcen_va_options_connectiontype_wlan"), - &list); +#ifndef MODEST_TOOLKIT_GTK + const gchar *env_var = getenv ("OSSO_PRODUCT_HARDWARE"); + /* Check if WIMAX is available */ + if (env_var && !strncmp (env_var, "RX-48", 5)) + message = _("mcen_va_options_connectiontype_wlan_wimax"); + else + message = _("mcen_va_options_connectiontype_wlan"); +#else + message = _("mcen_va_options_connectiontype_wlan"); +#endif + add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, message, &list); add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, _("mcen_va_options_connectiontype_all"), &list); @@ -259,7 +261,7 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self) if (error) { g_error_free (error); error = NULL; - combo_id = MODEST_CONNECTED_VIA_WLAN; + combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; } modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), (gpointer) &combo_id); @@ -288,7 +290,7 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self) } /* It's better to do this in the subclasses, but it's just one line, so we'll leave it here for the moment */ -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (priv->size_limit), value); #else gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_limit), value); @@ -316,20 +318,6 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self) modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->msg_format), (gpointer) &combo_id); priv->initial_state.prefer_formatted_text = checked; - - /* Include reply */ - value = modest_conf_get_int (conf, MODEST_CONF_REPLY_TYPE, &error); - if (error) { - g_error_free (error); - error = NULL; - value = MODEST_TNY_MSG_REPLY_TYPE_QUOTE; - } - if (value == MODEST_TNY_MSG_REPLY_TYPE_QUOTE) - checked = TRUE; - else - checked = FALSE; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->include_reply), checked); - priv->initial_state.include_reply = checked; } static void @@ -342,7 +330,7 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv, state->auto_update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auto_update)); id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->connect_via)); state->connect_via = *id; -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit)); #else state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit)); @@ -352,7 +340,6 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv, state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound)); id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format)); state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE; - state->include_reply = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->include_reply)); } gboolean @@ -382,10 +369,6 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self) RETURN_FALSE_ON_ERROR(error); modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, current_state.prefer_formatted_text, NULL); RETURN_FALSE_ON_ERROR(error); - modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, - (current_state.include_reply) ? MODEST_TNY_MSG_REPLY_TYPE_QUOTE : - MODEST_TNY_MSG_REPLY_TYPE_CITE, NULL); - RETURN_FALSE_ON_ERROR(error); /* Apply changes */ if (priv->initial_state.auto_update != current_state.auto_update || @@ -425,7 +408,7 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self) /* Disable autoupdate in offline mode */ modest_platform_set_update_interval (0); } - g_object_unref (device); + g_object_unref (device); } exit: @@ -441,8 +424,7 @@ settings_changed (ModestGlobalSettingsState initial_state, initial_state.update_interval != current_state.update_interval || initial_state.size_limit != current_state.size_limit || initial_state.play_sound != current_state.play_sound || - initial_state.prefer_formatted_text != current_state.prefer_formatted_text || - initial_state.include_reply != current_state.include_reply) + initial_state.prefer_formatted_text != current_state.prefer_formatted_text) return TRUE; else return FALSE; @@ -468,11 +450,11 @@ on_response (GtkDialog *dialog, saved = _modest_global_settings_dialog_save_conf (MODEST_GLOBAL_SETTINGS_DIALOG (dialog)); if (saved) { - modest_platform_run_information_dialog (GTK_WINDOW (user_data), - _("mcen_ib_advsetup_settings_saved")); + modest_platform_information_banner (NULL, NULL, + _("mcen_ib_advsetup_settings_saved")); } else { - modest_platform_run_information_dialog (GTK_WINDOW (user_data), - _("mail_ib_setting_failed")); + modest_platform_information_banner (NULL, NULL, + _("mail_ib_setting_failed")); } } } else { @@ -482,7 +464,7 @@ on_response (GtkDialog *dialog, _("imum_nc_wizard_confirm_lose_changes")); /* Do not close if the user Cancels */ if (response == GTK_RESPONSE_CANCEL) - g_signal_stop_emission_by_name (dialog, "response"); + g_signal_stop_emission_by_name (user_data, "response"); } } }