diff options
| author | Srinivasa Ragavan <sragavan@gnome.org> | 2012-02-16 18:57:40 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@gnome.org> | 2012-02-16 18:59:07 +0800 |
| commit | 02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e (patch) | |
| tree | 171b90bf2218012a02f71e2e066a7e90ac9413e7 /capplet/settings/mail-capplet-shell.c | |
| parent | b8cfd5f9a43d4fefd89731257f0d1ac3863de7df (diff) | |
| download | gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar.gz gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar.bz2 gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar.lz gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar.xz gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.tar.zst gsoc2013-evolution-02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e.zip | |
Make Capplet work again with new CamelSettings and other stuffs. Also add
EPlugin support to capplet so that exchange and other accoutns can be
configured via this. now.
Diffstat (limited to 'capplet/settings/mail-capplet-shell.c')
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 3d3e015e94..4053372a9d 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -174,10 +174,8 @@ mail_capplet_shell_quit (MailCappletShell *shell) { MailCappletShellPrivate *priv = shell->priv; - if (priv->main_loop) - gtk_main_quit (); - else - gtk_widget_destroy ((GtkWidget *) shell); + if (!priv->main_loop) + gtk_widget_hide ((GtkWidget *)shell); } static void @@ -186,13 +184,15 @@ ms_delete_event (MailCappletShell *shell, gpointer data G_GNUC_UNUSED) { mail_capplet_shell_quit (shell); + gtk_main_quit(); } static void ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED, MailCappletShell *shell) { - gtk_widget_destroy (GTK_WIDGET (shell)); + gtk_main_quit (); + g_timeout_add_seconds (5, (GSourceFunc) gtk_widget_destroy, shell); } #define PACK_IN_TOOL(wid,icon) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0); wid = (GtkWidget *)gtk_tool_button_new (tbox, NULL); } @@ -250,7 +250,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, eshell = g_initable_new ( E_TYPE_SHELL, NULL, &error, "application-id", "org.gnome.Evolution", - "flags", 0, + "flags", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE, "geometry", NULL, "module-directory", EVOLUTION_MODULEDIR, "meego-mode", FALSE, |