summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch
blob: a5c6556711055cbe004b0992282c076ae3264051 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
From 1b9ceef87405296adccdadc9528d4cbb2bc51b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 2 May 2013 13:27:16 +0200
Subject: [PATCH] Revert "Respect UDISKS_AUTOMOUNT_HINT available in recent
 udisks and gnome-disk-utility"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 493ee806eba214a748d064b43c10882d76ee1492.

AFAICS was the requirement for gnome-disk-utility V3 for a minor functionality change.

Upstream-Status: Inappropriate [related to missing gnome3 support]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 configure.ac             |    2 +-
 monitor/gdu/ggduvolume.c |    9 ---------
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 601e994..377770e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ AC_ARG_ENABLE(gdu, AS_HELP_STRING([--disable-gdu],[build without GDU volume moni
 msg_gdu=no
 GDU_LIBS=
 GDU_CFLAGS=
-GDU_REQUIRED=3.0.2
+GDU_REQUIRED=2.29.0
 
 if test "x$enable_gdu" != "xno"; then
   PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index eb15d22..0665b7a 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -429,15 +429,6 @@ update_volume (GGduVolume *volume)
       g_free (activation_uri);
     }
 
-  /* if there's an automount hint, use it */
-  if (device != NULL)
-    {
-      if (g_strcmp0 (gdu_device_get_automount_hint (device), "always") == 0)
-        volume->should_automount = TRUE;
-      else if (g_strcmp0 (gdu_device_get_automount_hint (device), "never") == 0)
-        volume->should_automount = FALSE;
-    }
-
   if (pool != NULL)
     g_object_unref (pool);
   if (device != NULL)
-- 
1.7.6.5