diff options
| author | Srinivasa Ragavan <sragavan@gnome.org> | 2012-02-16 22:17:24 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@gnome.org> | 2012-02-16 22:18:28 +0800 |
| commit | aeb3238ad0fc239a26a9b3708679bb677030063b (patch) | |
| tree | b2c761e912b983bb1e83693bb66f89c713e734e8 | |
| parent | 21bc1419b3bb50b0c4d03afb136905c3fe32ed60 (diff) | |
| download | gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar.gz gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar.bz2 gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar.lz gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar.xz gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.tar.zst gsoc2013-evolution-aeb3238ad0fc239a26a9b3708679bb677030063b.zip | |
Fix a crash in capplet.
| -rw-r--r-- | capplet/anjal-settings-main.c | 35 | ||||
| -rw-r--r-- | capplet/settings/.mail-account-view.c.swp | bin | 73728 -> 0 bytes | |||
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 8 |
3 files changed, 5 insertions, 38 deletions
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 2fb5b448dd..081424e3dd 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -99,44 +99,11 @@ categories_icon_theme_hack (void) static EShell * create_default_shell (void) { - EShell *shell; - const gchar *key; - gboolean is_meego = FALSE, small_screen = FALSE; - gboolean express_mode = TRUE; - GSettings *settings; - GError *error = NULL; - GApplicationFlags flags; - - settings = g_settings_new ("org.gnome.evolution.shell"); - main_window = mail_capplet_shell_new (socket_id, FALSE, TRUE); if (!socket_id) gtk_widget_show (main_window); - if (!express_mode) - express_mode = g_settings_get_boolean (settings, "express-mode"); - - if (express_mode) - e_shell_detect_meego (&is_meego, &small_screen); - - flags = G_APPLICATION_HANDLES_OPEN | - G_APPLICATION_HANDLES_COMMAND_LINE; - - shell = g_initable_new ( - E_TYPE_SHELL, NULL, &error, - "application-id", "org.gnome.EvolutionSettings", - "flags", flags, - "geometry", "", - "module-directory", EVOLUTION_MODULEDIR, - "meego-mode", is_meego, - "express-mode", express_mode, - "small-screen-mode", small_screen, - "online", TRUE, - NULL); - - g_object_unref (settings); - - return shell; + return e_shell_get_default(); } gint diff --git a/capplet/settings/.mail-account-view.c.swp b/capplet/settings/.mail-account-view.c.swp Binary files differdeleted file mode 100644 index 04395e1fc5..0000000000 --- a/capplet/settings/.mail-account-view.c.swp +++ /dev/null diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 4053372a9d..c80c36e038 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -253,10 +253,10 @@ mail_capplet_shell_construct (MailCappletShell *shell, "flags", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE, "geometry", NULL, "module-directory", EVOLUTION_MODULEDIR, - "meego-mode", FALSE, - "express-mode", FALSE, - "small-screen-mode", FALSE, - "online", FALSE, + "meego-mode", TRUE, + "express-mode", TRUE, + "small-screen-mode", TRUE, + "online", TRUE, NULL); if (error != NULL) |