* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <modest-defs.h>
#include <modest-widget-memory.h>
#include <modest-widget-memory-priv.h>
#include <modest-runtime.h>
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);
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
save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
{
gchar *key;
- int pos, percent;
+ 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 = pos * 100 / GTK_WIDGET (paned)->allocation.width;
+ 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, percent, NULL);
+ modest_conf_set_float (conf, key, percent, NULL);
g_free (key);
}
restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
{
gchar *key;
- int percent, pos;
+ gdouble percent;
+ gint pos;
key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
- percent = modest_conf_get_int (conf, key, NULL);
+ percent = modest_conf_get_float (conf, key, NULL);
- pos = GTK_WIDGET (paned)->allocation.width * percent /100;
- gtk_paned_set_position (paned, pos);
+ 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);
+ }
g_free (key);
return TRUE;
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)
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)) {
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;
- acc_data = modest_account_mgr_get_account_data (mgr, (const gchar*) default_acc);
- server_acc_id = (const gchar *) acc_data->store_account->account_name;
-
- modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
-
+ 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;