[rpms/gnome-user-share] wip/oholy/f45-update: Merge branch 'f15'

[Tomas Bzatek <tbzatek@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/gnome-user-share
            Branch : wip/oholy/f45-update
            Commit : 3f4d4dd7c26007123a21a6d0272f6263195c0493
            Author : Tomas Bzatek <tbzatek@redhat.com>
            Date   : 2011-04-21T16:30:51+02:00
            Stats  : +7/-41 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/3f4d4dd7c26007123a21a6d0272f6263195c0493?branch=wip/oholy/f45-update

            Log:
            Merge branch 'f15'

Conflicts:
	.gitignore
	gnome-user-share.spec
	sources

---
diff --git a/.gitignore b/.gitignore
index 1dcb372..e35099b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-gnome-user-share-2.30.0.tar.bz2
-/gnome-user-share-2.30.1.tar.bz2
-/gnome-user-share-2.30.2.tar.bz2
-/gnome-user-share-2.91.6.tar.bz2
+/gnome-user-share-3.0.0.tar.bz2

diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index b4a506e..d00f3d0 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,11 +1,11 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.91.6
+Version: 3.0.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/2.30/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.bz2
 
 Requires: httpd
 Requires: obex-data-server
@@ -97,6 +97,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/nautilus/extensions-3.0/*.so
 
 %changelog
+* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
 * Mon Feb 21 2011 Bastien Nocera <bnocera@redhat.com> 2.91.6-1
 - Update to 2.91.6
 

diff --git a/sources b/sources
index ab249e8..41ce9f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db9f95d4dcf09be10cc8763082f21c9d  gnome-user-share-2.91.6.tar.bz2
+97eb3e23d0c640fc272991e9d40d1421  gnome-user-share-3.0.0.tar.bz2

diff --git a/.gitignore b/.gitignore
index 28454e1..e35099b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-gnome-user-share-2.30.0.tar.bz2
-/gnome-user-share-2.30.1.tar.bz2
-/gnome-user-share-2.30.2.tar.bz2
-/gnome-user-share-2.91.6.tar.bz2
 /gnome-user-share-3.0.0.tar.bz2

diff --git a/notify.patch b/notify.patch
deleted file mode 100644
index bc70fb4..0000000
--- a/notify.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-user-share-2.30.1/src/obexpush.c.notify gnome-user-share-2.30.1/src/obexpush.c
---- gnome-user-share-2.30.1/src/obexpush.c.notify	2010-11-03 10:13:20.985241989 -0400
-+++ gnome-user-share-2.30.1/src/obexpush.c	2010-11-03 10:15:02.988242018 -0400
-@@ -139,10 +139,9 @@ show_notification (const char *filename)
- 	/* Translators: %s is the name of the filename received */
- 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
- 	g_free (display);
--	notification = notify_notification_new_with_status_icon (_("You received a file"),
--								 notification_text,
--								 "dialog-information",
--								 GTK_STATUS_ICON (statusicon));
-+	notification = notify_notification_new (_("You received a file"),
-+					         notification_text,
-+					         "dialog-information");
- 
- 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- 
-@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
- 		char *device_path;
- 		GHashTable *props;
- 
--		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
-+		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
- 
- 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
--						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
-+						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
- 
- 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
- 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,