[evolution] Fix a crash in capplet.
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Fix a crash in capplet.
- Date: Thu, 16 Feb 2012 14:22:20 +0000 (UTC)
commit aeb3238ad0fc239a26a9b3708679bb677030063b
Author: Srinivasa Ragavan <sragavan gnome org>
Date: Thu Feb 16 14:17:24 2012 +0000
Fix a crash in capplet.
capplet/anjal-settings-main.c | 35 +----------------------------
capplet/settings/.mail-account-view.c.swp | Bin 73728 -> 0 bytes
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 2fb5b44..081424e 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-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 4053372..c80c36e 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]