aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-folder-tree.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-19 02:16:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-19 02:16:18 +0800
commitd2d0eebd74237b46adb8115b2f89e2b1eb2a3898 (patch)
treeb03350f63b15335e4527cebe95404ac3c4d67bb7 /shell/e-folder-tree.c
parent85e032b504cc9a12affba776150df6908d84bea3 (diff)
downloadgsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar.gz
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar.bz2
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar.lz
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar.xz
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.tar.zst
gsoc2013-evolution-d2d0eebd74237b46adb8115b2f89e2b1eb2a3898.zip
Removed unused variable.
* evolution-storage-set-view.c (impl_StorageSetView__set_checkedFolders): Removed unused variable. * e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct): Removed unused variable. * e-storage.c (e_storage_path_is_absolute) (e_storage_path_is_relative) (e_storage_async_xfer_folder) * e-storage-set.c (make_full_path) (get_storage_for_path) (signal_new_folder_for_all_folders_under_paths) (signal_new_folder_for_all_folders_in_storage) (e_storage_set_get_path_for_physical_uri) * e-storage-set-view.c (storage_sort_callback) (new_storage_cb) (removed_storage_cb) (new_folder_cb) * e-shortcuts-view.c (get_shortcut_info): * e-shell-view.c (handle_current_folder_removed) * e-shell-utils.c (e_shell_folder_name_is_valid): * e-local-storage.c (construct): * e-folder-tree.c (get_parent_path) (get_parent_path) (e_folder_tree_destroy) (e_folder_tree_add) (e_folder_tree_foreach) * e-folder-dnd-bridge.c (handle_data_received_path) * evolution-storage.c (make_full_uri): * e-shell-constants.h: New #defines E_PATH_SEPARATOR and E_PATH_SEPARATOR_S. * e-local-storage.c (load_folder): Don't add the folder if its type isn't registered. svn path=/trunk/; revision=17510
Diffstat (limited to 'shell/e-folder-tree.c')
-rw-r--r--shell/e-folder-tree.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c
index 46e7897711..f6decb4fc0 100644
--- a/shell/e-folder-tree.c
+++ b/shell/e-folder-tree.c
@@ -26,6 +26,8 @@
#include "e-folder-tree.h"
+#include "e-shell-constants.h"
+
#include <string.h>
#include <glib.h>
@@ -56,10 +58,10 @@ get_parent_path (const char *path)
g_assert (g_path_is_absolute (path));
- last_separator = strrchr (path, G_DIR_SEPARATOR);
+ last_separator = strrchr (path, E_PATH_SEPARATOR);
if (last_separator == path)
- return g_strdup (G_DIR_SEPARATOR_S);
+ return g_strdup (E_PATH_SEPARATOR_S);
return g_strndup (path, last_separator - path);
}
@@ -186,7 +188,7 @@ e_folder_tree_new (EFolderDestroyNotify folder_destroy_notify,
new->path_to_folder = g_hash_table_new (g_str_hash, g_str_equal);
new->data_to_path = g_hash_table_new (g_direct_hash, g_direct_equal);
- e_folder_tree_add (new, G_DIR_SEPARATOR_S, NULL);
+ e_folder_tree_add (new, E_PATH_SEPARATOR_S, NULL);
return new;
}
@@ -204,7 +206,7 @@ e_folder_tree_destroy (EFolderTree *folder_tree)
g_return_if_fail (folder_tree != NULL);
- root_folder = g_hash_table_lookup (folder_tree->path_to_folder, G_DIR_SEPARATOR_S);
+ root_folder = g_hash_table_lookup (folder_tree->path_to_folder, E_PATH_SEPARATOR_S);
remove_folder (folder_tree, root_folder);
g_hash_table_destroy (folder_tree->path_to_folder);
@@ -238,7 +240,7 @@ e_folder_tree_add (EFolderTree *folder_tree,
g_return_val_if_fail (g_path_is_absolute (path), FALSE);
/* Can only "add" a new root folder if the tree is empty */
- if (! strcmp (path, G_DIR_SEPARATOR_S)) {
+ if (! strcmp (path, E_PATH_SEPARATOR_S)) {
folder = g_hash_table_lookup (folder_tree->path_to_folder, path);
if (folder) {
if (folder->subfolders) {
@@ -428,7 +430,7 @@ e_folder_tree_foreach (EFolderTree *folder_tree,
g_return_if_fail (foreach_func != NULL);
root_node = g_hash_table_lookup (folder_tree->path_to_folder,
- G_DIR_SEPARATOR_S);
+ E_PATH_SEPARATOR_S);
if (root_node == NULL) {
g_warning ("e_folder_tree_foreach -- What?! No root node!?");
return;