summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-06-18 12:22:46 +0000
committerPacho Ramos <pacho@gentoo.org>2010-06-18 12:22:46 +0000
commitca81e6c6d09f64dbb3d013dcaca18dfdf15751f6 (patch)
tree7d94cd43ecfe921ab124f32a3fb777150e38ff81 /net-wireless/gnome-bluetooth/files
parentVersion bump wrt #305109 by "hitachi". (diff)
downloadgentoo-2-ca81e6c6d09f64dbb3d013dcaca18dfdf15751f6.tar.gz
gentoo-2-ca81e6c6d09f64dbb3d013dcaca18dfdf15751f6.tar.bz2
gentoo-2-ca81e6c6d09f64dbb3d013dcaca18dfdf15751f6.zip
Version bump
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/gnome-bluetooth/files')
-rw-r--r--net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch23
-rw-r--r--net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch34
2 files changed, 57 insertions, 0 deletions
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch
new file mode 100644
index 000000000000..dc55eb65fe2d
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch
@@ -0,0 +1,23 @@
+From fff176c2b14516bc572576199490a0f526999b24 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 02 May 2010 17:45:21 +0000
+Subject: Add pin code for BT-GPS8 JENTRO
+
+https://bugzilla.gnome.org/show_bug.cgi?id=617371
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 8f9e9a3..8a73d65 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -65,6 +65,9 @@
+ <device oui="00:19:1D:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+ <device oui="00:1F:C5:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+
++ <!-- BT-GPS8 JENTRO, GPS mouse -->
++ <device oui="00:0D:B5:" name="BT-GPS8 JENTRO" pin="0000"/>
++
+ <!-- GPS devices -->
+ <device oui="00:0D:B5:" name="TomTom Wireless GPS MkII" pin="0000"/>
+ <device oui="00:0D:B5:" name="GPS-GW-005" pin="0000"/>
+--
+cgit v0.8.3.1
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch
new file mode 100644
index 000000000000..90e5da5dff76
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch
@@ -0,0 +1,34 @@
+From 49c9ab7ddd8c20ad1722d20185a0fc3e71ce2d20 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 26 May 2010 14:24:15 +0000
+Subject: Don't fail to browse the device if already mounted
+
+We don't need to have an error if the device is already mounted,
+just show it already!
+---
+diff --git a/applet/main.c b/applet/main.c
+index 5655a75..dd517c8 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -114,9 +114,16 @@ mount_finish_cb (GObject *source_object,
+
+ if (g_file_mount_enclosing_volume_finish (G_FILE (source_object),
+ res, &error) == FALSE) {
+- g_printerr ("Failed to mount OBEX volume: %s", error->message);
+- g_error_free (error);
+- return;
++ /* Ignore "already mounted" error */
++ if (error->domain == G_IO_ERROR &&
++ error->code == G_IO_ERROR_ALREADY_MOUNTED) {
++ g_error_free (error);
++ error = NULL;
++ } else {
++ g_printerr ("Failed to mount OBEX volume: %s", error->message);
++ g_error_free (error);
++ return;
++ }
+ }
+
+ uri = g_file_get_uri (G_FILE (source_object));
+--
+cgit v0.8.3.1