diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 04:37:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 04:37:00 +0800 |
| commit | 5350eebb5ef8c07e69110616ce1662e0e92bea16 (patch) | |
| tree | d1d822ed1af3c92168b04780cfb6ac48a18b5996 /shell/main.c | |
| parent | 52d683e48cf1103a9806da95c72abce2db3ae1f4 (diff) | |
| download | gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.gz gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.bz2 gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.lz gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.xz gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.zst gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.zip | |
Progress update:
- Merge ETaskBar into EShellTaskbar.
- Remember the last view, and make --component work.
svn path=/branches/kill-bonobo/; revision=36278
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/shell/main.c b/shell/main.c index 9f729a7bf9..1ed06c611a 100644 --- a/shell/main.c +++ b/shell/main.c @@ -34,7 +34,6 @@ #include "e-util/e-bconf-map.h" #include <e-util/e-icon-factory.h> -#include "e-shell-constants.h" #include "e-shell-registry.h" #include "e-util/e-profile-event.h" #include "e-util/e-util.h" @@ -99,7 +98,7 @@ static gboolean disable_preview = FALSE; static gboolean idle_cb (gchar **uris); static EShell *global_shell; -static char *default_component_id = NULL; +static char *requested_view = NULL; static char *evolution_debug_log = NULL; static gchar **remaining_args; @@ -281,21 +280,35 @@ open_uris (gchar **uris) static gboolean idle_cb (gchar **uris) { + GtkWidget *shell_window; + const gchar *initial_view; + g_return_val_if_fail (uris == NULL || g_strv_length (uris) > 0, FALSE); #ifdef KILL_PROCESS_CMD kill_old_dataserver (); #endif - if (uris != NULL) + if (uris != NULL) { open_uris (uris); - else { - GtkWidget *shell_window; + return FALSE; + } + + initial_view = e_shell_registry_get_canonical_name (requested_view); - shell_window = e_shell_create_window (global_shell); - /* XXX Switch to default_component_id. */ + if (initial_view != NULL) { + GConfClient *client; + const gchar *key; + + client = gconf_client_get_default (); + key = "/apps/evolution/shell/view_defaults/component_id"; + requested_view = gconf_client_set_string ( + client, key, initial_view, NULL); + g_object_unref (client); } + shell_window = e_shell_create_window (global_shell); + #if 0 /* MBARNES */ if (shell == NULL) { /*there is another instance but because we don't open any windows @@ -366,7 +379,7 @@ setup_segv_redirect (void) #endif static const GOptionEntry options[] = { - { "component", 'c', 0, G_OPTION_ARG_STRING, &default_component_id, + { "component", 'c', 0, G_OPTION_ARG_STRING, &requested_view, N_("Start Evolution activating the specified component"), NULL }, { "offline", '\0', 0, G_OPTION_ARG_NONE, &start_offline, N_("Start in offline mode"), NULL }, |