projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored modest_platform_on_new_headers_received().
[modest]
/
src
/
maemo
/
modest-main-window.c
diff --git
a/src/maemo/modest-main-window.c
b/src/maemo/modest-main-window.c
index
0e49e44
..
80abed1
100644
(file)
--- a/
src/maemo/modest-main-window.c
+++ b/
src/maemo/modest-main-window.c
@@
-214,6
+214,7
@@
struct _ModestMainWindowPrivate {
ModestMainWindowStyle style;
ModestMainWindowContentsStyle contents_style;
ModestMainWindowStyle style;
ModestMainWindowContentsStyle contents_style;
+ gboolean wait_for_settings;
guint progress_bar_timeout;
guint restore_paned_timeout;
guint progress_bar_timeout;
guint restore_paned_timeout;
@@
-345,6
+346,7
@@
modest_main_window_init (ModestMainWindow *obj)
priv->progress_bar = NULL;
priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
priv->progress_bar = NULL;
priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
+ priv->wait_for_settings = TRUE;
priv->contents_style = -1; /* invalid contents style. We need this to select it for the first time */
priv->merge_ids = NULL;
priv->optimized_view = FALSE;
priv->contents_style = -1; /* invalid contents style. We need this to select it for the first time */
priv->merge_ids = NULL;
priv->optimized_view = FALSE;
@@
-1081,7
+1083,9
@@
modest_main_window_on_show (GtkWidget *self, gpointer user_data)
modest_osso_load_state ();
/* Restore window & widget settings */
modest_osso_load_state ();
/* Restore window & widget settings */
+ priv->wait_for_settings = TRUE;
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
+ priv->wait_for_settings = FALSE;
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
@@
-1329,6
+1333,10
@@
modest_main_window_set_style (ModestMainWindow *self,
priv->style = style;
switch (style) {
case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
priv->style = style;
switch (style) {
case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
+
+ if (!priv->wait_for_settings)
+ modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT (priv->main_paned),
+ MODEST_CONF_MAIN_PANED_KEY);
/* Remove main paned */
g_object_ref (priv->main_paned);
gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
/* Remove main paned */
g_object_ref (priv->main_paned);
gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
@@
-1346,6
+1354,8
@@
modest_main_window_set_style (ModestMainWindow *self,
gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
+ g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self);
+
break;
default:
g_return_if_reached ();
break;
default:
g_return_if_reached ();
@@
-1913,7
+1923,7
@@
on_msg_count_changed (ModestHeaderView *header_view,
/* Play a sound (if configured) and make the LED blink */
if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
/* Play a sound (if configured) and make the LED blink */
if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
- modest_platform_on_new_headers_received (NULL, FALSE);
+ modest_platform_push_email_notification ();
}
}
}
}
@@
-2223,6
+2233,7
@@
get_toolbar_mode_from_mail_operation (ModestMainWindow *self,
/* Get toolbar mode from operation id*/
switch (modest_mail_operation_get_type_operation (mail_op)) {
/* Get toolbar mode from operation id*/
switch (modest_mail_operation_get_type_operation (mail_op)) {
+ case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_OPEN:
mode = TOOLBAR_MODE_TRANSFER;
case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_OPEN:
mode = TOOLBAR_MODE_TRANSFER;
@@
-2684,6
+2695,8
@@
modest_main_window_screen_is_on (ModestMainWindow *self)
{
ModestMainWindowPrivate *priv = NULL;
{
ModestMainWindowPrivate *priv = NULL;
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(self), FALSE);
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;