[nautilus] file: remove unused NautilusSavedSearchFile
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] file: remove unused NautilusSavedSearchFile
- Date: Tue, 2 Oct 2012 17:08:46 +0000 (UTC)
commit 55e6a5fa02deedcc69cd55beda26fe19330d770a
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Oct 2 12:16:57 2012 -0400
file: remove unused NautilusSavedSearchFile
Since we now always override the file type when creating the
NautilusFile, there's no need for a separate, empty, subclass.
libnautilus-private/Makefile.am | 2 -
libnautilus-private/nautilus-file.c | 12 +----
libnautilus-private/nautilus-saved-search-file.c | 46 ------------------
libnautilus-private/nautilus-saved-search-file.h | 56 ----------------------
4 files changed, 1 insertions(+), 115 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 7a0483b..3aaa29e 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -152,8 +152,6 @@ libnautilus_private_la_SOURCES = \
nautilus-program-choosing.h \
nautilus-recent.c \
nautilus-recent.h \
- nautilus-saved-search-file.c \
- nautilus-saved-search-file.h \
nautilus-search-directory.c \
nautilus-search-directory.h \
nautilus-search-directory-file.c \
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 3cae5d6..225165c 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -47,7 +47,6 @@
#include "nautilus-vfs-file.h"
#include "nautilus-file-undo-operations.h"
#include "nautilus-file-undo-manager.h"
-#include "nautilus-saved-search-file.h"
#include <eel/eel-debug.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
@@ -529,8 +528,6 @@ nautilus_file_new_from_filename (NautilusDirectory *directory,
* that references a file like this. (See #349840) */
file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
}
- } else if (g_str_has_suffix (filename, NAUTILUS_SAVED_SEARCH_EXTENSION)) {
- file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_SAVED_SEARCH_FILE, NULL));
} else {
file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
}
@@ -633,18 +630,11 @@ nautilus_file_new_from_info (NautilusDirectory *directory,
GFileInfo *info)
{
NautilusFile *file;
- const char *mime_type;
g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
g_return_val_if_fail (info != NULL, NULL);
- mime_type = g_file_info_get_content_type (info);
- if (g_strcmp0 (mime_type, NAUTILUS_SAVED_SEARCH_MIMETYPE) == 0) {
- file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_SAVED_SEARCH_FILE, NULL));
- } else {
- file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
- }
-
+ file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
file->details->directory = nautilus_directory_ref (directory);
update_info_and_name (file, info);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]