From f79c54cc84510e27b99e5e9082af8e77d6b7bb49 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 2 May 2007 12:00:37 +0000 Subject: [PATCH] * Replaced two confusing function names * Replaced all the widget names used by the memory by their correspondent defines pmo-trunk-r1729 --- src/gnome/modest-main-window.c | 24 ++++++++++++++---------- src/gnome/modest-msg-view-window.c | 6 ++++-- src/maemo/modest-main-window.c | 18 ++++++++++-------- src/maemo/modest-msg-edit-window.c | 4 ++-- src/maemo/modest-msg-view-window.c | 7 +++++-- src/modest-defs.h | 8 ++++++++ src/modest-ui-actions.c | 8 ++++---- src/modest-widget-memory.c | 8 ++++---- src/widgets/modest-folder-view.c | 10 +++++----- src/widgets/modest-folder-view.h | 10 +++++----- 10 files changed, 61 insertions(+), 42 deletions(-) diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c index 59cfd67..0b15ec5 100644 --- a/src/gnome/modest-main-window.c +++ b/src/gnome/modest-main-window.c @@ -273,13 +273,15 @@ restore_sizes (ModestMainWindow *self) conf = modest_runtime_get_conf (); modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned), - "modest-folder-paned"); + MODEST_CONF_FOLDER_PANED_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned), - "modest-msg-paned"); + MODEST_CONF_MSG_PANED_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); - modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),"header-view"); - modest_widget_memory_restore (conf,G_OBJECT(self), "modest-main-window"); + MODEST_CONF_MAIN_PANED_KEY); + modest_widget_memory_restore (conf, G_OBJECT(priv->header_view), + MODEST_CONF_HEADER_VIEW_KEY); + modest_widget_memory_restore (conf, G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_KEY); } @@ -295,14 +297,16 @@ save_sizes (ModestMainWindow *self) conf = modest_runtime_get_conf (); - modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window"); modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned), - "modest-folder-paned"); + MODEST_CONF_FOLDER_PANED_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned), - "modest-msg-paned"); + MODEST_CONF_MSG_PANED_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); - modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view"); + MODEST_CONF_MAIN_PANED_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->header_view), + MODEST_CONF_HEADER_VIEW_KEY); + modest_widget_memory_save (conf, G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_KEY); } diff --git a/src/gnome/modest-msg-view-window.c b/src/gnome/modest-msg-view-window.c index 73593e7..5ccd731 100644 --- a/src/gnome/modest-msg-view-window.c +++ b/src/gnome/modest-msg-view-window.c @@ -149,7 +149,8 @@ static void save_settings (ModestMsgViewWindow *self) { modest_widget_memory_save (modest_runtime_get_conf (), - G_OBJECT(self), "modest-msg-view-window"); + G_OBJECT(self), + MODEST_CONF_MSG_VIEW_WINDOW_KEY); } @@ -157,7 +158,8 @@ static void restore_settings (ModestMsgViewWindow *self) { modest_widget_memory_restore (modest_runtime_get_conf (), - G_OBJECT(self), "modest-msg-view-window"); + G_OBJECT(self), + MODEST_CONF_MSG_VIEW_WINDOW_KEY); } diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 5614da4..be256e1 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -32,7 +32,7 @@ #include #include #include "modest-hildon-includes.h" - +#include "modest-defs.h" #include #include "widgets/modest-main-window.h" @@ -273,11 +273,11 @@ restore_sizes (ModestMainWindow *self) conf = modest_runtime_get_conf (); modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); + MODEST_CONF_MAIN_PANED_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->header_view), - "header-view"); + MODEST_CONF_HEADER_VIEW_KEY); modest_widget_memory_restore (conf, G_OBJECT(self), - "modest-main-window"); + MODEST_CONF_MAIN_WINDOW_KEY); } @@ -290,10 +290,12 @@ save_sizes (ModestMainWindow *self) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); conf = modest_runtime_get_conf (); - modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window"); - modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); - modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view"); + modest_widget_memory_save (conf,G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->header_view), + MODEST_CONF_HEADER_VIEW_KEY); } static void diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 3d90a53..ff31676 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -241,7 +241,7 @@ static void save_settings (ModestMsgEditWindow *self) { modest_widget_memory_save (modest_runtime_get_conf(), - G_OBJECT(self), "modest-edit-msg-window"); + G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY); } @@ -249,7 +249,7 @@ static void restore_settings (ModestMsgEditWindow *self) { modest_widget_memory_restore (modest_runtime_get_conf(), - G_OBJECT(self), "modest-edit-msg-window"); + G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY); } diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index bc0dd5b..c146d49 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -40,6 +40,7 @@ #include #include #include +#include "modest-defs.h" #include "modest-hildon-includes.h" #include #include @@ -183,7 +184,8 @@ static void save_settings (ModestMsgViewWindow *self) { modest_widget_memory_save (modest_runtime_get_conf (), - G_OBJECT(self), "modest-msg-view-window"); + G_OBJECT(self), + MODEST_CONF_MSG_VIEW_WINDOW_KEY); } @@ -191,7 +193,8 @@ static void restore_settings (ModestMsgViewWindow *self) { modest_widget_memory_restore (modest_runtime_get_conf (), - G_OBJECT(self), "modest-msg-view-window"); + G_OBJECT(self), + MODEST_CONF_MSG_VIEW_WINDOW_KEY); } diff --git a/src/modest-defs.h b/src/modest-defs.h index f0da7d9..77acaf2 100644 --- a/src/modest-defs.h +++ b/src/modest-defs.h @@ -83,6 +83,14 @@ /* place for widget settings */ #define MODEST_CONF_WIDGET_NAMESPACE MODEST_CONF_NAMESPACE "/widgets" +#define MODEST_CONF_FOLDER_VIEW_KEY "folder-view" +#define MODEST_CONF_HEADER_VIEW_KEY "header-view" +#define MODEST_CONF_MAIN_PANED_KEY "modest-main-paned" +#define MODEST_CONF_MSG_PANED_KEY "modest-msg-paned" +#define MODEST_CONF_FOLDER_PANED_KEY "modest-folder-paned" +#define MODEST_CONF_MAIN_WINDOW_KEY "modest-main-window" +#define MODEST_CONF_EDIT_WINDOW_KEY "modest-edit-msg-window" +#define MODEST_CONF_MSG_VIEW_WINDOW_KEY "modest-msg-view-window" #define MODEST_SERVER_ACCOUNT_NAMESPACE MODEST_CONF_NAMESPACE "/" "server_accounts" diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 0be3a21..748ceb2 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -834,7 +834,7 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow * /* what is saved/restored is depending on the style; thus; we save with * old style, then update the style, and restore for this new style */ - modest_widget_memory_save (conf, G_OBJECT(header_view), "header-view"); + modest_widget_memory_save (conf, G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY); if (modest_header_view_get_style (MODEST_HEADER_VIEW(header_view)) == MODEST_HEADER_VIEW_STYLE_DETAILS) @@ -845,7 +845,7 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow * MODEST_HEADER_VIEW_STYLE_DETAILS); modest_widget_memory_restore (conf, G_OBJECT(header_view), - "header-view"); + MODEST_CONF_HEADER_VIEW_KEY); } @@ -1058,9 +1058,9 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), TNY_FOLDER (folder_store)); modest_widget_memory_restore (conf, G_OBJECT(header_view), - "header-view"); + MODEST_CONF_HEADER_VIEW_KEY); } else { - modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view"); + modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL); } } else if (TNY_IS_ACCOUNT (folder_store)) { diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 5fe3735..c1d6ed7 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -397,7 +397,7 @@ save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, /* Restore the visible account */ key = _modest_widget_memory_get_keyname (name, "visible_server_account_id"); - account_id = modest_folder_view_get_visible_server_account_id (folder_view); + 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); @@ -418,8 +418,8 @@ restore_settings_folder_view (ModestConf *conf, if (modest_conf_key_exists (conf, key, NULL)) { account_id = modest_conf_get_string (conf, key, NULL); - modest_folder_view_set_visible_server_account_id (folder_view, - (const gchar *) account_id); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, + (const gchar *) account_id); g_free (account_id); } else { ModestAccountMgr *mgr; @@ -438,7 +438,7 @@ restore_settings_folder_view (ModestConf *conf, server_acc_id = (const gchar *) acc_data->store_account->account_name; modest_conf_set_string (conf, key, server_acc_id, NULL); - modest_folder_view_set_visible_server_account_id (folder_view, server_acc_id); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); g_free (default_acc); } diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index ab63d85..ffe17cc 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -467,7 +467,7 @@ modest_folder_view_init (ModestFolderView *obj) setup_drag_and_drop (GTK_TREE_VIEW(obj)); /* Restore conf */ - modest_widget_memory_restore (conf, G_OBJECT (obj), "folder-view"); + modest_widget_memory_restore (conf, G_OBJECT (obj), MODEST_CONF_FOLDER_VIEW_KEY); /* Connect signals */ g_signal_connect (G_OBJECT (obj), @@ -1439,8 +1439,8 @@ modest_folder_view_set_style (ModestFolderView *self, } void -modest_folder_view_set_visible_server_account_id (ModestFolderView *self, - const gchar *account_id) +modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self, + const gchar *account_id) { ModestFolderViewPrivate *priv; ModestConf *conf; @@ -1455,11 +1455,11 @@ modest_folder_view_set_visible_server_account_id (ModestFolderView *self, /* Save preferences */ conf = modest_runtime_get_conf (); - modest_widget_memory_save (conf, G_OBJECT (self), "folder-view"); + modest_widget_memory_save (conf, G_OBJECT (self), MODEST_CONF_FOLDER_VIEW_KEY); } const gchar * -modest_folder_view_get_visible_server_account_id (ModestFolderView *self) +modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self) { ModestFolderViewPrivate *priv; diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h index d275837..e8845ef 100644 --- a/src/widgets/modest-folder-view.h +++ b/src/widgets/modest-folder-view.h @@ -160,7 +160,7 @@ void modest_folder_view_set_style (ModestFolderView *self, ModestFolderViewStyle style); /** - * modest_folder_view_set_visible_server_account_id: + * modest_folder_view_set_account_id_of_visible_server_account: * @self: a #ModestFolderView * @account_id: the remote server account id * @@ -169,18 +169,18 @@ void modest_folder_view_set_style (ModestFolderView *self, * specified id will be the unique visible account if the folder view * is configured in MODEST_FOLDER_VIEW_STYLE_SHOW_ONE **/ -void modest_folder_view_set_visible_server_account_id (ModestFolderView *self, - const gchar *account_id); +void modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self, + const gchar *account_id); /** - * modest_folder_view_get_visible_server_account_id: + * modest_folder_view_get_account_id_of_visible_server_account: * @self: a #ModestFolderView * * gets the account id of the currently visible server account id * * Return value: the visible server account id or NULL if none set **/ -const gchar* modest_folder_view_get_visible_server_account_id (ModestFolderView *self); +const gchar* modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self); G_END_DECLS -- 1.7.9.5