[rpms/gnome-user-share] wip/oholy/f45-update: - Update to 0.41

[rpms/gnome-user-share] wip/oholy/f45-update: - Update to 0.41

[Bastien Nocera]

A new commit has been pushed.

Repo   : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : 686d7e33f8baf0e08d64a3da83c8954bcc889e65
Author : Bastien Nocera <hadess@fedoraproject.org>
Date   : 2008-12-17T10:01:57+00:00
Stats  : +7/-125 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/686d7e33f8baf0e08d64a3da83c8954bcc889e65?branch=wip/oholy/f45-update

Log:
- Update to 0.41

---
diff --git a/.cvsignore b/.cvsignore
index 5b47a79..1114de1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-user-share-0.40.tar.gz
+gnome-user-share-0.41.tar.gz

diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 2c46f21..5fcfe9c 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,14 +1,12 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.40
-Release: 3%{?dist}
+Version: 0.41
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/0.40/%{name}-%{version}.tar.gz
 
-Patch1: gus-bluez4-update.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: obex-data-server >= 0.3
@@ -41,7 +39,6 @@ The program also allows to share files using ObexFTP over Bluetooth.
 
 %prep
 %setup -q
-%patch1 -p0 -b .bluez4
 
 %build
 %configure
@@ -101,6 +98,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Wed Dec 17 2008 - Bastien Nocera <bnocera@redhat.com> - 0.41-1
+- Update to 0.41
+
 * Mon Sep 22 2008 - Bastien Nocera <bnocera@redhat.com> - 0.40-3
 - Add missing libnotify BR
 

diff --git a/gus-bluez4-update.patch b/gus-bluez4-update.patch
deleted file mode 100644
index 19756c5..0000000
--- a/gus-bluez4-update.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: src/obexpush.c
-===================================================================
---- src/obexpush.c	(revision 259)
-+++ src/obexpush.c	(working copy)
-@@ -184,7 +184,7 @@
- 	DBusGConnection *connection;
- 	DBusGProxy *manager;
- 	GError *error = NULL;
--	char **adapters;
-+	GPtrArray *adapters;
- 	gboolean retval = FALSE;
- 	guint i;
- 
-@@ -193,52 +193,74 @@
- 		return FALSE;
- 
- 	manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
--					     "/org/bluez", "org.bluez.Manager");
-+					     "/", "org.bluez.Manager");
- 	if (manager == NULL) {
- 		dbus_g_connection_unref (connection);
- 		return FALSE;
- 	}
- 
--	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE) {
-+	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE) {
- 		g_object_unref (manager);
- 		dbus_g_connection_unref (connection);
- 		return FALSE;
- 	}
- 
--	for (i = 0; adapters[i] != NULL; i++) {
--		DBusGProxy *adapter;
--		gboolean bonded, trusted;
-+	for (i = 0; i < adapters->len; i++) {
-+		DBusGProxy *adapter, *device;
-+		char *device_path;
-+		GHashTable *props;
- 
--		g_message ("checking adapter %s", adapters[i]);
-+		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
- 
- 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
--						    adapters[i], "org.bluez.Adapter");
--		if (dbus_g_proxy_call (adapter, "HasBonding", NULL,
--				      G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
--				      G_TYPE_BOOLEAN, &bonded, G_TYPE_INVALID) != FALSE) {
-+						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
-+
-+		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
-+				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-+				       DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE)
-+		{
-+			g_object_unref (adapter);
-+			continue;
-+		}
-+
-+		device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
-+
-+		if (dbus_g_proxy_call (device, "GetProperties", NULL,
-+				       G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
-+				       &props, G_TYPE_INVALID) != FALSE)
-+		{
-+			GValue *value;
-+			gboolean bonded, trusted;
-+
-+			value = g_hash_table_lookup (props, "Paired");
-+			bonded = g_value_get_boolean (value);
- 			g_message ("%s is %s", bdaddr, bonded ? "bonded" : "not bonded");
--			if (bonded != FALSE) {
-+
-+			if (bonded) {
-+				g_hash_table_destroy (props);
-+				g_object_unref (device);
-+				g_object_unref (adapter);
- 				retval = TRUE;
--				g_object_unref (adapter);
- 				break;
- 			}
--		}
--		if (accept_setting == ACCEPT_BONDED_AND_TRUSTED &&
--		    dbus_g_proxy_call (adapter, "IsTrusted", NULL,
--				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
--				       G_TYPE_BOOLEAN, &trusted, G_TYPE_INVALID) != FALSE) {
-+			value = g_hash_table_lookup (props, "Trusted");
-+			trusted = g_value_get_boolean (value);
- 			g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted");
--			if (trusted != FALSE) {
-+
-+			if (accept_setting == ACCEPT_BONDED_AND_TRUSTED
-+			    && trusted) {
-+				g_hash_table_destroy (props);
-+				g_object_unref (device);
-+				g_object_unref (adapter);
- 				retval = TRUE;
--				g_object_unref (adapter);
- 				break;
- 			}
- 		}
--
- 		g_object_unref(adapter);
- 	}
- 
--	g_strfreev(adapters);
-+	g_ptr_array_free (adapters, TRUE);
-+
- 	g_object_unref(manager);
- 	dbus_g_connection_unref(connection);
- 
-@@ -351,7 +373,7 @@
- cancelled_cb (DBusGProxy *session,
- 	      gpointer user_data)
- {
--	//FIXME implement properly
-+	//FIXME implement properly, we never actually finished the transfer
- 	g_message ("transfered was cancelled by the sender");
- 	transfer_completed_cb (session, user_data);
- }

diff --git a/sources b/sources
index 96a28d5..913583f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91b7454be8f88eef5896c4b7757935bd  gnome-user-share-0.40.tar.gz
+af883363ff0dfeaa8733d4a048da9975  gnome-user-share-0.41.tar.gz