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
---
vinagre/vinagre-fav.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 490dd11..d94f81d 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/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