[vinagre] Get rid of the remaining GCC warnings

[Marc-Andre Lureau <malureau src gnome org>]

commit 421744f517735bdb13320a31136de3709052e328
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Wed Feb 23 01:44:10 2011 +0100

    Get rid of the remaining GCC warnings

 vinagre/vinagre-fav.c           |    3 +--
 vinagre/vinagre-main.c          |    2 +-
 vinagre/vinagre-mdns.c          |    1 -
 vinagre/vinagre-ssh.c           |    4 ++--
 vinagre/vinagre-tube-handler.c  |    1 +
 vinagre/vinagre-tubes-manager.c |    5 ++++-
 6 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
index 238298b..0e55246 100644
--- a/vinagre/vinagre-fav.c
+++ b/vinagre/vinagre-fav.c
@@ -219,7 +219,7 @@ menu_position (GtkMenu    *menu,
 {
   GtkTreePath *path;
   GdkRectangle rect;
-  gint wx, wy;
+  gint wy;
   GtkRequisition requisition;
   GtkWidget *w;
   GtkAllocation allocation;
@@ -232,7 +232,6 @@ menu_position (GtkMenu    *menu,
 			       NULL,
 			       &rect);
 
-  wx = rect.x;
   wy = rect.y;
 
   gdk_window_get_origin (gtk_widget_get_window (w), x, y);
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index d1ec06a..acf5650 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -70,7 +70,7 @@ app_init (GtkApplication *app)
   vinagre_utils_handle_debug ();
 
 #ifdef HAVE_TELEPATHY
-   vinagre_tubes_manager = vinagre_tubes_manager_new (window);
+  vinagre_tubes_manager = vinagre_tubes_manager_new (VINAGRE_WINDOW (window));
 #endif
 
   /* fake call, just to ensure this symbol will be present at vinagre.so */
diff --git a/vinagre/vinagre-mdns.c b/vinagre/vinagre-mdns.c
index a2b2c2c..2017f25 100644
--- a/vinagre/vinagre-mdns.c
+++ b/vinagre/vinagre-mdns.c
@@ -303,7 +303,6 @@ static void
 vinagre_mdns_init (VinagreMdns *mdns)
 {
   GError *error = NULL;
-  GSList *plugins;
   VinagrePluginsEngine *engine;
   VinagreProtocol *protocol;
   GHashTable *protocols;
diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
index 5ccf1a9..f79f794 100644
--- a/vinagre/vinagre-ssh.c
+++ b/vinagre/vinagre-ssh.c
@@ -312,7 +312,7 @@ handle_login (GtkWindow *parent,
   int prompt_fd;
   char buffer[1024];
   gsize len;
-  gboolean ret_val, aborted, save_in_keyring;
+  gboolean ret_val, save_in_keyring;
   gsize bytes_written;
   const gchar *authtype;
   gchar *object, *password;
@@ -323,7 +323,7 @@ handle_login (GtkWindow *parent,
   object = password = NULL;
   authtype = NULL;
   ret_val = TRUE;
-  aborted = save_in_keyring = FALSE;
+  save_in_keyring = FALSE;
 
   if (vendor == SSH_VENDOR_SSH) 
     prompt_fd = stderr_fd;
diff --git a/vinagre/vinagre-tube-handler.c b/vinagre/vinagre-tube-handler.c
index b313c9f..208870f 100644
--- a/vinagre/vinagre-tube-handler.c
+++ b/vinagre/vinagre-tube-handler.c
@@ -38,6 +38,7 @@
 #include "vinagre-debug.h"
 #include "vinagre-protocol.h"
 #include "vinagre-plugins-engine.h"
+#include "vinagre-utils.h"
 
 G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT);
 
diff --git a/vinagre/vinagre-tubes-manager.c b/vinagre/vinagre-tubes-manager.c
index 48b6fde..7c856e5 100644
--- a/vinagre/vinagre-tubes-manager.c
+++ b/vinagre/vinagre-tubes-manager.c
@@ -32,6 +32,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/defs.h>
+#include <telepathy-glib/util.h>
 
 #include "vinagre-tubes-manager.h"
 #include "vinagre-tube-handler.h"
@@ -235,7 +236,9 @@ vinagre_tubes_manager_new (VinagreWindow *vinagre_window)
 {
   VinagreTubesManager *self;
 
-  return g_object_new (VINAGRE_TYPE_TUBES_MANAGER,
+  self = g_object_new (VINAGRE_TYPE_TUBES_MANAGER,
       "vinagre-window", vinagre_window,
       NULL);
+
+  return self;
 }