aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/e-shell-migrate.c7
-rw-r--r--shell/e-shell-window-private.c5
-rw-r--r--shell/main.c5
3 files changed, 7 insertions, 10 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index e694ec29fd..1931011516 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -900,6 +900,7 @@ e_shell_migrate_attempt (EShell *shell)
{
ESEvent *ese;
GSettings *settings;
+ GConfClient *client;
const gchar *key;
gint major, minor, micro;
gint last_major, last_minor, last_micro;
@@ -935,10 +936,12 @@ e_shell_migrate_attempt (EShell *shell)
/* The 2.32.x (except of 2.32.2) lefts duplicate On This Computer/Personal sources,
* thus clean the mess up */
+ client = gconf_client_get_default ();
merge_duplicate_local_sources (client, "/apps/evolution/addressbook/sources");
merge_duplicate_local_sources (client, "/apps/evolution/calendar/sources");
merge_duplicate_local_sources (client, "/apps/evolution/tasks/sources");
merge_duplicate_local_sources (client, "/apps/evolution/memos/sources");
+ g_object_unref (client);
/* Record a successful migration. */
string = g_strdup_printf (
@@ -949,7 +952,7 @@ e_shell_migrate_attempt (EShell *shell)
migrated = TRUE;
/* Try to retrieve the last migrated version from GSettings. */
- string = g_settings_get_string (client, "last-upgraded-version");
+ string = g_settings_get_string (settings, "last-upgraded-version");
if (migrated || string == NULL || sscanf (string, "%d.%d.%d",
&last_major, &last_minor, &last_micro) != 3) {
last_major = major;
@@ -960,7 +963,7 @@ e_shell_migrate_attempt (EShell *shell)
string = g_strdup_printf (
"%d.%d.%d", last_major, last_minor, last_micro);
- g_settings_set_string (client, "last-upgraded-version", string);
+ g_settings_set_string (settings, "last-upgraded-version", string);
g_free (string);
g_object_unref (settings);
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 2b3d159ada..cfee37ddbf 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -30,12 +30,10 @@ shell_window_save_switcher_style_cb (GtkRadioAction *action,
GtkRadioAction *current,
EShellWindow *shell_window)
{
- EShell *shell;
GSettings *settings;
GtkToolbarStyle style;
const gchar *string;
- shell = e_shell_window_get_shell (shell_window);
settings = g_settings_new ("org.gnome.evolution.shell");
style = gtk_radio_action_get_current_value (action);
@@ -66,13 +64,11 @@ shell_window_save_switcher_style_cb (GtkRadioAction *action,
static void
shell_window_init_switcher_style (EShellWindow *shell_window)
{
- EShell *shell;
GtkAction *action;
GSettings *settings;
GtkToolbarStyle style;
gchar *string;
- shell = e_shell_window_get_shell (shell_window);
settings = g_settings_new ("org.gnome.evolution.shell");
action = ACTION (SWITCHER_STYLE_ICONS);
@@ -256,7 +252,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
{
EShellWindowPrivate *priv = shell_window->priv;
EShell *shell;
- GSettings *settings;
GtkAction *action;
GtkAccelGroup *accel_group;
GtkUIManager *ui_manager;
diff --git a/shell/main.c b/shell/main.c
index 7dc285ade3..5e79c308f7 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -582,8 +582,6 @@ main (gint argc,
shell_force_shutdown ();
if (disable_preview) {
- const gchar *key;
-
settings = g_settings_new ("org.gnome.evolution.mail");
g_settings_set_boolean (settings, "safe-list", TRUE);
g_object_unref (settings);
@@ -633,7 +631,8 @@ main (gint argc,
if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER"))
g_settings_set_boolean (
- settings, "skip-warning-dialog");
+ settings, "skip-warning-dialog",
+ show_development_warning ());
g_object_unref (settings);
#endif