From 41be01d40a24b7ebee29ff91a6b4f616815e8dc7 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Sep 18 2009 17:17:31 +0000
Subject: - Fix warnings using mDNS bookmarks


---

diff --git a/0001-Fix-warnings-activating-mDNS-bookmarks.patch b/0001-Fix-warnings-activating-mDNS-bookmarks.patch
new file mode 100644
index 0000000..5811946
--- /dev/null
+++ b/0001-Fix-warnings-activating-mDNS-bookmarks.patch
@@ -0,0 +1,48 @@
+From c80f47981e6f9a3dec1c192d4906a1159ad947ee Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Sep 2009 18:15:46 +0100
+Subject: [PATCH] Fix warnings activating mDNS bookmarks
+
+- Don't tell the marshallers that we have an object and pass a pointer
+- Don't emit a signal when we don't have an object to pass
+---
+ src/vinagre-fav.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/vinagre-fav.c b/src/vinagre-fav.c
+index 490dd11..d94f81d 100644
+--- a/src/vinagre-fav.c
++++ b/src/vinagre-fav.c
+@@ -139,7 +139,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
+ 			      g_cclosure_marshal_VOID__OBJECT,
+ 			      G_TYPE_NONE,
+ 			      1,
+-			      G_TYPE_POINTER);
++			      G_TYPE_OBJECT);
+ 
+   signals[FAV_SELECTED] =
+ 		g_signal_new ("fav-selected",
+@@ -150,7 +150,7 @@ vinagre_fav_class_init (VinagreFavClass *klass)
+ 			      g_cclosure_marshal_VOID__OBJECT,
+ 			      G_TYPE_NONE,
+ 			      1,
+-			      G_TYPE_POINTER);
++			      G_TYPE_OBJECT);
+ 
+   g_type_class_add_private (object_class, sizeof (VinagreFavPrivate));
+ }
+@@ -206,8 +206,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
+ 			  -1);
+     }
+ 
+-  if (avahi)
++  if (avahi) {
+     entry = NULL;
++    return;
++  }
+ 
+   /* Emits the signal saying that user has selected a bookmark */
+   g_signal_emit (G_OBJECT (fav), 
+-- 
+1.6.2.5
+
diff --git a/vinagre.spec b/vinagre.spec
index 34cb57e..8fea621 100644
--- a/vinagre.spec
+++ b/vinagre.spec
@@ -1,12 +1,14 @@
 Name:		vinagre
 Version:	2.26.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
 Source0:	http://download.gnome.org/sources/vinagre/2.26/%{name}-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=581817
+Patch0:		0001-Fix-warnings-activating-mDNS-bookmarks.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +35,7 @@ GNOME keyring, and browse the network to look for VNC servers.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mdns
 
 %build
 %configure --enable-avahi=yes
@@ -122,6 +125,9 @@ fi
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera@redhat.com> 2.26.2-2
+- Fix warnings using mDNS bookmarks
+
 * Mon Jun  1 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-1
 - Update to 2.26.2
 - See http://download.gnome.org/sources/vinagre/2.26/vinagre-2.26.2.news