aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2011-01-20 14:42:12 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2011-03-08 04:34:52 +0800
commit7f7826a163f31bb662247ac4486dca0d01df35f6 (patch)
tree1893c6913d6d885716dfba2eaa9680d644b5de5d
parentfdafabde40eced013ffdcb49e4f080542fbbc402 (diff)
downloadgsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar.gz
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar.bz2
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar.lz
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar.xz
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.tar.zst
gsoc2013-epiphany-7f7826a163f31bb662247ac4486dca0d01df35f6.zip
ephy-file-helpers: allow desktop in ephy_file_browse_to
Nautilus doesn't draw the desktop as always anymore. It's not visible unless you browse there, so the reason to not allow browse_to desktop is not valid anymore. Bug #618443
-rw-r--r--lib/ephy-file-helpers.c27
1 files changed, 7 insertions, 20 deletions
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 5a6bc335b..11c390689 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -848,29 +848,16 @@ gboolean
ephy_file_browse_to (GFile *file,
guint32 user_time)
{
- GFile *parent, *desktop;
- char *desktop_dir;
+ GFile *parent;
gboolean ret;
- desktop_dir = ephy_file_desktop_dir ();
- desktop = g_file_new_for_path (desktop_dir);
-
- /* Don't do anything if destination is the desktop */
- if (g_file_has_prefix (file, desktop))
- {
- ret = FALSE;
- }
- else
- {
- parent = g_file_get_parent (file);
- /* TODO find a way to make nautilus scroll to the actual file */
- ret = ephy_file_launch_handler ("x-directory/normal",
- parent,
- user_time);
- }
+ parent = g_file_get_parent (file);
+ /* TODO find a way to make nautilus scroll to the actual file */
+ ret = ephy_file_launch_handler ("x-directory/normal",
+ parent,
+ user_time);
- g_object_unref (desktop);
- g_free (desktop_dir);
+ g_object_unref (parent);
return ret;
}