projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Perform the current folder refresh in an idle. This will avoid cancelations in the...
[modest]
/
src
/
widgets
/
modest-global-settings-dialog.c
diff --git
a/src/widgets/modest-global-settings-dialog.c
b/src/widgets/modest-global-settings-dialog.c
index
61400f8
..
2adbe1b
100644
(file)
--- a/
src/widgets/modest-global-settings-dialog.c
+++ b/
src/widgets/modest-global-settings-dialog.c
@@
-274,7
+274,9
@@
get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
#endif
state->connect_via = *id;
#ifndef MODEST_TOOLKIT_GTK
#endif
state->connect_via = *id;
#ifndef MODEST_TOOLKIT_GTK
+#ifndef MODEST_TOOLKIT_HILDON2
state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
+#endif
#else
state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit));
#endif
#else
state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit));
#endif
@@
-290,16
+292,22
@@
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
modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog *self)
{
ModestConf *conf;
}
static gboolean
modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog *self)
{
ModestConf *conf;
- ModestGlobalSettingsState current_state;
+ ModestGlobalSettingsState current_state = {0,};
GError *error = NULL;
ModestGlobalSettingsDialogPrivate *priv;
GError *error = NULL;
ModestGlobalSettingsDialogPrivate *priv;
@@
-415,8
+423,8
@@
on_response (GtkDialog *dialog,
gpointer user_data)
{
ModestGlobalSettingsDialogPrivate *priv;
gpointer user_data)
{
ModestGlobalSettingsDialogPrivate *priv;
- ModestGlobalSettingsState current_state;
- gboolean changed;
+ ModestGlobalSettingsState current_state = {0,};
+ gboolean changed = FALSE;
priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);