[darcs-to-svn @ Fixing presence and preference dialog]

[empathy.git] / libempathy-gtk / gossip-account-widget-jabber.c

diff --git a/libempathy-gtk/gossip-account-widget-jabber.c b/libempathy-gtk/gossip-account-widget-jabber.c
index 589bfcc0def351ccf0e248a5fc28dbef1906e185..1c3b6108c7d6d28659ab05f691c95875e248363c 100644 (file)
--- a/libempathy-gtk/gossip-account-widget-jabber.c
+++ b/libempathy-gtk/gossip-account-widget-jabber.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2005-2007 Imendio AB
+ * Copyright (C) 2007 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  * 
- * Authors: Martyn Russell <martyn@imendio.com>
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include "config.h"
@@ -91,7 +91,7 @@ account_widget_jabber_entry_focus_cb (GtkWidget                 *widget,
 
        str = gtk_entry_get_text (GTK_ENTRY (widget));
        if (G_STR_EMPTY (str)) {
-               gchar *value;
+               gchar *value = NULL;
 
                mc_account_get_param_string (settings->account, param, &value);
                gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
@@ -120,7 +120,7 @@ account_widget_jabber_checkbutton_toggled_cb (GtkWidget                 *widget,
                                              GossipAccountWidgetJabber *settings)
 {
        if (widget == settings->checkbutton_ssl) {
-               gint     port;
+               gint     port = 0;
                gboolean old_ssl;
 
                mc_account_get_param_int (settings->account, "port", &port);
@@ -173,12 +173,12 @@ account_widget_jabber_destroy_cb (GtkWidget                 *widget,
 static void
 account_widget_jabber_setup (GossipAccountWidgetJabber *settings)
 {
-       gint      port;
-       gchar    *id;
-       gchar    *resource;
-       gchar    *server;
-       gchar    *password;
-       gboolean  old_ssl;
+       gint      port = 0;
+       gchar    *id = NULL;
+       gchar    *resource = NULL;
+       gchar    *server = NULL;
+       gchar    *password = NULL;
+       gboolean  old_ssl = FALSE;
 
        mc_account_get_param_int (settings->account, "port", &port);
        mc_account_get_param_string (settings->account, "account", &id);