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, 10 insertions, 9 deletions

diff --git a/shell/e-shortcuts.h b/shell/e-shortcuts.h
index 065d23f9b2..bbc438c606 100644
--- a/shell/e-shortcuts.h
+++ b/shell/e-shortcuts.h
@@ -86,15 +86,15 @@ struct _EShortcutsClass {
 	void  (* update_shortcut)  	  (EShortcuts *shortcuts, int group_num, int item_num);
 };
 
+
+#include "e-shell.h"
 
 
-GtkType      e_shortcuts_get_type                (void);
-void         e_shortcuts_construct               (EShortcuts          *shortcuts,
-						  EStorageSet         *storage_set,
-						  EFolderTypeRegistry *folder_type_registry);
-EShortcuts  *e_shortcuts_new                     (EStorageSet         *storage_set,
-						  EFolderTypeRegistry *folder_type_registry,
-						  const char          *file_name);
+GtkType     e_shortcuts_get_type       (void);
+void        e_shortcuts_construct      (EShortcuts *shortcuts,
+					EShell     *shell);
+EShortcuts *e_shortcuts_new_from_file  (EShell     *shell,
+					const char *file_name);
 
 int           e_shortcuts_get_num_groups          (EShortcuts *shortcuts);
 
@@ -108,8 +108,9 @@ const EShortcutItem *e_shortcuts_get_shortcut  (EShortcuts *shortcuts,
 						int         group_num,
 						int         num);
 
-EStorageSet  *e_shortcuts_get_storage_set          (EShortcuts *shortcuts);
-GtkWidget    *e_shortcuts_new_view                 (EShortcuts *shortcuts);
+EShell *e_shortcuts_get_shell  (EShortcuts *shortcuts);
+
+GtkWidget *e_shortcuts_new_view  (EShortcuts *shortcuts);
 
 gboolean     e_shortcuts_load                    (EShortcuts          *shortcuts,
 						  const char          *path);