summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2017-08-08 00:02:56 +0200
committerCarlos Soriano <csoriano@gnome.org>2017-08-09 20:27:07 +0200
commit8005c8abe1a47deb8e953387817ccc23ae012743 (patch)
tree199419468345194acc5ec41b955b1cfaa2ce5fb1
parent366f0038c418d6bf3f8444fd3700a135d2d011b6 (diff)
downloadnautilus-8005c8abe1a47deb8e953387817ccc23ae012743.tar.gz
nautilus.desktop: Remove saved-search leftovers
It was removed long ago https://bugzilla.gnome.org/show_bug.cgi?id=771424
-rw-r--r--data/org.gnome.Nautilus.desktop.in2
-rw-r--r--src/nautilus-bookmark.c12
-rw-r--r--src/nautilus-file-utilities.h3
-rw-r--r--src/nautilus-icon-names.h2
-rw-r--r--src/nautilus-search-directory.c5
5 files changed, 3 insertions, 21 deletions
diff --git a/data/org.gnome.Nautilus.desktop.in b/data/org.gnome.Nautilus.desktop.in
index 9e5d43e6e..db3f9a198 100644
--- a/data/org.gnome.Nautilus.desktop.in
+++ b/data/org.gnome.Nautilus.desktop.in
@@ -11,7 +11,7 @@ Type=Application
DBusActivatable=true
StartupNotify=true
Categories=GNOME;GTK;Utility;Core;FileManager;
-MimeType=inode/directory;application/x-gnome-saved-search;
+MimeType=inode/directory;
X-GNOME-UsesNotifications=true
Actions=new-window;
diff --git a/src/nautilus-bookmark.c b/src/nautilus-bookmark.c
index 1f915ed1e..5c51fdbc0 100644
--- a/src/nautilus-bookmark.c
+++ b/src/nautilus-bookmark.c
@@ -318,16 +318,8 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
else
{
uri = nautilus_bookmark_get_uri (bookmark);
- if (g_str_has_prefix (uri, EEL_SEARCH_URI))
- {
- symbolic_icon = g_themed_icon_new (NAUTILUS_ICON_FOLDER_SAVED_SEARCH);
- icon = g_themed_icon_new (NAUTILUS_ICON_FULLCOLOR_FOLDER_SAVED_SEARCH);
- }
- else
- {
- symbolic_icon = g_themed_icon_new (NAUTILUS_ICON_FOLDER_REMOTE);
- icon = g_themed_icon_new (NAUTILUS_ICON_FULLCOLOR_FOLDER_REMOTE);
- }
+ symbolic_icon = g_themed_icon_new (NAUTILUS_ICON_FOLDER_REMOTE);
+ icon = g_themed_icon_new (NAUTILUS_ICON_FULLCOLOR_FOLDER_REMOTE);
g_free (uri);
}
diff --git a/src/nautilus-file-utilities.h b/src/nautilus-file-utilities.h
index 29ad7b3c8..98f823a70 100644
--- a/src/nautilus-file-utilities.h
+++ b/src/nautilus-file-utilities.h
@@ -26,9 +26,6 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
-#define NAUTILUS_SAVED_SEARCH_EXTENSION ".savedSearch"
-#define NAUTILUS_SAVED_SEARCH_MIMETYPE "application/x-gnome-saved-search"
-
/* These functions all return something something that needs to be
* freed with g_free, is not NULL, and is guaranteed to exist.
*/
diff --git a/src/nautilus-icon-names.h b/src/nautilus-icon-names.h
index ddc4543d5..64574662c 100644
--- a/src/nautilus-icon-names.h
+++ b/src/nautilus-icon-names.h
@@ -20,7 +20,6 @@
#define NAUTILUS_ICON_FOLDER_PUBLIC_SHARE "folder-publicshare-symbolic"
#define NAUTILUS_ICON_FOLDER_TEMPLATES "folder-templates-symbolic"
#define NAUTILUS_ICON_FOLDER_VIDEOS "folder-videos-symbolic"
-#define NAUTILUS_ICON_FOLDER_SAVED_SEARCH "folder-saved-search-symbolic"
/* Icons for desktop */
#define NAUTILUS_DESKTOP_ICON_DESKTOP "user-desktop"
@@ -39,7 +38,6 @@
#define NAUTILUS_ICON_FULLCOLOR_FOLDER_PUBLIC_SHARE "folder-publicshare"
#define NAUTILUS_ICON_FULLCOLOR_FOLDER_TEMPLATES "folder-templates"
#define NAUTILUS_ICON_FULLCOLOR_FOLDER_VIDEOS "folder-videos"
-#define NAUTILUS_ICON_FULLCOLOR_FOLDER_SAVED_SEARCH "folder-saved-search"
/* Other icons */
#define NAUTILUS_ICON_TEMPLATE "text-x-generic-template"
diff --git a/src/nautilus-search-directory.c b/src/nautilus-search-directory.c
index d51f4f861..6692a41f0 100644
--- a/src/nautilus-search-directory.c
+++ b/src/nautilus-search-directory.c
@@ -618,11 +618,6 @@ search_engine_hits_added (NautilusSearchEngine *engine,
const char *uri;
uri = nautilus_search_hit_get_uri (hit);
- if (g_str_has_suffix (uri, NAUTILUS_SAVED_SEARCH_EXTENSION))
- {
- /* Never return saved searches themselves as hits */
- continue;
- }
nautilus_search_hit_compute_scores (hit, search->details->query);