aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shortcuts-view.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-18 06:03:57 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-18 06:03:57 +0800
commit39c3739393bb6527a9829f1a0bdee27cff0da182 (patch)
treebd2d0649da89914a0a4ec78d8adb6d65e106ae0d /shell/e-shortcuts-view.c
parent515ebfd45c748cf31e2f45fe9180f97e08051498 (diff)
downloadgsoc2013-evolution-39c3739393bb6527a9829f1a0bdee27cff0da182.tar.gz
gsoc2013-evolution-39c3739393bb6527a9829f1a0bdee27cff0da182.tar.zst
gsoc2013-evolution-39c3739393bb6527a9829f1a0bdee27cff0da182.zip
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
Diffstat (limited to 'shell/e-shortcuts-view.c')
-rw-r--r--shell/e-shortcuts-view.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index b926471281..adebe59ab1 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.c
@@ -520,7 +520,7 @@ get_shortcut_info (EShortcutsView *shortcuts_view,
}
path = strchr (item_url, G_DIR_SEPARATOR);
- storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
+ storage_set = e_shell_get_storage_set (e_shortcuts_get_shell (priv->shortcuts));
folder = e_storage_set_get_folder (storage_set, path);
if (folder != NULL) {
@@ -611,8 +611,8 @@ impl_shortcut_drag_motion (EShortcutBar *shortcut_bar,
return FALSE;
if (! e_folder_dnd_bridge_motion (widget, context, time,
- e_shortcuts_get_storage_set (priv->shortcuts),
- shortcut->uri + E_SHELL_URI_PREFIX_LEN))
+ e_shell_get_storage_set (e_shortcuts_get_shell (priv->shortcuts)),
+ shortcut->uri + E_SHELL_URI_PREFIX_LEN))
gdk_drag_status (context, 0, time);
return TRUE;
@@ -641,7 +641,7 @@ impl_shortcut_drag_data_received (EShortcutBar *shortcut_bar,
return FALSE;
e_folder_dnd_bridge_data_received (widget, context, selection_data, time,
- e_shortcuts_get_storage_set (priv->shortcuts),
+ e_shell_get_storage_set (e_shortcuts_get_shell (priv->shortcuts)),
shortcut->uri + E_SHELL_URI_PREFIX_LEN);
return TRUE;
}