Get the EStorageSet from the shortcut's shell since there is no

* e-shortcuts-view-model.c (get_icon_for_item): Get the
EStorageSet from the shortcut's shell since there is no
e_shortcuts_get_storage_set() anymore.
* e-shortcuts-view.c (get_shortcut_info): Likewise.
(impl_shortcut_drag_motion): Likewise.
(impl_shortcut_drag_data_received): Likewise.

* e-shell.c (e_shell_construct): e_shortcuts_new_from_file(), not
e_shortcuts_new() here.

* e-shortcuts.c: Removed members storage_set and
folder_type_registy in EShortcutsPrivate.  New member shell.
(init): Init to NULL.
(e_shortcuts_construct): Removed arg @storage_set and
@folder_type_registry, new arg @shell.
(e_shortcuts_new): Removed.
(e_shortcuts_new_from_file): New.
(impl_destroy): Renamed from destroy().
(e_shortcuts_get_storage_set): Removed.
(e_shortcuts_get_shell): New.
(load_shortcuts): Accept any URI that can be parsed (by
e_shell_parse_uri).

* e-shell.c (e_shell_parse_uri): New.

* e-shell-view.c (evolution_uri_for_default_uri): New.
(display_uri): Use it to determine the evolution: uri given a
default: uri.

* e-shell.c (impl_Shell_handleURI): Pass it over to
e_shell_create_view_from_uri_and_settings() even if it's an
E_SHELL_DEFAULTURI_PREFIX.
(handle_default_uri): Removed.

svn path=/trunk/; revision=17497

1 files changed, 8 insertions, 1 deletions

diff --git a/shell/e-shell.h b/shell/e-shell.h
index 84ce5da551..f5bb51e637 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -39,7 +39,6 @@ typedef struct _EShellClass   EShellClass;
 #include "Evolution.h"
 
 #include "e-component-registry.h"
-#include "e-shortcuts.h"
 #include "e-shell-view.h"
 #include "e-uri-schema-registry.h"
 #include "e-shell-user-creatable-items-handler.h"
@@ -97,6 +96,8 @@ enum _EShellConstructResult {
 };
 typedef enum _EShellConstructResult EShellConstructResult;
 
+
+#include "e-shortcuts.h"
 
 
 GtkType                e_shell_get_type   (void);
@@ -157,6 +158,12 @@ gboolean e_shell_prepare_for_quit (EShell *shell);
 
 const char *e_shell_construct_result_to_string (EShellConstructResult result);
 
+
+gboolean  e_shell_parse_uri  (EShell      *shell,
+			      const char  *uri,
+			      char       **path_return,
+			      char       **extra_return);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */