Don't forget to show the contact widget in some places

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

diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index a8a751485af7f32c7a2a1f4b50906a48629c1b9b..2d494477931ae75a65bf570c8c47c29ffdf6e1ff 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -25,22 +25,18 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-debug.h>
 
 #include "empathy-account-widget.h"
 #include "empathy-account-widget-sip.h"
 #include "empathy-ui-utils.h"
 
-#define DEBUG_DOMAIN "AccountWidgetSIP"
-
 typedef struct {
   McAccount *account;
 
@@ -64,13 +60,11 @@ account_widget_sip_discover_stun_toggled_cb (
     GtkWidget *checkbox,
     EmpathyAccountWidgetSip *settings)
 {
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox))) {
-    gtk_widget_set_sensitive(settings->entry_stun_server, TRUE);
-    gtk_widget_set_sensitive(settings->spinbutton_stun_part, TRUE);
-  } else {
-    gtk_widget_set_sensitive(settings->entry_stun_server, FALSE);
-    gtk_widget_set_sensitive(settings->spinbutton_stun_part, FALSE);
-  }
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+  gtk_widget_set_sensitive(settings->entry_stun_server, !active);
+  gtk_widget_set_sensitive(settings->spinbutton_stun_part, !active);
 }
 
 /**
@@ -85,17 +79,15 @@ GtkWidget *
 empathy_account_widget_sip_new (McAccount *account)
 {
   EmpathyAccountWidgetSip *settings;
-  GladeXML *glade;
+  GtkBuilder *gui;
   gchar *filename;
 
   settings = g_slice_new0 (EmpathyAccountWidgetSip);
   settings->account = g_object_ref (account);
 
-  filename = empathy_file_lookup ("empathy-account-widget-sip.glade",
+  filename = empathy_file_lookup ("empathy-account-widget-sip.ui",
       "libempathy-gtk");
-  glade = empathy_glade_get_file (filename,
-      "vbox_sip_settings",
-      NULL,
+  gui = empathy_builder_get_file (filename,
       "vbox_sip_settings", &settings->vbox_settings,
       "entry_stun-server", &settings->entry_stun_server,
       "spinbutton_stun-port", &settings->spinbutton_stun_part,
@@ -103,37 +95,25 @@ empathy_account_widget_sip_new (McAccount *account)
       NULL);
   g_free (filename);
 
-  empathy_account_widget_handle_params (account, glade,
+  empathy_account_widget_handle_params (account, gui,
       "entry_userid", "account",
       "entry_password", "password",
-      "entry_proxy","proxy-host",
-      "spinbutton_port", "port",
-      "entry_transport", "transport",
-      "checkbutton_discover-binding","discover-binding",
-      "entry_keepalive-mechanism", "keepalive-mechanism",
-      "entry_keepalive-interval", "keepalive-interval",
       "checkbutton_discover-stun", "discover-stun",
       "entry_stun-server", "stun-server",
       "spinbutton_stun-port", "stun-port",
-      "entry_local-ip", "local-ip-address",
-      "spinbutton_local-port", "local-port",
-      "entry_extra-auth-user", "extra-auth-user",
-      "entry_extra-auth-password", "extra-auth-password",
       NULL);
 
-  empathy_account_widget_add_forget_button (account, glade,
+  empathy_account_widget_add_forget_button (account, gui,
                                             "button_forget",
                                             "entry_password");
 
   account_widget_sip_discover_stun_toggled_cb (settings->checkbutton_discover_stun,
                                                settings);
 
-  empathy_glade_connect (glade, settings,
+  empathy_builder_connect (gui, settings,
       "vbox_sip_settings", "destroy", account_widget_sip_destroy_cb,
       "checkbutton_discover-stun", "toggled", account_widget_sip_discover_stun_toggled_cb,
       NULL);
 
-  g_object_unref (glade);
-
-  return settings->vbox_settings;
+  return empathy_builder_unref_and_keep_widget (gui, settings->vbox_settings);
 }