X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=4526b4eac136c7f19dba3b658a6930113406c2c3;hb=976890fe4126e453fc2b1812eb167d41b036dfbb;hp=4c1a25ec6970115031997e7fcd90954856e767ee;hpb=c3520ff3e8c3967c72830efdca10046657e0faa3;p=modest diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 4c1a25e..4526b4e 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include "widgets/modest-main-window.h" #include gchar* @@ -118,7 +118,7 @@ save_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name) static gboolean restore_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name) { - GtkRequisition req; + GtkRequisition req = {0, 0}; gchar *key; key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT); @@ -158,15 +158,6 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) modest_conf_set_int (conf, key, width, NULL); g_free (key); - /* Save also the main window style */ - if (MODEST_IS_MAIN_WINDOW (win)) { - ModestMainWindowStyle style = modest_main_window_get_style (MODEST_MAIN_WINDOW (win)); - - key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE); - modest_conf_set_int (conf, key, style, NULL); - g_free (key); - } - return TRUE; } @@ -194,22 +185,11 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) gtk_window_set_default_size() makes "drag-motion" signal report bad coordinates, so drag-and-drop do not work properly */ -#ifdef MODEST_PLATFORM_GNOME +#ifdef MODEST_TOOLKIT_GTK if (height && width) gtk_window_set_default_size (win, width, height); #endif - /* Restore also the main window style */ - if (MODEST_IS_MAIN_WINDOW (win)) { - ModestMainWindowStyle style; - - key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE); - if (modest_conf_key_exists (conf, key, NULL)) { - style = (ModestMainWindowStyle) modest_conf_get_int (conf, key, NULL); - modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style); - g_free (key); - } - } return TRUE; } @@ -219,15 +199,17 @@ static gboolean save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) { gchar *key; - int pos; + gint pos; + gdouble percent; /* Don't save the paned position if it's not visible, * because it could not be correct: */ - if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) { + if (GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) { pos = gtk_paned_get_position (paned); - + percent = (gdouble) (pos * 100) / (gdouble) GTK_WIDGET (paned)->allocation.width; + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); - modest_conf_set_int (conf, key, pos, NULL); + modest_conf_set_float (conf, key, percent, NULL); g_free (key); } @@ -239,26 +221,15 @@ static gboolean restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) { gchar *key; - int pos; + gdouble percent; + gint pos; - key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + percent = modest_conf_get_float (conf, key, NULL); - if (modest_conf_key_exists (conf, key, NULL)) { - pos = modest_conf_get_int (conf, key, NULL); - - /* TODO: Remove this hack so that paned positions can really be used. - * The paned position is incorrectly saved somehow before its even visible, - * when we show the main window only some time after creating it, - * so this prevents a wrong value from being used. */ - const gint max = (GTK_WIDGET(paned)->allocation.width)/3; - if (pos > max) - pos = max; - - + if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) { + pos = GTK_WIDGET (paned)->allocation.width * percent /100; gtk_paned_set_position (paned, pos); - } else { - /* The initial position must follow the 30/70 rule */ - gtk_paned_set_position (paned, GTK_WIDGET(paned)->requisition.width/3); } g_free (key); @@ -290,6 +261,9 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, } type = modest_tny_folder_guess_folder_type (folder); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + style = modest_header_view_get_style (header_view); key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, @@ -371,13 +345,16 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, TnyFolderType type; ModestHeaderViewStyle style; gint sort_flag_id = 0; - gint sort_colid = -1, sort_type; + gint sort_colid = -1, sort_type = GTK_SORT_DESCENDING; folder = modest_header_view_get_folder (header_view); if (!folder) return TRUE; /* no folder: no settings */ type = modest_tny_folder_guess_folder_type (folder); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + style = modest_header_view_get_style (header_view); key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, @@ -388,6 +365,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, if (modest_conf_key_exists (conf, sort_key, NULL)) { gchar *value = modest_conf_get_string (conf, sort_key, NULL); sscanf (value, "%d:%d:%d", &sort_colid, &sort_type, &sort_flag_id); + g_free (value); } if (modest_conf_key_exists (conf, key, NULL)) { @@ -396,7 +374,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, GList *cols = NULL; GList *colwidths = NULL; GList *colsortables = NULL; - GtkTreeModel *sortable; + GtkTreeModel *sortable, *filter; cursor = data = modest_conf_get_string (conf, key, NULL); while (cursor && sscanf (cursor, "%d:%d:%d ", &col, &width, &sort) == 3) { @@ -423,7 +401,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, if (cols) { GList *viewcolumns, *colcursor, *widthcursor; modest_header_view_set_columns (header_view, cols, type); - sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)); widthcursor = colwidths; colcursor = viewcolumns = gtk_tree_view_get_columns (GTK_TREE_VIEW(header_view)); @@ -452,16 +431,15 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, } if (sort_colid >= 0) { - GtkTreeModel *sortable = - gtk_tree_model_filter_get_model ( - GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))); + GtkTreeModel *filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + GtkTreeModel *sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) modest_header_view_sort_by_column_id (header_view, 0, sort_type); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable), sort_colid, sort_type); modest_header_view_sort_by_column_id (header_view, sort_colid, sort_type); - gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable)); + gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (sortable)); } g_free (key); @@ -478,19 +456,6 @@ static gboolean save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, const gchar *name) { - gchar *key; - const gchar* account_id; - - /* Save the visible account */ - key = _modest_widget_memory_get_keyname (name, "visible_server_account_id"); - - account_id = modest_folder_view_get_account_id_of_visible_server_account (folder_view); - if (account_id) - modest_conf_set_string (conf, key, account_id, NULL); - else - modest_conf_remove_key (conf, key, NULL); - g_free (key); - return TRUE; } @@ -499,32 +464,32 @@ restore_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, const gchar *name) { - /* Don't restore the visible account but always show the default account - * as specified in section 4.1 of the email UI specification */ ModestAccountMgr *mgr; gchar *default_acc; - /* If there is no visible account id in the - configuration then pick the default account as - visible account */ + /* Always show the default account as visible server account */ mgr = modest_runtime_get_account_mgr (); default_acc = modest_account_mgr_get_default_account (mgr); if (default_acc) { - ModestAccountData *acc_data; + ModestAccountSettings *settings; const gchar *server_acc_id; - gchar *key = NULL; - - acc_data = modest_account_mgr_get_account_data (mgr, (const gchar*) default_acc); - server_acc_id = (const gchar *) acc_data->store_account->account_name; - key = _modest_widget_memory_get_keyname (name, "visible_server_account_id"); - modest_conf_set_string (conf, key, server_acc_id, NULL); - modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); - - g_free (key); + settings = modest_account_mgr_load_account_settings (mgr, (const gchar*) default_acc); + /* If there was any problem with the settings storage + the settings could be NULL */ + if (settings) { + ModestServerAccountSettings *store_settings; + store_settings = modest_account_settings_get_store_settings (settings); + + if (store_settings) { + server_acc_id = modest_server_account_settings_get_account_name (store_settings); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); + g_object_unref (store_settings); + } + g_object_unref (settings); + } g_free (default_acc); } - return TRUE; }