diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch b/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch new file mode 100644 index 000000000..a5c655671 --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 1b9ceef87405296adccdadc9528d4cbb2bc51b76 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 2 May 2013 13:27:16 +0200 | ||
4 | Subject: [PATCH] Revert "Respect UDISKS_AUTOMOUNT_HINT available in recent | ||
5 | udisks and gnome-disk-utility" | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | This reverts commit 493ee806eba214a748d064b43c10882d76ee1492. | ||
11 | |||
12 | AFAICS was the requirement for gnome-disk-utility V3 for a minor functionality change. | ||
13 | |||
14 | Upstream-Status: Inappropriate [related to missing gnome3 support] | ||
15 | |||
16 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
17 | --- | ||
18 | configure.ac | 2 +- | ||
19 | monitor/gdu/ggduvolume.c | 9 --------- | ||
20 | 2 files changed, 1 insertions(+), 10 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 601e994..377770e 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -205,7 +205,7 @@ AC_ARG_ENABLE(gdu, AS_HELP_STRING([--disable-gdu],[build without GDU volume moni | ||
27 | msg_gdu=no | ||
28 | GDU_LIBS= | ||
29 | GDU_CFLAGS= | ||
30 | -GDU_REQUIRED=3.0.2 | ||
31 | +GDU_REQUIRED=2.29.0 | ||
32 | |||
33 | if test "x$enable_gdu" != "xno"; then | ||
34 | PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes) | ||
35 | diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c | ||
36 | index eb15d22..0665b7a 100644 | ||
37 | --- a/monitor/gdu/ggduvolume.c | ||
38 | +++ b/monitor/gdu/ggduvolume.c | ||
39 | @@ -429,15 +429,6 @@ update_volume (GGduVolume *volume) | ||
40 | g_free (activation_uri); | ||
41 | } | ||
42 | |||
43 | - /* if there's an automount hint, use it */ | ||
44 | - if (device != NULL) | ||
45 | - { | ||
46 | - if (g_strcmp0 (gdu_device_get_automount_hint (device), "always") == 0) | ||
47 | - volume->should_automount = TRUE; | ||
48 | - else if (g_strcmp0 (gdu_device_get_automount_hint (device), "never") == 0) | ||
49 | - volume->should_automount = FALSE; | ||
50 | - } | ||
51 | - | ||
52 | if (pool != NULL) | ||
53 | g_object_unref (pool); | ||
54 | if (device != NULL) | ||
55 | -- | ||
56 | 1.7.6.5 | ||
57 | |||