diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-05-03 12:31:05 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-03 16:12:17 +0200 |
commit | 4791fb851eb96d5785616b1793d4e6367aa52ad9 (patch) | |
tree | f1179b420d217ab364ac7bdf686b25bf76fe1b4e /meta-gnome/recipes-gnome/gnome-disk-utility | |
parent | 985fb27d51ecb948a195af5b27a3a3f6b5ab3f45 (diff) | |
download | meta-openembedded-4791fb851eb96d5785616b1793d4e6367aa52ad9.tar.gz |
gnome-disk-utility: backport property DeviceAutomountHint
Currently we have gvfs 1.10.1 which was designed for gnome-disk-utility 3.x.
We have a patched gvfs so that it works with gnome-disk-utility 2.x but that
does not support the property DeviceAutomountHint because it was introduced in
3.x.
Fixes warnings as:
| (palimpsest:829): libgdu-WARNING **: unhandled property 'DeviceAutomountHint'
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-disk-utility')
2 files changed, 76 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch new file mode 100644 index 000000000..805e93776 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Zeuthen <davidz@redhat.com> | ||
3 | Date: Fri, 8 Jul 2011 11:03:52 -0400 | ||
4 | Subject: [PATCH] Add support for DeviceAutomountHint | ||
5 | |||
6 | Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 | ||
7 | |||
8 | Upstream-Status: Applied [1] | ||
9 | |||
10 | [1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html | ||
11 | |||
12 | Signed-off-by: David Zeuthen <davidz@redhat.com> | ||
13 | --- | ||
14 | src/gdu/gdu-device.c | 10 ++++++++++ | ||
15 | src/gdu/gdu-device.h | 1 + | ||
16 | 2 files changed, 11 insertions(+), 0 deletions(-) | ||
17 | |||
18 | diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c | ||
19 | index 6a5afad..4be39cf 100644 | ||
20 | --- a/src/gdu/gdu-device.c | ||
21 | +++ b/src/gdu/gdu-device.c | ||
22 | @@ -82,6 +82,7 @@ typedef struct | ||
23 | gboolean device_presentation_nopolicy; | ||
24 | char *device_presentation_name; | ||
25 | char *device_presentation_icon_name; | ||
26 | + char *device_automount_hint; | ||
27 | guint64 device_size; | ||
28 | guint64 device_block_size; | ||
29 | |||
30 | @@ -279,6 +280,8 @@ collect_props (const char *key, | ||
31 | props->device_presentation_name = g_strdup (g_value_get_string (value)); | ||
32 | else if (strcmp (key, "DevicePresentationIconName") == 0) | ||
33 | props->device_presentation_icon_name = g_strdup (g_value_get_string (value)); | ||
34 | + else if (strcmp (key, "DeviceAutomountHint") == 0) | ||
35 | + props->device_automount_hint = g_strdup (g_value_get_string (value)); | ||
36 | else if (strcmp (key, "DeviceSize") == 0) | ||
37 | props->device_size = g_value_get_uint64 (value); | ||
38 | else if (strcmp (key, "DeviceBlockSize") == 0) | ||
39 | @@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props) | ||
40 | g_strfreev (props->device_mount_paths); | ||
41 | g_free (props->device_presentation_name); | ||
42 | g_free (props->device_presentation_icon_name); | ||
43 | + g_free (props->device_automount_hint); | ||
44 | g_free (props->job_id); | ||
45 | g_free (props->id_usage); | ||
46 | g_free (props->id_type); | ||
47 | @@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device) | ||
48 | } | ||
49 | |||
50 | const char * | ||
51 | +gdu_device_get_automount_hint (GduDevice *device) | ||
52 | +{ | ||
53 | + return device->priv->props->device_automount_hint; | ||
54 | +} | ||
55 | + | ||
56 | +const char * | ||
57 | gdu_device_drive_get_media (GduDevice *device) | ||
58 | { | ||
59 | return device->priv->props->drive_media; | ||
60 | diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h | ||
61 | index 4c1302b..8cfd7a9 100644 | ||
62 | --- a/src/gdu/gdu-device.h | ||
63 | +++ b/src/gdu/gdu-device.h | ||
64 | @@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device); | ||
65 | const char *gdu_device_drive_get_connection_interface (GduDevice *device); | ||
66 | guint64 gdu_device_drive_get_connection_speed (GduDevice *device); | ||
67 | char **gdu_device_drive_get_media_compatibility (GduDevice *device); | ||
68 | +const gchar *gdu_device_get_automount_hint(GduDevice *device); | ||
69 | const char *gdu_device_drive_get_media (GduDevice *device); | ||
70 | gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device); | ||
71 | gboolean gdu_device_drive_get_requires_eject (GduDevice *device); | ||
72 | -- | ||
73 | 1.7.6.5 | ||
74 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index a0fd9bdba..ac4a759aa 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564" | |||
5 | 5 | ||
6 | DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus" | 6 | DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus" |
7 | 7 | ||
8 | PR = "r3" | 8 | PR = "r4" |
9 | 9 | ||
10 | inherit gnome | 10 | inherit gnome |
11 | SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" | 11 | SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" |
@@ -15,6 +15,7 @@ SRC_URI += "\ | |||
15 | file://disable-scrollkeeper.patch \ | 15 | file://disable-scrollkeeper.patch \ |
16 | file://fix-dbus-interfaces.patch \ | 16 | file://fix-dbus-interfaces.patch \ |
17 | file://sysrooted-pkg-config.patch \ | 17 | file://sysrooted-pkg-config.patch \ |
18 | file://0001-Add-support-for-DeviceAutomountHint.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | EXTRA_OECONF += "--disable-scrollkeeper" | 21 | EXTRA_OECONF += "--disable-scrollkeeper" |