tp-account-widgets: rename all the files from empathy-* to tpaw-*
authorMarco Barisione <marco.barisione@collabora.co.uk>
Wed, 8 May 2013 16:17:30 +0000 (17:17 +0100)
committerMarco Barisione <marco.barisione@collabora.co.uk>
Tue, 20 Aug 2013 10:03:04 +0000 (11:03 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=699492

72 files changed:
libempathy-gtk/empathy-local-xmpp-assistant-widget.c
libempathy-gtk/empathy-new-account-dialog.c
src/empathy-accounts-dialog.c
tests/empathy-irc-network-manager-test.c
tests/empathy-irc-network-test.c
tests/empathy-irc-server-test.c
tests/test-irc-helper.h
tp-account-widgets/.gitignore
tp-account-widgets/Makefile.am
tp-account-widgets/empathy-account-widget-aim.ui [deleted file]
tp-account-widgets/empathy-account-widget-generic.ui [deleted file]
tp-account-widgets/empathy-account-widget-groupwise.ui [deleted file]
tp-account-widgets/empathy-account-widget-icq.ui [deleted file]
tp-account-widgets/empathy-account-widget-irc.c [deleted file]
tp-account-widgets/empathy-account-widget-irc.h [deleted file]
tp-account-widgets/empathy-account-widget-irc.ui [deleted file]
tp-account-widgets/empathy-account-widget-jabber.ui [deleted file]
tp-account-widgets/empathy-account-widget-local-xmpp.ui [deleted file]
tp-account-widgets/empathy-account-widget-msn.ui [deleted file]
tp-account-widgets/empathy-account-widget-private.h [deleted file]
tp-account-widgets/empathy-account-widget-sip.c [deleted file]
tp-account-widgets/empathy-account-widget-sip.h [deleted file]
tp-account-widgets/empathy-account-widget-sip.ui [deleted file]
tp-account-widgets/empathy-account-widget-yahoo.ui [deleted file]
tp-account-widgets/empathy-account-widget.c [deleted file]
tp-account-widgets/empathy-account-widget.h [deleted file]
tp-account-widgets/empathy-account-widgets.gresource.xml [deleted file]
tp-account-widgets/empathy-irc-network-chooser-dialog.c [deleted file]
tp-account-widgets/empathy-irc-network-chooser-dialog.h [deleted file]
tp-account-widgets/empathy-irc-network-chooser.c [deleted file]
tp-account-widgets/empathy-irc-network-chooser.h [deleted file]
tp-account-widgets/empathy-irc-network-dialog.c [deleted file]
tp-account-widgets/empathy-irc-network-dialog.h [deleted file]
tp-account-widgets/empathy-irc-network-manager.c [deleted file]
tp-account-widgets/empathy-irc-network-manager.h [deleted file]
tp-account-widgets/empathy-irc-network.c [deleted file]
tp-account-widgets/empathy-irc-network.h [deleted file]
tp-account-widgets/empathy-irc-networks.dtd [deleted file]
tp-account-widgets/empathy-irc-server.c [deleted file]
tp-account-widgets/empathy-irc-server.h [deleted file]
tp-account-widgets/tpaw-account-widget-aim.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-generic.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-groupwise.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-icq.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-irc.c [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-irc.h [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-irc.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-jabber.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-local-xmpp.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-msn.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-private.h [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-sip.c [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-sip.h [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-sip.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget-yahoo.ui [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget.c [new file with mode: 0644]
tp-account-widgets/tpaw-account-widget.h [new file with mode: 0644]
tp-account-widgets/tpaw-account-widgets.gresource.xml [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-chooser-dialog.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-chooser-dialog.h [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-chooser.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-chooser.h [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-dialog.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-dialog.h [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-manager.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network-manager.h [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-network.h [new file with mode: 0644]
tp-account-widgets/tpaw-irc-networks.dtd [new file with mode: 0644]
tp-account-widgets/tpaw-irc-server.c [new file with mode: 0644]
tp-account-widgets/tpaw-irc-server.h [new file with mode: 0644]
ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c

index 26d2bbf..d9fecc1 100644 (file)
@@ -22,8 +22,8 @@
 #include "empathy-local-xmpp-assistant-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
index b26423f..eaa8b07 100644 (file)
@@ -21,8 +21,8 @@
 #include "empathy-new-account-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
index 2d97199..a175261 100644 (file)
@@ -28,9 +28,9 @@
 #include "empathy-accounts-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
 #include "empathy-accounts-common.h"
-#include "empathy-account-widget.h"
 #include "empathy-import-dialog.h"
 #include "empathy-import-utils.h"
 #include "empathy-local-xmpp-assistant-widget.h"
index ac6d4bb..7b7e7a4 100644 (file)
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
-#include "empathy-irc-network-manager.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
index 2657d78..c784641 100644 (file)
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-network.h>
 
-#include "empathy-irc-network.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
index ff56a02..fc0eb5b 100644 (file)
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-server.h>
 
-#include "empathy-irc-server.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
index 2dedf50..02eda91 100644 (file)
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "empathy-irc-network-manager.h"
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
index 3c37f3d..ac10b9d 100644 (file)
@@ -1 +1 @@
-empathy-account-widgets-resources.[ch]
+tpaw-account-widgets-resources.[ch]
index d0c73bf..0d2d501 100644 (file)
@@ -11,35 +11,35 @@ AM_CPPFLAGS =                                           \
        $(DISABLE_DEPRECATED)
 
 BUILT_SOURCES =                                        \
-       empathy-account-widgets-resources.c             \
-       empathy-account-widgets-resources.h             \
+       tpaw-account-widgets-resources.c                \
+       tpaw-account-widgets-resources.h                \
        $(NULL)
 
 libtp_account_widgets_sources =                \
-       empathy-account-widget.c                \
-       empathy-account-widget-irc.c            \
-       empathy-account-widget-private.h        \
-       empathy-account-widget-sip.c            \
-       empathy-irc-network-chooser.c           \
-       empathy-irc-network-chooser-dialog.c    \
-       empathy-irc-network-dialog.c            \
-       empathy-irc-network-manager.c           \
-       empathy-irc-network.c                   \
-       empathy-irc-server.c                    \
+       tpaw-account-widget.c                   \
+       tpaw-account-widget-irc.c               \
+       tpaw-account-widget-private.h           \
+       tpaw-account-widget-sip.c               \
+       tpaw-irc-network-chooser.c              \
+       tpaw-irc-network-chooser-dialog.c       \
+       tpaw-irc-network-dialog.c               \
+       tpaw-irc-network-manager.c              \
+       tpaw-irc-network.c                      \
+       tpaw-irc-server.c                       \
        totem-subtitle-encoding.c               \
        $(NULL)
 
 libtp_account_widgets_headers =                        \
-       empathy-account-widget.h                \
-       empathy-account-widget-irc.h            \
-       empathy-account-widget-sip.h            \
-       empathy-irc-network-chooser-dialog.h    \
-       empathy-irc-network-chooser.h           \
-       empathy-irc-network-dialog.h            \
-       empathy-irc-network-manager.h           \
-       empathy-irc-network.h                   \
-       empathy-irc-server.h                    \
-       empathy-utils.h                         \
+       tpaw-account-widget.h                   \
+       tpaw-account-widget-irc.h               \
+       tpaw-account-widget-sip.h               \
+       tpaw-irc-network-chooser-dialog.h       \
+       tpaw-irc-network-chooser.h              \
+       tpaw-irc-network-dialog.h               \
+       tpaw-irc-network-manager.h              \
+       tpaw-irc-network.h                      \
+       tpaw-irc-server.h                       \
+       tpaw-utils.h                            \
        totem-subtitle-encoding.h               \
        $(NULL)
 
@@ -68,8 +68,8 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-account_widgets_dtd_files =                    \
-       empathy-irc-networks.dtd                \
+account_widgets_dtd_files =            \
+       tpaw-irc-networks.dtd           \
        $(NULL)
 
 ircnetworksdir = $(datadir)/empathy
@@ -77,28 +77,28 @@ ircnetworks_DATA =          \
        irc-networks.xml
 
 account_widgets_ui_files =                     \
-       empathy-account-widget-generic.ui       \
-       empathy-account-widget-jabber.ui        \
-       empathy-account-widget-msn.ui           \
-       empathy-account-widget-sip.ui           \
-       empathy-account-widget-local-xmpp.ui    \
-       empathy-account-widget-irc.ui           \
-       empathy-account-widget-icq.ui           \
-       empathy-account-widget-yahoo.ui         \
-       empathy-account-widget-groupwise.ui     \
-       empathy-account-widget-aim.ui           \
+       tpaw-account-widget-generic.ui          \
+       tpaw-account-widget-jabber.ui           \
+       tpaw-account-widget-msn.ui              \
+       tpaw-account-widget-sip.ui              \
+       tpaw-account-widget-local-xmpp.ui       \
+       tpaw-account-widget-irc.ui              \
+       tpaw-account-widget-icq.ui              \
+       tpaw-account-widget-yahoo.ui            \
+       tpaw-account-widget-groupwise.ui        \
+       tpaw-account-widget-aim.ui              \
        $(NULL)
 
-account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
+account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/tpaw-account-widgets.gresource.xml)
 
-empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+tpaw-account-widgets-resources.c: tpaw-account-widgets.gresource.xml $(account_widgets_resource_files)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
-empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+tpaw-account-widgets-resources.h: tpaw-account-widgets.gresource.xml $(account_widgets_resource_files)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
 
 EXTRA_DIST =                                   \
-       empathy-account-widgets.gresource.xml   \
+       tpaw-account-widgets.gresource.xml      \
        $(account_widgets_dtd_files)            \
        $(account_widgets_ui_files)             \
        $(ircnetworks_DATA)                     \
diff --git a/tp-account-widgets/empathy-account-widget-aim.ui b/tp-account-widgets/empathy-account-widget-aim.ui
deleted file mode 100644 (file)
index 8ceacbf..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5222</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_aim_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_screenname">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Screen _Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_screenname</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_screenname">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; MyScreenName</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_aim_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_screenname_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your AIM screen name?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_screenname_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; MyScreenName</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your AIM password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-generic.ui b/tp-account-widgets/empathy-account-widget-generic.ui
deleted file mode 100644 (file)
index c37da5e..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkVBox" id="vbox_generic_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">150</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">6</property>
-                <property name="resize_mode">queue</property>
-                <child>
-                  <object class="GtkGrid" id="grid_advanced_settings">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-groupwise.ui b/tp-account-widgets/empathy-account-widget-groupwise.ui
deleted file mode 100644 (file)
index cfca2e3..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_groupwise_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_groupwise_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_groupwise_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_groupwise_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your GroupWise User ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your GroupWise password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-icq.ui b/tp-account-widgets/empathy-account-widget-icq.ui
deleted file mode 100644 (file)
index 865a33c..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5222</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_icq_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_uin">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">ICQ _UIN</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_uin</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_uin">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; 123456789</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_charset">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Ch_aracter set</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_charset</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_charset">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_icq_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_uin_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your ICQ UIN?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_uin_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; 123456789</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your ICQ password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-irc.c b/tp-account-widgets/empathy-account-widget-irc.c
deleted file mode 100644 (file)
index 417d309..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#include "config.h"
-#include "empathy-account-widget-irc.h"
-
-#include "empathy-account-widget-private.h"
-#include "empathy-ui-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
-
-typedef struct {
-  TpawAccountWidget *self;
-
-  GtkWidget *vbox_settings;
-
-  GtkWidget *network_chooser;
-} TpawAccountWidgetIrc;
-
-static void
-account_widget_irc_destroy_cb (GtkWidget *widget,
-                               TpawAccountWidgetIrc *settings)
-{
-  g_slice_free (TpawAccountWidgetIrc, settings);
-}
-
-static void
-account_widget_irc_setup (TpawAccountWidgetIrc *settings)
-{
-  gchar *nick = NULL;
-  gchar *fullname = NULL;
-  EmpathyAccountSettings *ac_settings;
-
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  nick = empathy_account_settings_dup_string (ac_settings, "account");
-  fullname = empathy_account_settings_dup_string (ac_settings,
-      "fullname");
-
-  if (nick == NULL)
-    {
-      nick = g_strdup (g_get_user_name ());
-
-      empathy_account_settings_set (ac_settings,
-        "account", g_variant_new_string (nick));
-    }
-
-  if (fullname == NULL)
-    {
-      fullname = g_strdup (g_get_real_name ());
-
-      if (fullname == NULL)
-          fullname = g_strdup (nick);
-
-      empathy_account_settings_set (ac_settings,
-          "fullname", g_variant_new_string (fullname));
-    }
-
-  g_free (nick);
-  g_free (fullname);
-}
-
-static void
-network_changed_cb (TpawIrcNetworkChooser *chooser,
-    TpawAccountWidgetIrc *settings)
-{
-  tpaw_account_widget_changed (settings->self);
-}
-
-/**
- * set_password_prompt_if_needed:
- *
- * If @password is not empty, this function sets the 'password-prompt' param
- * on @ac_settings. This will ensure that Idle actually asks for the password
- * when connecting.
- *
- * Return: %TRUE if the password-prompt param has been changed
- */
-static gboolean
-set_password_prompt_if_needed (EmpathyAccountSettings *ac_settings,
-    const gchar *password)
-{
-  gboolean prompt;
-
-  prompt = !tp_str_empty (password);
-
-  if (prompt == empathy_account_settings_get_boolean (ac_settings,
-        "password-prompt"))
-    return FALSE;
-
-  empathy_account_settings_set (ac_settings, "password-prompt",
-      g_variant_new_boolean (prompt));
-
-  return TRUE;
-}
-
-static void
-entry_password_changed_cb (GtkEntry *entry,
-    TpawAccountWidgetIrc *settings)
-{
-  const gchar *password;
-  EmpathyAccountSettings *ac_settings;
-
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  password = gtk_entry_get_text (entry);
-
-  set_password_prompt_if_needed (ac_settings, password);
-
-  g_object_unref (ac_settings);
-}
-
-TpawIrcNetworkChooser *
-tpaw_account_widget_irc_build (TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **table_common_settings,
-    GtkWidget **box)
-{
-  TpawAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
-  GtkWidget *entry_password;
-  gchar *password;
-
-  settings = g_slice_new0 (TpawAccountWidgetIrc);
-  settings->self = self;
-
-  self->ui_details->gui = empathy_builder_get_resource (filename,
-      "table_irc_settings", table_common_settings,
-      "vbox_irc", box,
-      "table_irc_settings", &settings->vbox_settings,
-      "entry_password", &entry_password,
-      NULL);
-
-  /* Add network chooser button */
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  settings->network_chooser = tpaw_irc_network_chooser_new (ac_settings);
-
-  g_signal_connect (settings->network_chooser, "changed",
-      G_CALLBACK (network_changed_cb), settings);
-
-  gtk_grid_attach (GTK_GRID (*table_common_settings),
-      settings->network_chooser, 1, 0, 1, 1);
-
-  gtk_widget_show (settings->network_chooser);
-
-  account_widget_irc_setup (settings);
-
-  tpaw_account_widget_handle_params (self,
-      "entry_nick", "account",
-      "entry_fullname", "fullname",
-      "entry_password", "password",
-      "entry_quit_message", "quit-message",
-      "entry_username", "username",
-      NULL);
-
-  empathy_builder_connect (self->ui_details->gui, settings,
-      "table_irc_settings", "destroy", account_widget_irc_destroy_cb,
-      NULL);
-
-  self->ui_details->default_focus = g_strdup ("entry_nick");
-
-  g_object_unref (ac_settings);
-
-  /* Automatically set password-prompt when needed */
-  password = empathy_account_settings_dup_string (ac_settings, "password");
-
-  if (set_password_prompt_if_needed (ac_settings, password))
-    {
-      /* Apply right now to save password-prompt */
-      empathy_account_settings_apply_async (ac_settings, NULL, NULL);
-    }
-
-  g_free (password);
-
-  g_signal_connect (entry_password, "changed",
-      G_CALLBACK (entry_password_changed_cb), settings);
-
-  return TPAW_IRC_NETWORK_CHOOSER (settings->network_chooser);
-}
-
-TpawIrcNetworkChooser *
-tpaw_account_widget_irc_build_simple (TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **box)
-{
-  TpawAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
-  GtkAlignment *alignment;
-
-  settings = g_slice_new0 (TpawAccountWidgetIrc);
-  settings->self = self;
-
-  self->ui_details->gui = empathy_builder_get_resource (filename,
-      "vbox_irc_simple", box,
-      "alignment_network_simple", &alignment,
-      NULL);
-
-  /* Add network chooser button */
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  settings->network_chooser = tpaw_irc_network_chooser_new (ac_settings);
-
-  g_signal_connect (settings->network_chooser, "changed",
-      G_CALLBACK (network_changed_cb), settings);
-
-  gtk_container_add (GTK_CONTAINER (alignment), settings->network_chooser);
-
-  gtk_widget_show (settings->network_chooser);
-
-  tpaw_account_widget_handle_params (self,
-      "entry_nick_simple", "account",
-      NULL);
-
-  empathy_builder_connect (self->ui_details->gui, settings,
-      "vbox_irc_simple", "destroy", account_widget_irc_destroy_cb,
-      NULL);
-
-  self->ui_details->default_focus = g_strdup ("entry_nick_simple");
-
-  g_object_unref (ac_settings);
-
-  return TPAW_IRC_NETWORK_CHOOSER (settings->network_chooser);
-}
diff --git a/tp-account-widgets/empathy-account-widget-irc.h b/tp-account-widgets/empathy-account-widget-irc.h
deleted file mode 100644 (file)
index 991ab9a..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#ifndef __TPAW_ACCOUNT_WIDGET_IRC_H__
-#define __TPAW_ACCOUNT_WIDGET_IRC_H__
-
-#include "empathy-account-widget.h"
-#include "empathy-irc-network-chooser.h"
-
-G_BEGIN_DECLS
-
-TpawIrcNetworkChooser * tpaw_account_widget_irc_build (
-    TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **table_common_settings,
-    GtkWidget **box);
-
-TpawIrcNetworkChooser * tpaw_account_widget_irc_build_simple (
-    TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **box);
-
-G_END_DECLS
-
-#endif /* __TPAW_ACCOUNT_WIDGET_IRC_H__ */
diff --git a/tp-account-widgets/empathy-account-widget-irc.ui b/tp-account-widgets/empathy-account-widget-irc.ui
deleted file mode 100644 (file)
index fc72974..0000000
+++ /dev/null
@@ -1,603 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkDialog" id="irc_network_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Network</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">gtk-edit</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox10">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkGrid" id="greid14">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label_network">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Network</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_charset">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Character set</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry_network">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="combobox_charset">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_network1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Network</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkGrid" id="grid15">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                        <object class="GtkVBox" id="vbox1">
-                        <property name="visible">True</property>
-                       <property name="spacing">0</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow_network_server">
-                        <property name="height_request">120</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
-                        <property name="expand">True</property>
-                        <child>
-                          <object class="GtkTreeView" id="treeview_servers">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="enable_search">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolbar" id="toolbar_network_server">
-                        <property name="visible">True</property>
-                        <property name="icon_size">1</property>
-                        <style>
-                          <class name="inline-toolbar"/>
-                        </style>
-                        <child>
-                          <object class="GtkToolButton" id="button_add">
-                            <property name="tooltip-text" translatable="yes">Add…</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">list-add-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_remove">
-                            <property name="tooltip-text" translatable="yes">Remove</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">list-remove-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_up">
-                            <property name="tooltip-text" translatable="yes" comments="Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority">Up</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">go-up-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_down">
-                            <property name="tooltip-text" translatable="yes" comments="Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority">Down</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">go-down-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-               </object>
-              </child>
-             </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_servers">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Servers</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-7">button_close</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkVBox" id="vbox_irc">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkGrid" id="table_irc_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_nick">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password_note">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">Most IRC servers don't need a password, so if you're not sure, don't enter a password.</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_network2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Network</property>
-            <property name="use_underline">True</property>A
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_nick">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Nickname</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_nick</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_irc_settings1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
-            <child>
-              <object class="GtkEntry" id="entry_quit_message">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_quit_message">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Quit message</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_fullname">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_fullname">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Real name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_nick</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Username</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_username">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label_advanced">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_irc_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_network_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Which IRC network?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_network_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_nick_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your IRC nickname?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_nick_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_nick_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sg_field_labels">
-    <widgets>
-      <widget name="label_network2"/>
-      <widget name="label_nick"/>
-      <widget name="label_password"/>
-      <widget name="label_username"/>
-      <widget name="label_fullname"/>
-      <widget name="label_quit_message"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-jabber.ui b/tp-account-widgets/empathy-account-widget-jabber.ui
deleted file mode 100644 (file)
index 8422daa..0000000
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">127</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">65555</property>
-    <property name="value">5222</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_fb_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Facebook username?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_fb_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_fb_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">4</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">This is your username, not your normal Facebook login.
-If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Facebook password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_fb_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="xalign">0</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_gtalk_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Google ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox1b">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="spacing">4</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_g_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_g_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Google password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_g_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_jabber_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="valign">start</property>
-            <property name="hexpand">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="vbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <child>
-              <object class="GtkLabel" id="label_username_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username_g_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username_f_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes" comments="This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.">This is your username, not your normal Facebook login.
-If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="hexpand">True</property>
-            <property name="use_action_appearance">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="justify">right</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">200</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkGrid" id="grid_advanced_settings">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkEntry" id="entry_resource">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spinbutton_priority">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="adjustment">adjustment1</property>
-                        <property name="climb_rate">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors">
-                        <property name="label" translatable="yes">I_gnore SSL certificate errors</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_priority">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Priori_ty</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">spinbutton_priority</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_resource">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Reso_urce</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">entry_resource</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_encryption">
-                        <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Override server settings</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_server">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Server</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">entry_server</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_port">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Port</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">spinbutton_port</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_ssl">
-                        <property name="label" translatable="yes">Use old SS_L</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry_server">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spinbutton_port">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="adjustment">adjustment2</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_jabber_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Jabber ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_id_create">
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your desired Jabber ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox1a">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="spacing">4</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Jabber password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_create">
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your desired Jabber password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">5</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">6</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-local-xmpp.ui b/tp-account-widgets/empathy-account-widget-local-xmpp.ui
deleted file mode 100644 (file)
index 460c41c..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkVBox" id="vbox_salut_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkEntry" id="entry_nickname">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_last_name">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_first_name">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_nickname">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Nic_kname</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_nickname</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_last_name">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Last Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_last_name</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_first_name">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_First Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_first_name</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkEntry" id="entry_published">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_published">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Published Name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_published</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_jid">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_email">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_jid">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Jabber ID</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_jid</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_email">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">E-_mail address</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_email</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sg_field_labels">
-    <widgets>
-      <widget name="label_nickname"/>
-      <widget name="label_last_name"/>
-      <widget name="label_first_name"/>
-      <widget name="label_published"/>
-      <widget name="label_jid"/>
-      <widget name="label_email"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-msn.ui b/tp-account-widgets/empathy-account-widget-msn.ui
deleted file mode 100644 (file)
index 4b0614f..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_msn_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_msn_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@hotmail.com</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_msn_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_msn_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@hotmail.com</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-private.h b/tp-account-widgets/empathy-account-widget-private.h
deleted file mode 100644 (file)
index 6b5c060..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2009 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
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- */
-
-#ifndef __TPAW_ACCOUNT_WIDGET_PRIVATE_H__
-#define __TPAW_ACCOUNT_WIDGET_PRIVATE_H__
-
-#include "empathy-account-widget.h"
-
-G_BEGIN_DECLS
-
-struct _TpawAccountWidgetUIDetails {
-  GtkBuilder *gui;
-
-  char *default_focus;
-};
-
-
-void tpaw_account_widget_handle_params (TpawAccountWidget *self,
-    const gchar *first_widget,
-    ...);
-
-void tpaw_account_widget_setup_widget (TpawAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *param_name);
-
-G_END_DECLS
-
-#endif /* __TPAW_ACCOUNT_WIDGET_PRIVATE_H__ */
diff --git a/tp-account-widgets/empathy-account-widget-sip.c b/tp-account-widgets/empathy-account-widget-sip.c
deleted file mode 100644 (file)
index eb4a27a..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Guillaume Desmottes <gdesmott@gnome.org>
- *          Frederic Peters <fpeters@0d.be>
- */
-
-#include "config.h"
-#include "empathy-account-widget-sip.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-account-widget-private.h"
-#include "empathy-ui-utils.h"
-
-typedef struct {
-  TpawAccountWidget *self;
-  GtkWidget *vbox_settings;
-
-  GtkWidget *label_stun_server;
-  GtkWidget *entry_stun_server;
-  GtkWidget *label_stun_port;
-  GtkWidget *spinbutton_stun_port;
-  GtkWidget *checkbutton_discover_stun;
-  GtkWidget *combobox_transport;
-  GtkWidget *combobox_keep_alive_mechanism;
-  GtkWidget *spinbutton_keepalive_interval;
-} TpawAccountWidgetSip;
-
-static void
-account_widget_sip_destroy_cb (GtkWidget *widget,
-                               TpawAccountWidgetSip *settings)
-{
-  g_slice_free (TpawAccountWidgetSip, settings);
-}
-
-static void
-account_widget_sip_discover_stun_toggled_cb (
-    GtkWidget *checkbox,
-    TpawAccountWidgetSip *settings)
-{
-  gboolean active;
-
-  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
-  gtk_widget_set_sensitive (settings->label_stun_server, !active);
-  gtk_widget_set_sensitive (settings->entry_stun_server, !active);
-  gtk_widget_set_sensitive (settings->label_stun_port, !active);
-  gtk_widget_set_sensitive (settings->spinbutton_stun_port, !active);
-}
-
-static void
-keep_alive_mechanism_combobox_change_cb (GtkWidget *widget,
-    TpawAccountWidgetSip *self)
-{
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  gchar *mechanism;
-  gboolean enabled;
-
-  /* Unsensitive the keep-alive spin button if keep-alive is disabled */
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
-    return;
-
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-  gtk_tree_model_get (model, &iter, 0, &mechanism, -1);
-
-  enabled = tp_strdiff (mechanism, "none");
-
-  gtk_widget_set_sensitive (self->spinbutton_keepalive_interval, enabled);
-  g_free (mechanism);
-}
-
-static void
-checkbutton_tel_toggled (
-    GtkWidget *checkbox,
-    TpawAccountWidgetSip *sip_settings)
-{
-  EmpathyAccountSettings *settings;
-
-  settings = tpaw_account_widget_get_settings (sip_settings->self);
-
-  empathy_account_settings_set_uri_scheme_tel (settings,
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)));
-
-  tpaw_account_widget_changed (sip_settings->self);
-}
-
-GtkWidget *
-tpaw_account_widget_sip_build (TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **grid_common_settings)
-{
-  TpawAccountWidgetSip *settings;
-  GtkWidget *vbox_settings;
-  gboolean is_simple;
-  GtkWidget *grid_advanced;
-
-  g_object_get (self, "simple", &is_simple, NULL);
-
-  if (is_simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_sip_simple", &vbox_settings,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_userid_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_userid_simple");
-    }
-  else
-    {
-      GtkListStore *store;
-      GtkCellRenderer *renderer;
-      GtkToggleButton *checkbutton_tel;
-
-      settings = g_slice_new0 (TpawAccountWidgetSip);
-      settings->self = self;
-
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_settings", grid_common_settings,
-          "grid_advanced_sip_settings", &grid_advanced,
-          "vbox_sip_settings", &vbox_settings,
-          "label_stun-server", &settings->label_stun_server,
-          "entry_stun-server", &settings->entry_stun_server,
-          "label_stun-port", &settings->label_stun_port,
-          "spinbutton_stun-port", &settings->spinbutton_stun_port,
-          "checkbutton_discover-stun", &settings->checkbutton_discover_stun,
-          "spinbutton_keepalive-interval",
-            &settings->spinbutton_keepalive_interval,
-          "checkbutton_tel", &checkbutton_tel,
-          NULL);
-      settings->vbox_settings = vbox_settings;
-
-      gtk_toggle_button_set_active (checkbutton_tel,
-          empathy_account_settings_has_uri_scheme_tel (
-            tpaw_account_widget_get_settings (self)));
-
-      tpaw_account_widget_handle_params (self,
-          "entry_userid", "account",
-          "entry_password", "password",
-          "checkbutton_discover-stun", "discover-stun",
-          "entry_stun-server", "stun-server",
-          "spinbutton_stun-port", "stun-port",
-          "entry_auth-user", "auth-user",
-          "entry_proxy-host", "proxy-host",
-          "spinbutton_port", "port",
-          "checkbutton_loose-routing", "loose-routing",
-          "checkbutton_discover-binding", "discover-binding",
-          "spinbutton_keepalive-interval", "keepalive-interval",
-          "checkbutton_ignore-tls-errors", "ignore-tls-errors",
-          "entry_local-ip-address", "local-ip-address",
-          "spinbutton_local-port", "local-port",
-          NULL);
-
-      account_widget_sip_discover_stun_toggled_cb (
-          settings->checkbutton_discover_stun,
-          settings);
-
-      empathy_builder_connect (self->ui_details->gui, settings,
-          "vbox_sip_settings", "destroy", account_widget_sip_destroy_cb,
-          "checkbutton_discover-stun", "toggled",
-          account_widget_sip_discover_stun_toggled_cb,
-          "checkbutton_tel", "toggled", checkbutton_tel_toggled,
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_userid");
-
-      /* Create the 'transport' combo box. The first column has to contain the
-       * value of the param. */
-      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-      settings->combobox_transport = gtk_combo_box_new_with_model (
-          GTK_TREE_MODEL (store));
-
-      renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (
-          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, TRUE);
-      gtk_cell_layout_add_attribute (
-          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, "text", 1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "auto", 1, _("Auto"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "udp", 1, _("UDP"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "tcp", 1, _("TCP"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "tls", 1, _("TLS"), -1);
-
-      tpaw_account_widget_setup_widget (self, settings->combobox_transport,
-          "transport");
-
-      gtk_grid_attach (GTK_GRID (grid_advanced), settings->combobox_transport,
-          1, 11, 3, 1);
-
-      gtk_widget_show (settings->combobox_transport);
-
-      /* Create the 'keep-alive mechanism' combo box */
-      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-      settings->combobox_keep_alive_mechanism = gtk_combo_box_new_with_model (
-          GTK_TREE_MODEL (store));
-
-      renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (
-          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
-          TRUE);
-      gtk_cell_layout_add_attribute (
-          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
-          "text", 1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "auto", 1, _("Auto"), -1);
-
-      /* translators: this string is very specific to SIP's internal; maybe
-       * best to keep the English version. */
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "register", 1, _("Register"), -1);
-
-      /* translators: this string is very specific to SIP's internal; maybe
-       * best to keep the English version. */
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "options", 1, _("Options"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "none", 1, _("None"), -1);
-
-      g_signal_connect (settings->combobox_keep_alive_mechanism, "changed",
-          G_CALLBACK (keep_alive_mechanism_combobox_change_cb), settings);
-
-      tpaw_account_widget_setup_widget (self,
-          settings->combobox_keep_alive_mechanism, "keepalive-mechanism");
-
-      gtk_grid_attach (GTK_GRID (grid_advanced),
-          settings->combobox_keep_alive_mechanism,
-          1, 7, 3, 1);
-
-      gtk_widget_show (settings->combobox_keep_alive_mechanism);
-    }
-
-  return vbox_settings;
-}
diff --git a/tp-account-widgets/empathy-account-widget-sip.h b/tp-account-widgets/empathy-account-widget-sip.h
deleted file mode 100644 (file)
index aac3004..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Frederic Peters <fpeters@0d.be>
- */
-
-#ifndef __TPAW_ACCOUNT_WIDGET_SIP_H__
-#define __TPAW_ACCOUNT_WIDGET_SIP_H__
-
-#include "empathy-account-widget.h"
-
-G_BEGIN_DECLS
-
-GtkWidget * tpaw_account_widget_sip_build (TpawAccountWidget *self,
-    const char *filename,
-    GtkWidget **grid_common_settings);
-
-G_END_DECLS
-
-#endif /* __TPAW_ACCOUNT_WIDGET_SIP_H__ */
diff --git a/tp-account-widgets/empathy-account-widget-sip.ui b/tp-account-widgets/empathy-account-widget-sip.ui
deleted file mode 100644 (file)
index 7caa7ca..0000000
+++ /dev/null
@@ -1,731 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">10000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_sip_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_userid">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_userid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Username</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_userid</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@my.sip.server</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="checkbutton_tel">
-            <property name="label" translatable="yes">Use this account to call _landlines and mobile phones</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="use_underline">True</property>
-            <property name="xalign">0</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="top_attach">4</property>
-            <property name="left_attach">0</property>
-            <property name="width">4</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">200</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="border_width">6</property>
-                    <child>
-                      <object class="GtkGrid" id="grid_advanced_sip_settings">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="entry_stun-server">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_auth-user">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">10</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_proxy-host">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_keepalive-interval">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment3</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">8</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                         <object class="GtkEntry" id="entry_local-ip-address">
-                           <property name="visible">True</property>
-                           <property name="can_focus">True</property>
-                         </object>
-                         <packing>
-                           <property name="left_attach">1</property>
-                           <property name="top_attach">14</property>
-                         </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_nat_traversal">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">NAT Traversal Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_proxy">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Proxy Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">4</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_misc">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Miscellaneous Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">9</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">24</property>
-                            <child>
-                              <object class="GtkLabel" id="label_stun-server">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">STUN Server</property>
-                                <property name="mnemonic_widget">entry_stun-server</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_discover-stun">
-                                <property name="label" translatable="yes">Discover the STUN server automatically</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_discover-binding">
-                                <property name="label" translatable="yes">Discover Binding</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_proxy-host">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Server</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">5</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_keep_alive">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Keep-Alive Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">6</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_keepalive-mechanism">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Mechanism</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">7</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_keepalive-interval">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Interval (seconds)</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">8</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_auth-user">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Authentication username</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">10</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_transport">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Transport</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">11</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_loose-routing">
-                                <property name="label" translatable="yes">Loose Routing</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">12</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_ignore-tls-errors">
-                                <property name="label" translatable="yes">Ignore TLS Errors</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">13</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_stun-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                            <property name="mnemonic_widget">spinbutton_stun-port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_stun-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="climb_rate">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment2</property>
-                            <property name="climb_rate">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_local-ip-address">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Local IP Address</property>
-                                <property name="mnemonic_widget">entry_local-ip-address</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_local-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                            <property name="mnemonic_widget">spinbutton_local-port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_local-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment4</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label_expander">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_sip_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_userid_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your SIP login ID?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_userid_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@my.sip.server</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your SIP account password?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget-yahoo.ui b/tp-account-widgets/empathy-account-widget-yahoo.ui
deleted file mode 100644 (file)
index 9d00253..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5050</property>
-    <property name="lower">1</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_yahoo_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Yahoo! I_D:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkGrid" id="grid_advanced_settings">
-                <property name="visible">True</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_ignore_invites">
-                    <property name="label" translatable="yes">I_gnore conference and chat room invitations</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_locale">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Room List locale:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_locale</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_charset">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ch_aracter set:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_charset</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_locale">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_charset">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_port">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Port:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">spinbutton_port</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinbutton_port">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">adjustment1</property>
-                    <property name="climb_rate">1</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_yahoo_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Yahoo! ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Yahoo! password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/tp-account-widgets/empathy-account-widget.c b/tp-account-widgets/empathy-account-widget.c
deleted file mode 100644 (file)
index a26d2ab..0000000
+++ /dev/null
@@ -1,2331 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007-2009 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
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- *          Jonathan Tellier <jonathan.tellier@gmail.com>
- *          Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#include "config.h"
-#include "empathy-account-widget.h"
-#include "empathy-account-widget-private.h"
-
-#include <glib/gi18n-lib.h>
-#include <dbus/dbus-protocol.h>
-
-#include "empathy-account-widget-irc.h"
-#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
-#include "empathy-ui-utils.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
-
-G_DEFINE_TYPE (TpawAccountWidget, tpaw_account_widget, GTK_TYPE_BOX)
-
-typedef enum
-{
-  NO_SERVICE = 0,
-  GTALK_SERVICE,
-  FACEBOOK_SERVICE,
-  N_SERVICES
-} Service;
-
-typedef struct
-{
-  const gchar *label_username_example;
-  gboolean show_advanced;
-} ServiceInfo;
-
-static ServiceInfo services_infos[N_SERVICES] = {
-    { "label_username_example", TRUE },
-    { "label_username_g_example", FALSE },
-    { "label_username_f_example", FALSE },
-};
-
-struct _TpawAccountWidgetPriv {
-  EmpathyAccountSettings *settings;
-
-  GtkWidget *grid_common_settings;
-  GtkWidget *apply_button;
-  GtkWidget *cancel_button;
-  GtkWidget *entry_password;
-  GtkWidget *spinbutton_port;
-  GtkWidget *radiobutton_reuse;
-  GtkWidget *hbox_buttons;
-
-  gboolean simple;
-
-  gboolean contains_pending_changes;
-
-  /* An TpawAccountWidget can be used to either create an account or
-   * modify it. When we are creating an account, this member is set to TRUE */
-  gboolean creating_account;
-
-  /* whether there are any other real accounts. Necessary so we know whether
-   * it's safe to dismiss this widget in some cases (eg, whether the Cancel
-   * button should be sensitive) */
-  gboolean other_accounts_exist;
-
-  /* if TRUE, the GTK+ destroy signal has been fired and so the widgets
-   * embedded in this account widget can't be used any more
-   * workaround because some async callbacks can be called after the
-   * widget has been destroyed */
-  gboolean destroyed;
-
-  TpAccountManager *account_manager;
-
-  GtkWidget *param_account_widget;
-  GtkWidget *param_password_widget;
-
-  gboolean automatic_change;
-  GtkWidget *remember_password_widget;
-
-  /* Used only for IRC accounts */
-  TpawIrcNetworkChooser *irc_network_chooser;
-
-  /* Used for 'special' XMPP account having a service associated ensuring that
-   * JIDs have a specific suffix; such as Facebook for example */
-  gchar *jid_suffix;
-};
-
-enum {
-  PROP_PROTOCOL = 1,
-  PROP_SETTINGS,
-  PROP_SIMPLE,
-  PROP_CREATING_ACCOUNT,
-  PROP_OTHER_ACCOUNTS_EXIST,
-};
-
-enum {
-  HANDLE_APPLY,
-  ACCOUNT_CREATED,
-  CANCELLED,
-  CLOSE,
-  LAST_SIGNAL
-};
-
-enum {
-  RESPONSE_LAUNCH
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-#define CHANGED_TIMEOUT 300
-
-#define DIGIT             "0-9"
-#define DIGITS            "(["DIGIT"]+)"
-#define ALPHA             "a-zA-Z"
-#define ALPHAS            "(["ALPHA"]+)"
-#define ALPHADIGIT        ALPHA DIGIT
-#define ALPHADIGITS       "(["ALPHADIGIT"]+)"
-#define ALPHADIGITDASH    ALPHA DIGIT "-"
-#define ALPHADIGITDASHS   "(["ALPHADIGITDASH"]*)"
-
-#define HOSTNUMBER        "("DIGITS"\\."DIGITS"\\."DIGITS"\\."DIGITS")"
-#define TOPLABEL          "("ALPHAS \
-                            "| (["ALPHA"]"ALPHADIGITDASHS "["ALPHADIGIT"]))"
-#define DOMAINLABEL       "("ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
-                                       "["ALPHADIGIT"]))"
-#define HOSTNAME          "((" DOMAINLABEL "\\.)+" TOPLABEL ")"
-/* Based on http://www.ietf.org/rfc/rfc1738.txt (section 5) */
-#define HOST              "("HOSTNAME "|" HOSTNUMBER")"
-/* Based on http://www.ietf.org/rfc/rfc0822.txt (appendix D) */
-#define EMAIL_LOCALPART   "([^\\(\\)<>@,;:\\\\\"\\[\\]\\s]+)"
-
-/* UIN is digital according to the unofficial specification:
- * http://iserverd.khstu.ru/docum_ext/icqv5.html#CTS
- * 5 digits minimum according to http://en.wikipedia.org/wiki/ICQ#UIN
- * According to an user, we can also provide an email address instead of the
- * ICQ UIN. */
-#define ICQ_USER_NAME     "((["DIGIT"]{5,})|"EMAIL_LOCALPART"@"HOST")"
-
-/* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */
-#define IRC_SPECIAL       "_\\[\\]{}\\\\|`^"
-#define IRC_NICK_NAME     "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
-
-/* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2)
- * We just exclude invalid characters to avoid ucschars and other redundant
- * complexity */
-#define JABBER_USER_NAME  "([^@:'\"<>&\\s]+)"
-/* ID is an email according to the unofficial specification:
- * http://www.hypothetic.org/docs/msn/general/names.php */
-#define MSN_USER_NAME     EMAIL_LOCALPART
-/* Based on the official help:
- * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html
- * Looks like an email address can be used as well (bgo #655959)
- * */
-#define YAHOO_USER_NAME   "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})|("EMAIL_LOCALPART"@"HOST")"
-
-#define ACCOUNT_REGEX_ICQ      "^"ICQ_USER_NAME"$"
-#define ACCOUNT_REGEX_IRC      "^"IRC_NICK_NAME"$"
-#define ACCOUNT_REGEX_JABBER   "^"JABBER_USER_NAME"@[^@/]+"
-#define ACCOUNT_REGEX_MSN      "^"MSN_USER_NAME"@"HOST"$"
-#define ACCOUNT_REGEX_YAHOO    "^"YAHOO_USER_NAME"$"
-
-static void
-account_widget_set_control_buttons_sensitivity (TpawAccountWidget *self,
-    gboolean sensitive)
-{
-  /* we hit this case because of the 'other-accounts-exist' property handler
-   * being called during init (before constructed()) */
-  if (self->priv->apply_button == NULL || self->priv->cancel_button == NULL)
-    return;
-
-  gtk_widget_set_sensitive (self->priv->apply_button, sensitive);
-
-  if (sensitive)
-    {
-      /* We can't grab default if the widget hasn't be packed in a
-       * window */
-      GtkWidget *window;
-
-      window = gtk_widget_get_toplevel (self->priv->apply_button);
-      if (window != NULL &&
-          gtk_widget_is_toplevel (window))
-        {
-          gtk_widget_set_can_default (self->priv->apply_button, TRUE);
-          gtk_widget_grab_default (self->priv->apply_button);
-        }
-    }
-}
-
-static void
-account_widget_set_entry_highlighting (GtkEntry *entry,
-    gboolean highlight)
-{
-  g_return_if_fail (GTK_IS_ENTRY (entry));
-
-  if (highlight)
-    {
-      GtkStyleContext *style;
-      GdkRGBA color;
-
-      style = gtk_widget_get_style_context (GTK_WIDGET (entry));
-      gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
-          &color);
-
-      /* Here we take the current theme colour and add it to
-       * the colour for white and average the two. This
-       * gives a colour which is inline with the theme but
-       * slightly whiter.
-       */
-      empathy_make_color_whiter (&color);
-
-      gtk_widget_override_background_color (GTK_WIDGET (entry), 0, &color);
-    }
-  else
-    {
-      gtk_widget_override_background_color (GTK_WIDGET (entry), 0, NULL);
-    }
-}
-
-static void
-account_widget_handle_control_buttons_sensitivity (TpawAccountWidget *self)
-{
-  gboolean is_valid;
-
-  is_valid = empathy_account_settings_is_valid (self->priv->settings);
-
-  account_widget_set_control_buttons_sensitivity (self, is_valid);
-
-  g_signal_emit (self, signals[HANDLE_APPLY], 0, is_valid);
-}
-
-static void
-account_widget_entry_changed_common (TpawAccountWidget *self,
-    GtkEntry *entry, gboolean focus)
-{
-  const gchar *str;
-  const gchar *param_name;
-  gboolean prev_status;
-  gboolean curr_status;
-
-  str = gtk_entry_get_text (entry);
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  prev_status = empathy_account_settings_parameter_is_valid (
-      self->priv->settings, param_name);
-
-  if (EMP_STR_EMPTY (str))
-    {
-      empathy_account_settings_unset (self->priv->settings, param_name);
-
-      if (focus)
-        {
-          gchar *value;
-
-          value = empathy_account_settings_dup_string (self->priv->settings,
-              param_name);
-
-          DEBUG ("Unset %s and restore to %s", param_name, value);
-          gtk_entry_set_text (entry, value ? value : "");
-          g_free (value);
-        }
-    }
-  else
-    {
-      DEBUG ("Setting %s to %s", param_name,
-          tp_strdiff (param_name, "password") ? str : "***");
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_string (str));
-    }
-
-  curr_status = empathy_account_settings_parameter_is_valid (
-      self->priv->settings, param_name);
-
-  if (curr_status != prev_status)
-    account_widget_set_entry_highlighting (entry, !curr_status);
-}
-
-static void
-account_widget_entry_changed_cb (GtkEditable *entry,
-    TpawAccountWidget *self)
-{
-  if (self->priv->automatic_change)
-    return;
-
-  account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
-  tpaw_account_widget_changed (self);
-}
-
-static void
-account_widget_entry_map_cb (GtkEntry *entry,
-    TpawAccountWidget *self)
-{
-  const gchar *param_name;
-  gboolean is_valid;
-
-  /* need to initialize input highlighting */
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  is_valid = empathy_account_settings_parameter_is_valid (self->priv->settings,
-      param_name);
-  account_widget_set_entry_highlighting (entry, !is_valid);
-}
-
-static void
-account_widget_int_changed_cb (GtkWidget *widget,
-    TpawAccountWidget *self)
-{
-  const gchar *param_name;
-  gint value;
-  const gchar *signature;
-
-  value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  signature = empathy_account_settings_get_dbus_signature (self->priv->settings,
-    param_name);
-  g_return_if_fail (signature != NULL);
-
-  DEBUG ("Setting %s to %d", param_name, value);
-
-  switch ((int)*signature)
-    {
-    case DBUS_TYPE_INT16:
-    case DBUS_TYPE_INT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_int32 (value));
-      break;
-    case DBUS_TYPE_INT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_int64 (value));
-      break;
-    case DBUS_TYPE_UINT16:
-    case DBUS_TYPE_UINT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_uint32 (value));
-      break;
-    case DBUS_TYPE_UINT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_uint64 (value));
-      break;
-    default:
-      g_return_if_reached ();
-    }
-
-  tpaw_account_widget_changed (self);
-}
-
-static void
-account_widget_checkbutton_toggled_cb (GtkWidget *widget,
-    TpawAccountWidget *self)
-{
-  gboolean     value;
-  gboolean     default_value;
-  const gchar *param_name;
-
-  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  /* FIXME: This is ugly! checkbox don't have a "not-set" value so we
-   * always unset the param and set the value if different from the
-   * default value. */
-  empathy_account_settings_unset (self->priv->settings, param_name);
-  default_value = empathy_account_settings_get_boolean (self->priv->settings,
-      param_name);
-
-  if (default_value == value)
-    {
-      DEBUG ("Unset %s and restore to %d", param_name, default_value);
-    }
-  else
-    {
-      DEBUG ("Setting %s to %d", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_boolean (value));
-    }
-
-  tpaw_account_widget_changed (self);
-}
-
-static void
-account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
-    TpawAccountWidget *self)
-{
-  gboolean   value;
-  gint32       port = 0;
-
-  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
-  port = empathy_account_settings_get_uint32 (self->priv->settings, "port");
-
-  if (value)
-    {
-      if (port == 5222 || port == 0)
-        port = 5223;
-    }
-  else
-    {
-      if (port == 5223 || port == 0)
-        port = 5222;
-    }
-
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (self->priv->spinbutton_port),
-      port);
-
-  self->priv->contains_pending_changes = TRUE;
-}
-
-static void
-account_widget_combobox_changed_cb (GtkWidget *widget,
-    TpawAccountWidget *self)
-{
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  const gchar *value;
-  GVariant *v;
-  const gchar *default_value = NULL;
-  const gchar *param_name;
-
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
-    return;
-
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-  /* the param value is stored in the first column */
-  gtk_tree_model_get (model, &iter, 0, &value, -1);
-
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  v = empathy_account_settings_dup_default (self->priv->settings, param_name);
-  if (v != NULL && g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
-    default_value = g_variant_get_string (v, NULL);
-
-  if (!tp_strdiff (value, default_value))
-    {
-      DEBUG ("Unset %s and restore to %s", param_name, default_value);
-      empathy_account_settings_unset (self->priv->settings, param_name);
-    }
-  else
-    {
-      DEBUG ("Setting %s to %s", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_string (value));
-    }
-
-  tpaw_account_widget_changed (self);
-
-  tp_clear_pointer (&v, g_variant_unref);
-}
-
-static void
-clear_icon_released_cb (GtkEntry *entry,
-    GtkEntryIconPosition icon_pos,
-    GdkEvent *event,
-    TpawAccountWidget *self)
-{
-  const gchar *param_name;
-
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-
-  DEBUG ("Unset %s", param_name);
-  empathy_account_settings_unset (self->priv->settings, param_name);
-  gtk_entry_set_text (entry, "");
-
-  tpaw_account_widget_changed (self);
-}
-
-static void
-password_entry_changed_cb (GtkEditable *entry,
-    TpawAccountWidget *self)
-{
-  const gchar *str;
-
-  str = gtk_entry_get_text (GTK_ENTRY (entry));
-
-  gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-      GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
-}
-
-static void
-password_entry_activated_cb (GtkEntry *entry,
-    TpawAccountWidget *self)
-{
-    if (gtk_widget_get_sensitive (self->priv->apply_button))
-        tpaw_account_widget_apply_and_log_in (self);
-}
-
-static void
-account_entry_activated_cb (GtkEntry *entry,
-    TpawAccountWidget *self)
-{
-    if (gtk_widget_get_sensitive (self->priv->apply_button))
-        tpaw_account_widget_apply_and_log_in (self);
-}
-
-void
-tpaw_account_widget_setup_widget (TpawAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *param_name)
-{
-  g_object_set_data_full (G_OBJECT (widget), "param_name",
-      g_strdup (param_name), g_free);
-
-  if (GTK_IS_SPIN_BUTTON (widget))
-    {
-      gint value = 0;
-      const gchar *signature;
-
-      signature = empathy_account_settings_get_dbus_signature (
-          self->priv->settings, param_name);
-      g_return_if_fail (signature != NULL);
-
-      switch ((int)*signature)
-        {
-          case DBUS_TYPE_INT16:
-          case DBUS_TYPE_INT32:
-            value = empathy_account_settings_get_int32 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_INT64:
-            value = empathy_account_settings_get_int64 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_UINT16:
-          case DBUS_TYPE_UINT32:
-            value = empathy_account_settings_get_uint32 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_UINT64:
-            value = empathy_account_settings_get_uint64 (self->priv->settings,
-                param_name);
-            break;
-          default:
-            g_return_if_reached ();
-        }
-
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-
-      g_signal_connect (widget, "value-changed",
-          G_CALLBACK (account_widget_int_changed_cb),
-          self);
-    }
-  else if (GTK_IS_ENTRY (widget))
-    {
-      gchar *str;
-
-      str = empathy_account_settings_dup_string (self->priv->settings,
-          param_name);
-      gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
-
-      if (!tp_strdiff (param_name, "account"))
-        self->priv->param_account_widget = widget;
-      else if (!tp_strdiff (param_name, "password"))
-        self->priv->param_password_widget = widget;
-
-      if (strstr (param_name, "password"))
-        {
-          gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
-
-          /* Add 'clear' icon */
-          gtk_entry_set_icon_from_stock (GTK_ENTRY (widget),
-              GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
-
-          gtk_entry_set_icon_sensitive (GTK_ENTRY (widget),
-              GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
-
-          g_signal_connect (widget, "icon-release",
-              G_CALLBACK (clear_icon_released_cb), self);
-          g_signal_connect (widget, "changed",
-              G_CALLBACK (password_entry_changed_cb), self);
-          g_signal_connect (widget, "activate",
-              G_CALLBACK (password_entry_activated_cb), self);
-        }
-      else if (strstr (param_name, "account"))
-        g_signal_connect (widget, "activate",
-            G_CALLBACK (account_entry_activated_cb), self);
-
-      g_signal_connect (widget, "changed",
-          G_CALLBACK (account_widget_entry_changed_cb), self);
-      g_signal_connect (widget, "map",
-          G_CALLBACK (account_widget_entry_map_cb), self);
-
-      g_free (str);
-    }
-  else if (GTK_IS_TOGGLE_BUTTON (widget))
-    {
-      gboolean value = FALSE;
-
-      value = empathy_account_settings_get_boolean (self->priv->settings,
-          param_name);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-
-      g_signal_connect (widget, "toggled",
-          G_CALLBACK (account_widget_checkbutton_toggled_cb),
-          self);
-    }
-  else if (GTK_IS_COMBO_BOX (widget))
-    {
-      /* The combo box's model has to contain the param value in its first
-       * column (as a string) */
-      gchar *str;
-      GtkTreeModel *model;
-      GtkTreeIter iter;
-      gboolean valid;
-
-      str = empathy_account_settings_dup_string (self->priv->settings,
-          param_name);
-      model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-
-      valid = gtk_tree_model_get_iter_first (model, &iter);
-      while (valid)
-        {
-          gchar *name;
-
-          gtk_tree_model_get (model, &iter, 0, &name, -1);
-          if (!tp_strdiff (name, str))
-            {
-              gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &iter);
-              valid = FALSE;
-            }
-          else
-            {
-              valid = gtk_tree_model_iter_next (model, &iter);
-            }
-
-          g_free (name);
-        }
-
-      g_free (str);
-
-      g_signal_connect (widget, "changed",
-          G_CALLBACK (account_widget_combobox_changed_cb),
-          self);
-    }
-  else
-    {
-      DEBUG ("Unknown type of widget for param %s", param_name);
-    }
-
-  gtk_widget_set_sensitive (widget,
-      empathy_account_settings_param_is_supported (self->priv->settings,
-        param_name));
-}
-
-static GHashTable *
-build_translated_params (void)
-{
-  GHashTable *hash;
-
-  hash = g_hash_table_new (g_str_hash, g_str_equal);
-  g_hash_table_insert (hash, "account", _("Account"));
-  g_hash_table_insert (hash, "password", _("Password"));
-  g_hash_table_insert (hash, "server", _("Server"));
-  g_hash_table_insert (hash, "port", _("Port"));
-
-  return hash;
-}
-
-static gchar *
-account_widget_generic_format_param_name (const gchar *param_name)
-{
-  gchar *str;
-  gchar *p;
-  static GHashTable *translated_params = NULL;
-
-  g_return_val_if_fail (param_name != NULL, NULL);
-
-  if (G_UNLIKELY (translated_params == NULL))
-    translated_params = build_translated_params ();
-
-  /* Translate most common parameters */
-  str = g_hash_table_lookup (translated_params, param_name);
-  if (str != NULL)
-    return g_strdup (str);
-
-  str = g_strdup (param_name);
-
-  if (str && g_ascii_isalpha (str[0]))
-    str[0] = g_ascii_toupper (str[0]);
-
-  while ((p = strchr (str, '-')) != NULL)
-    {
-      if (p[1] != '\0' && g_ascii_isalpha (p[1]))
-        {
-          p[0] = ' ';
-          p[1] = g_ascii_toupper (p[1]);
-        }
-
-      p++;
-    }
-
-  return str;
-}
-
-static void
-accounts_widget_generic_setup (TpawAccountWidget *self,
-    GtkWidget *grid_common_settings,
-    GtkWidget *grid_advanced_settings)
-{
-  GList *params, *l;
-  guint row_common = 0, row_advanced = 0;
-
-  params = empathy_account_settings_dup_tp_params (self->priv->settings);
-
-  for (l = params; l != NULL; l = g_list_next (l))
-    {
-      TpConnectionManagerParam *param = l->data;
-      GtkWidget       *grid_settings;
-      guint           row;
-      GtkWidget       *widget = NULL;
-      gchar           *param_name_formatted;
-      const gchar *dbus_signature;
-
-      if (tp_connection_manager_param_is_required (param))
-        {
-          grid_settings = grid_common_settings;
-          row = row_common++;
-        }
-      else if (self->priv->simple)
-        {
-          continue;
-        }
-      else
-        {
-          grid_settings = grid_advanced_settings;
-          row = row_advanced++;
-        }
-
-      param_name_formatted = account_widget_generic_format_param_name (
-          tp_connection_manager_param_get_name (param));
-
-      dbus_signature = tp_connection_manager_param_get_dbus_signature (param);
-
-      if (dbus_signature[0] == 's')
-        {
-          gchar *str;
-
-          str = g_strdup_printf (_("%s"), param_name_formatted);
-          widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 1., 0.5);
-          gtk_style_context_add_class (gtk_widget_get_style_context (widget),
-              GTK_STYLE_CLASS_DIM_LABEL);
-          g_free (str);
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 1, 1);
-
-          gtk_widget_show (widget);
-
-          widget = gtk_entry_new ();
-          if (strcmp (tp_connection_manager_param_get_name (param),
-                "account") == 0)
-            {
-              g_signal_connect (widget, "realize",
-                  G_CALLBACK (gtk_widget_grab_focus),
-                  NULL);
-            }
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 1, row, 1, 1);
-
-          gtk_widget_show (widget);
-        }
-      /* int types: ynqiuxt. double type is 'd' */
-      else if (dbus_signature[0] == 'y' ||
-          dbus_signature[0] == 'n' ||
-          dbus_signature[0] == 'q' ||
-          dbus_signature[0] == 'i' ||
-          dbus_signature[0] == 'u' ||
-          dbus_signature[0] == 'x' ||
-          dbus_signature[0] == 't' ||
-          dbus_signature[0] == 'd')
-        {
-          gchar   *str = NULL;
-          gdouble  minint = 0;
-          gdouble  maxint = 0;
-          gdouble  step = 1;
-
-          switch (dbus_signature[0])
-            {
-            case 'y': minint = G_MININT8;  maxint = G_MAXINT8;   break;
-            case 'n': minint = G_MININT16; maxint = G_MAXINT16;  break;
-            case 'q': minint = 0;          maxint = G_MAXUINT16; break;
-            case 'i': minint = G_MININT32; maxint = G_MAXINT32;  break;
-            case 'u': minint = 0;          maxint = G_MAXUINT32; break;
-            case 'x': minint = G_MININT64; maxint = G_MAXINT64;  break;
-            case 't': minint = 0;          maxint = G_MAXUINT64; break;
-            case 'd': minint = G_MININT32; maxint = G_MAXINT32;
-              step = 0.1; break;
-            default: g_assert_not_reached ();
-            }
-
-          str = g_strdup_printf (_("%s:"), param_name_formatted);
-          widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-          g_free (str);
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 1, 1);
-          gtk_widget_show (widget);
-
-          widget = gtk_spin_button_new_with_range (minint, maxint, step);
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 1, row, 1, 1);
-          gtk_widget_show (widget);
-        }
-      else if (dbus_signature[0] == 'b')
-        {
-          widget = gtk_check_button_new_with_label (param_name_formatted);
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 2, 1);
-          gtk_widget_show (widget);
-        }
-      else
-        {
-          DEBUG ("Unknown signature for param %s: %s",
-              param_name_formatted, dbus_signature);
-        }
-
-      if (widget)
-        tpaw_account_widget_setup_widget (self, widget,
-            tp_connection_manager_param_get_name (param));
-
-      g_free (param_name_formatted);
-    }
-
-  g_list_free_full (params, (GDestroyNotify) tp_connection_manager_param_free);
-}
-
-static void
-account_widget_handle_params_valist (TpawAccountWidget *self,
-    const gchar *first_widget,
-    va_list args)
-{
-  GObject *object;
-  const gchar *name;
-
-  for (name = first_widget; name; name = va_arg (args, const gchar *))
-    {
-      const gchar *param_name;
-
-      param_name = va_arg (args, const gchar *);
-      object = gtk_builder_get_object (self->ui_details->gui, name);
-
-      if (!object)
-        {
-          g_warning ("Builder is missing object '%s'.", name);
-          continue;
-        }
-
-      tpaw_account_widget_setup_widget (self, GTK_WIDGET (object),
-          param_name);
-    }
-}
-
-static void
-account_widget_cancel_clicked_cb (GtkWidget *button,
-    TpawAccountWidget *self)
-{
-  g_signal_emit (self, signals[CANCELLED], 0);
-  g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_CANCEL);
-}
-
-static void
-account_widget_account_enabled_cb (GObject *source_object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account = TP_ACCOUNT (source_object);
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (user_data);
-
-  tp_account_set_enabled_finish (account, res, &error);
-
-  if (error != NULL)
-    {
-      DEBUG ("Could not enable the account: %s", error->message);
-      g_error_free (error);
-    }
-  else
-    {
-      empathy_connect_new_account (account, self->priv->account_manager);
-    }
-
-  g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_APPLY);
-
-  /* unref self - part of the workaround */
-  g_object_unref (self);
-}
-
-static void
-account_widget_applied_cb (GObject *source_object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account;
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source_object);
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (user_data);
-  gboolean reconnect_required;
-  gboolean fire_close = TRUE;
-
-  empathy_account_settings_apply_finish (settings, res, &reconnect_required,
-      &error);
-
-  if (error != NULL)
-    {
-      DEBUG ("Could not apply changes to account: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  account = empathy_account_settings_get_account (self->priv->settings);
-
-  if (account != NULL)
-    {
-      if (self->priv->creating_account)
-        {
-          /* By default, when an account is created, we enable it. */
-
-          /* workaround to keep self alive during async call */
-          g_object_ref (self);
-
-          tp_account_set_enabled_async (account, TRUE,
-              account_widget_account_enabled_cb, self);
-          g_signal_emit (self, signals[ACCOUNT_CREATED], 0, account);
-
-          /* Will be fired in account_widget_account_enabled_cb */
-          fire_close = FALSE;
-        }
-      else
-        {
-          /* If the account was offline, we always want to try reconnecting,
-           * to give it a chance to connect if the previous params were wrong.
-           * tp_account_reconnect_async() won't do anything if the requested
-           * presence is offline anyway. */
-          if (tp_account_get_connection_status (account, NULL) ==
-              TP_CONNECTION_STATUS_DISCONNECTED)
-            reconnect_required = TRUE;
-
-          if (reconnect_required && tp_account_is_enabled (account)
-              && tp_account_is_enabled (account))
-            {
-              /* After having applied changes to a user account, we
-               * reconnect it if needed. This is done so the new
-               * information entered by the user is validated on the server. */
-              tp_account_reconnect_async (account, NULL, NULL);
-            }
-        }
-    }
-
-  if (!self->priv->destroyed)
-    account_widget_set_control_buttons_sensitivity (self, FALSE);
-
-  self->priv->contains_pending_changes = FALSE;
-
-  if (fire_close)
-    {
-      /* announce the widget can be closed */
-      g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_APPLY);
-    }
-
-  /* unref the widget - part of the workaround */
-  g_object_unref (self);
-}
-
-void
-tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self)
-{
-  gboolean display_name_overridden;
-
-  if (self->priv->radiobutton_reuse != NULL)
-    {
-      gboolean reuse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
-            self->priv->radiobutton_reuse));
-
-      DEBUG ("Set register param: %d", !reuse);
-      empathy_account_settings_set (self->priv->settings, "register",
-          g_variant_new_boolean (!reuse));
-    }
-
-  g_object_get (self->priv->settings,
-      "display-name-overridden", &display_name_overridden, NULL);
-
-  if (self->priv->creating_account || !display_name_overridden)
-    {
-      gchar *display_name;
-
-      /* set default display name for new accounts or update if user didn't
-       * manually override it. */
-      display_name = tpaw_account_widget_get_default_display_name (self);
-
-      empathy_account_settings_set_display_name_async (self->priv->settings,
-          display_name, NULL, NULL);
-
-      g_free (display_name);
-    }
-
-  /* workaround to keep widget alive during async call */
-  g_object_ref (self);
-  empathy_account_settings_apply_async (self->priv->settings,
-      account_widget_applied_cb, self);
-}
-
-static void
-account_widget_apply_clicked_cb (GtkWidget *button,
-    TpawAccountWidget *self)
-{
-    tpaw_account_widget_apply_and_log_in (self);
-}
-
-static void
-account_widget_setup_generic (TpawAccountWidget *self)
-{
-  GtkWidget *grid_common_settings;
-  GtkWidget *grid_advanced_settings;
-
-  grid_common_settings = GTK_WIDGET (gtk_builder_get_object
-      (self->ui_details->gui, "grid_common_settings"));
-  grid_advanced_settings = GTK_WIDGET (gtk_builder_get_object
-      (self->ui_details->gui, "grid_advanced_settings"));
-
-  accounts_widget_generic_setup (self, grid_common_settings,
-      grid_advanced_settings);
-
-  g_object_unref (self->ui_details->gui);
-}
-
-static void
-account_widget_settings_ready_cb (EmpathyAccountSettings *settings,
-    GParamSpec *pspec,
-    gpointer user_data)
-{
-  TpawAccountWidget *self = user_data;
-
-  if (empathy_account_settings_is_ready (self->priv->settings))
-    account_widget_setup_generic (self);
-}
-
-static GtkWidget *
-account_widget_build_generic (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *expander_advanced, *box;
-
-  self->ui_details->gui = empathy_builder_get_resource (filename,
-      "grid_common_settings", &self->priv->grid_common_settings,
-      "vbox_generic_settings", &box,
-      "expander_advanced_settings", &expander_advanced,
-      NULL);
-
-  if (self->priv->simple)
-    gtk_widget_hide (expander_advanced);
-
-  g_object_ref (self->ui_details->gui);
-
-  if (empathy_account_settings_is_ready (self->priv->settings))
-    account_widget_setup_generic (self);
-  else
-    g_signal_connect (self->priv->settings, "notify::ready",
-        G_CALLBACK (account_widget_settings_ready_cb), self);
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_salut (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *expander_advanced, *box;
-
-  self->ui_details->gui = empathy_builder_get_resource (filename,
-      "grid_common_settings", &self->priv->grid_common_settings,
-      "vbox_salut_settings", &box,
-      "expander_advanced_settings", &expander_advanced,
-      NULL);
-
-  tpaw_account_widget_handle_params (self,
-      "entry_published", "published-name",
-      "entry_nickname", "nickname",
-      "entry_first_name", "first-name",
-      "entry_last_name", "last-name",
-      "entry_email", "email",
-      "entry_jid", "jid",
-      NULL);
-
-  if (self->priv->simple)
-    gtk_widget_hide (expander_advanced);
-
-  self->ui_details->default_focus = g_strdup ("entry_first_name");
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_irc (TpawAccountWidget *self,
-  const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_IRC);
-
-  if (self->priv->simple)
-    {
-      self->priv->irc_network_chooser = tpaw_account_widget_irc_build_simple
-        (self, filename, &box);
-    }
-  else
-    {
-      self->priv->irc_network_chooser = tpaw_account_widget_irc_build (self,
-          filename, &self->priv->grid_common_settings, &box);
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_sip (TpawAccountWidget *self,
-  const char *filename)
-{
-  GtkWidget *box;
-
-  box = tpaw_account_widget_sip_build (self, filename,
-    &self->priv->grid_common_settings);
-
-  if (self->priv->simple)
-    {
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_msn (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_MSN);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_msn_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_msn_settings", &self->priv->grid_common_settings,
-          "vbox_msn_settings", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static void
-suffix_id_widget_changed_cb (GtkWidget *entry,
-    TpawAccountWidget *self)
-{
-  gchar *account;
-
-  g_assert (self->priv->jid_suffix != NULL);
-
-  account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
-
-  account = empathy_account_settings_dup_string (self->priv->settings,
-      "account");
-
-  if (!EMP_STR_EMPTY (account) &&
-      !g_str_has_suffix (account, self->priv->jid_suffix))
-    {
-      gchar *tmp;
-
-      tmp = g_strdup_printf ("%s%s", account, self->priv->jid_suffix);
-
-      DEBUG ("Change account from '%s' to '%s'", account, tmp);
-
-      empathy_account_settings_set (self->priv->settings, "account",
-          g_variant_new_string (tmp));
-      g_free (tmp);
-    }
-
-  tpaw_account_widget_changed (self);
-
-  g_free (account);
-}
-
-static gchar *
-remove_jid_suffix (TpawAccountWidget *self,
-    const gchar *str)
-{
-  g_assert (self->priv->jid_suffix != NULL);
-
-  if (!g_str_has_suffix (str, self->priv->jid_suffix))
-    return g_strdup (str);
-
-  return g_strndup (str, strlen (str) - strlen (self->priv->jid_suffix));
-}
-
-static void
-setup_id_widget_with_suffix (TpawAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *suffix)
-{
-  gchar *str = NULL;
-
-  g_object_set_data_full (G_OBJECT (widget), "param_name",
-      g_strdup ("account"), g_free);
-
-  g_assert (self->priv->jid_suffix == NULL);
-  self->priv->jid_suffix = g_strdup (suffix);
-
-  str = empathy_account_settings_dup_string (self->priv->settings, "account");
-  if (str != NULL)
-    {
-      gchar *tmp;
-
-      tmp = remove_jid_suffix (self, str);
-      gtk_entry_set_text (GTK_ENTRY (widget), tmp);
-      g_free (tmp);
-      g_free (str);
-    }
-
-  self->priv->param_account_widget = widget;
-
-  g_signal_connect (widget, "changed",
-      G_CALLBACK (suffix_id_widget_changed_cb), self);
-}
-
-static Service
-account_widget_get_service (TpawAccountWidget *self)
-{
-  const gchar *icon_name, *service;
-
-  icon_name = empathy_account_settings_get_icon_name (self->priv->settings);
-  service = empathy_account_settings_get_service (self->priv->settings);
-
-  /* Previous versions of Tpaw didn't set the Service property on Facebook
-   * and gtalk accounts, so we check using the icon name as well. */
-  if (!tp_strdiff (icon_name, "im-google-talk") ||
-      !tp_strdiff (service, "google-talk"))
-    return GTALK_SERVICE;
-
-  if (!tp_strdiff (icon_name, "im-facebook") ||
-      !tp_strdiff (service, "facebook"))
-    return FACEBOOK_SERVICE;
-
-  return NO_SERVICE;
-}
-
-static GtkWidget *
-account_widget_build_jabber (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port;
-  GtkWidget *checkbutton_ssl;
-  GtkWidget *label_id, *label_password;
-  GtkWidget *label_id_create, *label_password_create;
-  GtkWidget *label_example_fb;
-  GtkWidget *label_example;
-  GtkWidget *expander_advanced;
-  GtkWidget *entry_id;
-  GtkWidget *box;
-  Service service;
-
-  service = account_widget_get_service (self);
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_JABBER);
-
-  if (self->priv->simple && service == NO_SERVICE)
-    {
-      /* Simple widget for XMPP */
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_jabber_simple", &box,
-          "label_id_simple", &label_id,
-          "label_id_create", &label_id_create,
-          "label_password_simple", &label_password,
-          "label_password_create", &label_password_create,
-          NULL);
-
-      if (empathy_account_settings_get_boolean (self->priv->settings,
-            "register"))
-        {
-          gtk_widget_hide (label_id);
-          gtk_widget_hide (label_password);
-          gtk_widget_show (label_id_create);
-          gtk_widget_show (label_password_create);
-        }
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else if (self->priv->simple && service == GTALK_SERVICE)
-    {
-      /* Simple widget for Google Talk */
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_gtalk_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id_g_simple", "account",
-          "entry_password_g_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_g_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_g_simple"));
-    }
-  else if (self->priv->simple && service == FACEBOOK_SERVICE)
-    {
-      /* Simple widget for Facebook */
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_fb_simple", &box,
-          "entry_id_fb_simple", &entry_id,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_password_fb_simple", "password",
-          NULL);
-
-      setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
-
-      self->ui_details->default_focus = g_strdup ("entry_id_fb_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_fb_simple"));
-    }
-  else
-    {
-      ServiceInfo info = services_infos[service];
-
-      /* Full widget for XMPP, Google Talk and Facebook*/
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_jabber_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          "checkbutton_ssl", &checkbutton_ssl,
-          "label_username_f_example", &label_example_fb,
-          info.label_username_example, &label_example,
-          "expander_advanced", &expander_advanced,
-          "entry_id", &entry_id,
-          "label_id", &label_id,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_password", "password",
-          "entry_resource", "resource",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          "spinbutton_priority", "priority",
-          "checkbutton_ssl", "old-ssl",
-          "checkbutton_ignore_ssl_errors", "ignore-ssl-errors",
-          "checkbutton_encryption", "require-encryption",
-          NULL);
-
-      if (service == FACEBOOK_SERVICE)
-        {
-          gtk_label_set_label (GTK_LABEL (label_id), _("Username:"));
-
-          /* Facebook special case the entry ID widget to hide the
-           * "@chat.facebook.com" part */
-          setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
-        }
-      else
-        {
-          tpaw_account_widget_setup_widget (self, entry_id, "account");
-        }
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-      self->priv->spinbutton_port = spinbutton_port;
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-
-      g_signal_connect (checkbutton_ssl, "toggled",
-          G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
-          self);
-
-      if (service == FACEBOOK_SERVICE)
-        {
-          GtkContainer *parent;
-          GList *children;
-
-          /* Removing the label from list of focusable widgets */
-          parent = GTK_CONTAINER (gtk_widget_get_parent (label_example_fb));
-          children = gtk_container_get_children (parent);
-          children = g_list_remove (children, label_example_fb);
-          gtk_container_set_focus_chain (parent, children);
-          g_list_free (children);
-        }
-
-      gtk_widget_show (label_example);
-
-      if (!info.show_advanced)
-        gtk_widget_hide (expander_advanced);
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_icq (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port;
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_ICQ);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_icq_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_uin_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_uin_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_icq_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_uin", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          "entry_charset", "charset",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_uin");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_aim (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port, *box;
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_aim_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_screenname_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_screenname_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_aim_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_screenname", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_screenname");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_yahoo (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_YAHOO);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_yahoo_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_yahoo_settings", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_locale", "room-list-locale",
-          "entry_charset", "charset",
-          "spinbutton_port", "port",
-          "checkbutton_ignore_invites", "ignore-invites",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_groupwise (TpawAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "vbox_groupwise_simple", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_resource (filename,
-          "grid_common_groupwise_settings", &self->priv->grid_common_settings,
-          "vbox_groupwise_settings", &box,
-          NULL);
-
-      tpaw_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-void
-tpaw_account_widget_set_other_accounts_exist (TpawAccountWidget *self,
-    gboolean others_exist)
-{
-  self->priv->other_accounts_exist = others_exist;
-
-  if (self->priv->creating_account)
-    account_widget_handle_control_buttons_sensitivity (self);
-}
-
-static void
-do_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_SETTINGS:
-      self->priv->settings = g_value_dup_object (value);
-      break;
-    case PROP_SIMPLE:
-      self->priv->simple = g_value_get_boolean (value);
-      break;
-    case PROP_CREATING_ACCOUNT:
-      self->priv->creating_account = g_value_get_boolean (value);
-      break;
-    case PROP_OTHER_ACCOUNTS_EXIST:
-      tpaw_account_widget_set_other_accounts_exist (
-          TPAW_ACCOUNT_WIDGET (object), g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-do_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROTOCOL:
-      g_value_set_string (value,
-        empathy_account_settings_get_protocol (self->priv->settings));
-      break;
-    case PROP_SETTINGS:
-      g_value_set_object (value, self->priv->settings);
-      break;
-    case PROP_SIMPLE:
-      g_value_set_boolean (value, self->priv->simple);
-      break;
-    case PROP_CREATING_ACCOUNT:
-      g_value_set_boolean (value, self->priv->creating_account);
-      break;
-    case PROP_OTHER_ACCOUNTS_EXIST:
-      g_value_set_boolean (value, self->priv->other_accounts_exist);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-set_apply_button (TpawAccountWidget *self)
-{
-  GtkWidget *image;
-
-  /* We can't use the stock button as its accelerator ('A') clashes with the
-   * Add button. */
-  gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE);
-
-  gtk_button_set_label (GTK_BUTTON (self->priv->apply_button), _("A_pply"));
-  gtk_button_set_use_underline (GTK_BUTTON (self->priv->apply_button), TRUE);
-
-  image = gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON);
-  gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image);
-}
-
-static void
-presence_changed_cb (TpAccountManager *manager,
-    TpConnectionPresenceType state,
-    const gchar *status,
-    const gchar *message,
-    TpawAccountWidget *self)
-{
-  if (self->priv->destroyed)
-    return;
-
-  if (self->priv->apply_button == NULL)
-    /* This button doesn't exist in 'simple' mode */
-    return;
-
-  if (state > TP_CONNECTION_PRESENCE_TYPE_OFFLINE &&
-      self->priv->creating_account)
-    {
-      /* We are online and creating a new account, display a Login button */
-      GtkWidget *image;
-
-      gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE);
-      gtk_button_set_label (GTK_BUTTON (self->priv->apply_button),
-          _("L_og in"));
-
-      image = gtk_image_new_from_stock (GTK_STOCK_CONNECT,
-          GTK_ICON_SIZE_BUTTON);
-      gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image);
-    }
-  else
-    {
-      /* We are offline or modifying an existing account, display
-       * a Save button */
-      set_apply_button (self);
-    }
-}
-
-static void
-account_manager_ready_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (user_data);
-  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
-  GError *error = NULL;
-  TpConnectionPresenceType state;
-
-  if (!tp_proxy_prepare_finish (account_manager, result, &error))
-    {
-      DEBUG ("Failed to prepare account manager: %s", error->message);
-      g_error_free (error);
-      goto out;
-    }
-
-  state = tp_account_manager_get_most_available_presence (account_manager, NULL,
-      NULL);
-
-  /* simulate a presence change so the apply button will be changed
-   * if needed */
-  presence_changed_cb (account_manager, state, NULL, NULL, self);
-
-out:
-  g_object_unref (self);
-}
-
-#define WIDGET(cm, proto) \
-  { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \
-    account_widget_build_##proto }
-
-static void
-add_register_buttons (TpawAccountWidget *self,
-    TpAccount *account)
-{
-  TpProtocol *protocol;
-  GtkWidget *radiobutton_register;
-
-  if (!self->priv->creating_account)
-    return;
-
-  protocol = empathy_account_settings_get_tp_protocol (self->priv->settings);
-  if (protocol == NULL)
-    return;
-
-  if (!tp_protocol_can_register (protocol))
-    return;
-
-  if (account_widget_get_service (self) != NO_SERVICE)
-    return;
-
-  if (self->priv->simple)
-    return;
-
-  self->priv->radiobutton_reuse = gtk_radio_button_new_with_label (NULL,
-      _("This account already exists on the server"));
-  radiobutton_register = gtk_radio_button_new_with_label (
-      gtk_radio_button_get_group (
-        GTK_RADIO_BUTTON (self->priv->radiobutton_reuse)),
-      _("Create a new account on the server"));
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->radiobutton_reuse, FALSE,
-      FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (self), radiobutton_register, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (self), self->priv->radiobutton_reuse, 0);
-  gtk_box_reorder_child (GTK_BOX (self), radiobutton_register, 1);
-  gtk_widget_show (self->priv->radiobutton_reuse);
-  gtk_widget_show (radiobutton_register);
-}
-
-static void
-remember_password_toggled_cb (GtkToggleButton *button,
-    TpawAccountWidget *self)
-{
-  empathy_account_settings_set_remember_password (self->priv->settings,
-      gtk_toggle_button_get_active (button));
-
-  if (!self->priv->automatic_change)
-    tpaw_account_widget_changed (self);
-}
-
-static void
-account_settings_password_retrieved_cb (GObject *object,
-    gpointer user_data)
-{
-  TpawAccountWidget *self = user_data;
-  gchar *password;
-
-  password = empathy_account_settings_dup_string (
-      self->priv->settings, "password");
-
-  /* We have to do this so that when we call gtk_entry_set_text,
-   * the ::changed callback doesn't think the user made the
-   * change. This is also used in remember_password_toggled_cb. */
-  self->priv->automatic_change = TRUE;
-
-  if (password != NULL)
-    {
-      gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget),
-          password);
-    }
-
-  gtk_toggle_button_set_active (
-      GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
-      !EMP_STR_EMPTY (password));
-
-  self->priv->automatic_change = FALSE;
-
-  g_free (password);
-}
-
-static void
-do_constructed (GObject *obj)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (obj);
-  TpAccount *account;
-  const gchar *display_name, *default_display_name;
-  guint i = 0;
-  struct {
-    const gchar *cm_name;
-    const gchar *protocol;
-    const char *file;
-    GtkWidget * (*func)(TpawAccountWidget *self, const gchar *filename);
-  } widgets [] = {
-    { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui",
-        account_widget_build_salut },
-    WIDGET (gabble, jabber),
-    WIDGET (haze, msn),
-    WIDGET (haze, icq),
-    WIDGET (haze, aim),
-    WIDGET (haze, yahoo),
-    WIDGET (haze, groupwise),
-    WIDGET (idle, irc),
-    WIDGET (sofiasip, sip),
-  };
-  const gchar *protocol, *cm_name;
-  GtkWidget *box;
-
-  account = empathy_account_settings_get_account (self->priv->settings);
-
-  cm_name = empathy_account_settings_get_cm (self->priv->settings);
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
-
-  for (i = 0 ; i < G_N_ELEMENTS (widgets); i++)
-    {
-      if (!tp_strdiff (widgets[i].cm_name, cm_name) &&
-          !tp_strdiff (widgets[i].protocol, protocol))
-        {
-          box = widgets[i].func (self, widgets[i].file);
-          break;
-        }
-    }
-
-  if (i == G_N_ELEMENTS (widgets))
-    {
-      gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui";
-      box = account_widget_build_generic (self, filename);
-    }
-
-  gtk_container_add (GTK_CONTAINER (self), box);
-
-  /* handle default focus */
-  if (self->ui_details->default_focus != NULL)
-    {
-      GObject *default_focus_entry;
-
-      default_focus_entry = gtk_builder_get_object
-        (self->ui_details->gui, self->ui_details->default_focus);
-      g_signal_connect (default_focus_entry, "realize",
-          G_CALLBACK (gtk_widget_grab_focus),
-          NULL);
-    }
-
-  /* remember password */
-  if (self->priv->param_password_widget != NULL
-      && self->priv->remember_password_widget != NULL
-      && empathy_account_settings_supports_sasl (self->priv->settings))
-    {
-      if (self->priv->simple)
-        {
-          gtk_toggle_button_set_active (
-              GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), TRUE);
-        }
-      else
-        {
-          gchar *password;
-
-          password = empathy_account_settings_dup_string (self->priv->settings,
-              "password");
-
-          /* FIXME: we should enable this checkbox only if the password is
-           * stored for good in the password storage, not only for the session
-           * (bgo #683571) */
-          gtk_toggle_button_set_active (
-              GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
-              !EMP_STR_EMPTY (password));
-
-          /* The password might not have been retrieved from the
-           * keyring yet. We should update the remember password
-           * toggle button and the password entry when/if it is. */
-          tp_g_signal_connect_object (self->priv->settings,
-              "password-retrieved",
-              G_CALLBACK (account_settings_password_retrieved_cb), self, 0);
-
-          g_free (password);
-        }
-
-      g_signal_connect (self->priv->remember_password_widget, "toggled",
-          G_CALLBACK (remember_password_toggled_cb), self);
-
-      self->priv->automatic_change = TRUE;
-      remember_password_toggled_cb (
-          GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), self);
-      self->priv->automatic_change = FALSE;
-    }
-  else if (self->priv->remember_password_widget != NULL
-      && !empathy_account_settings_supports_sasl (self->priv->settings))
-    {
-      gtk_widget_set_visible (self->priv->remember_password_widget, FALSE);
-      empathy_account_settings_set_remember_password (self->priv->settings,
-          TRUE);
-    }
-
-  /* dup and init the account-manager */
-  self->priv->account_manager = tp_account_manager_dup ();
-
-  g_object_ref (self);
-  tp_proxy_prepare_async (self->priv->account_manager, NULL,
-      account_manager_ready_cb, self);
-
-  /* handle apply and cancel button */
-  self->priv->hbox_buttons = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-
-  gtk_box_set_homogeneous (GTK_BOX (self->priv->hbox_buttons), TRUE);
-
-  self->priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-
-  self->priv->apply_button = gtk_button_new ();
-  set_apply_button (self);
-
-  /* We'll change this button to a "Log in" one if we are creating a new
-   * account and are connected. */
-  tp_g_signal_connect_object (self->priv->account_manager,
-      "most-available-presence-changed",
-      G_CALLBACK (presence_changed_cb), obj, 0);
-
-  gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons),
-      self->priv->apply_button, TRUE, TRUE, 3);
-  gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons),
-      self->priv->cancel_button, TRUE, TRUE, 3);
-
-  gtk_box_pack_end (GTK_BOX (self), self->priv->hbox_buttons, FALSE,
-      FALSE, 3);
-
-  g_signal_connect (self->priv->cancel_button, "clicked",
-      G_CALLBACK (account_widget_cancel_clicked_cb),
-      self);
-  g_signal_connect (self->priv->apply_button, "clicked",
-      G_CALLBACK (account_widget_apply_clicked_cb),
-      self);
-  gtk_widget_show_all (self->priv->hbox_buttons);
-
-  if (self->priv->creating_account)
-    /* When creating an account, the user might have nothing to enter.
-     * That means that no control interaction might occur,
-     * so we update the control button sensitivity manually.
-     */
-    account_widget_handle_control_buttons_sensitivity (self);
-  else
-    account_widget_set_control_buttons_sensitivity (self, FALSE);
-
-  add_register_buttons (self, account);
-
-  g_clear_object (&self->ui_details->gui);
-
-  display_name = empathy_account_settings_get_display_name (
-      self->priv->settings);
-  default_display_name = tpaw_account_widget_get_default_display_name (self);
-
-  if (tp_strdiff (display_name, default_display_name) &&
-      !self->priv->creating_account)
-    {
-      /* The display name of the account is not the one that we'd assign by
-       * default; assume that the user changed it manually */
-      g_object_set (self->priv->settings, "display-name-overridden", TRUE,
-          NULL);
-    }
-}
-
-static void
-do_dispose (GObject *obj)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (obj);
-
-  g_clear_object (&self->priv->settings);
-  g_clear_object (&self->priv->account_manager);
-
-  if (G_OBJECT_CLASS (tpaw_account_widget_parent_class)->dispose != NULL)
-    G_OBJECT_CLASS (tpaw_account_widget_parent_class)->dispose (obj);
-}
-
-static void
-do_finalize (GObject *obj)
-{
-  TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (obj);
-
-  g_free (self->ui_details->default_focus);
-  g_slice_free (TpawAccountWidgetUIDetails, self->ui_details);
-
-  g_free (self->priv->jid_suffix);
-
-  if (G_OBJECT_CLASS (tpaw_account_widget_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (tpaw_account_widget_parent_class)->finalize (obj);
-}
-
-static void
-tpaw_account_widget_class_init (TpawAccountWidgetClass *klass)
-{
-  GObjectClass *oclass = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  oclass->get_property = do_get_property;
-  oclass->set_property = do_set_property;
-  oclass->constructed = do_constructed;
-  oclass->dispose = do_dispose;
-  oclass->finalize = do_finalize;
-
-  param_spec = g_param_spec_string ("protocol",
-      "protocol", "The protocol of the account",
-      NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (oclass, PROP_PROTOCOL, param_spec);
-
-  param_spec = g_param_spec_object ("settings",
-      "settings", "The settings of the account",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_SETTINGS, param_spec);
-
-  param_spec = g_param_spec_boolean ("simple",
-      "simple", "Whether the account widget is a simple or an advanced one",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_SIMPLE, param_spec);
-
-  param_spec = g_param_spec_boolean ("creating-account",
-      "creating-account",
-      "TRUE if we're creating an account, FALSE if we're modifying it",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_CREATING_ACCOUNT, param_spec);
-
-  param_spec = g_param_spec_boolean ("other-accounts-exist",
-      "other-accounts-exist",
-      "TRUE if there are any other accounts (even if this isn't yet saved)",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_OTHER_ACCOUNTS_EXIST,
-                  param_spec);
-
-  signals[HANDLE_APPLY] =
-    g_signal_new ("handle-apply", G_TYPE_FROM_CLASS (klass),
-        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_generic,
-        G_TYPE_NONE,
-        1, G_TYPE_BOOLEAN);
-
-  /* This signal is emitted when an account has been created and enabled. */
-  signals[ACCOUNT_CREATED] =
-      g_signal_new ("account-created", G_TYPE_FROM_CLASS (klass),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE,
-          1, G_TYPE_OBJECT);
-
-  signals[CANCELLED] =
-      g_signal_new ("cancelled", G_TYPE_FROM_CLASS (klass),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE,
-          0);
-
-  signals[CLOSE] =
-    g_signal_new ("close", G_TYPE_FROM_CLASS (klass),
-        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__INT,
-        G_TYPE_NONE,
-        1, G_TYPE_INT);
-
-  g_type_class_add_private (klass, sizeof (TpawAccountWidgetPriv));
-}
-
-static void
-tpaw_account_widget_init (TpawAccountWidget *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), TPAW_TYPE_ACCOUNT_WIDGET,
-        TpawAccountWidgetPriv);
-
-  self->ui_details = g_slice_new0 (TpawAccountWidgetUIDetails);
-}
-
-/* public methods */
-
-void
-tpaw_account_widget_discard_pending_changes (TpawAccountWidget *self)
-{
-  empathy_account_settings_discard_changes (self->priv->settings);
-  self->priv->contains_pending_changes = FALSE;
-}
-
-gboolean
-tpaw_account_widget_contains_pending_changes (TpawAccountWidget *self)
-{
-  return self->priv->contains_pending_changes;
-}
-
-void
-tpaw_account_widget_handle_params (TpawAccountWidget *self,
-    const gchar *first_widget,
-    ...)
-{
-  va_list args;
-
-  va_start (args, first_widget);
-  account_widget_handle_params_valist (self, first_widget, args);
-  va_end (args);
-}
-
-TpawAccountWidget *
-tpaw_account_widget_new_for_protocol (EmpathyAccountSettings *settings,
-    gboolean simple)
-{
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), NULL);
-
-  return g_object_new (TPAW_TYPE_ACCOUNT_WIDGET,
-        "orientation", GTK_ORIENTATION_VERTICAL,
-        "settings", settings,
-        "simple", simple,
-        "creating-account",
-          empathy_account_settings_get_account (settings) == NULL,
-        NULL);
-}
-
-gchar *
-tpaw_account_widget_get_default_display_name (TpawAccountWidget *self)
-{
-  gchar *login_id;
-  const gchar *protocol, *p;
-  gchar *default_display_name;
-  Service service;
-
-  login_id = empathy_account_settings_dup_string (self->priv->settings,
-      "account");
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
-  service = account_widget_get_service (self);
-
-  if (login_id != NULL)
-    {
-      /* TODO: this should be done in empathy-account-widget-irc */
-      if (!tp_strdiff (protocol, "irc"))
-        {
-          TpawIrcNetwork *network;
-
-          network = tpaw_irc_network_chooser_get_network (
-              self->priv->irc_network_chooser);
-          g_assert (network != NULL);
-
-          /* To translators: The first parameter is the login id and the
-           * second one is the network. The resulting string will be something
-           * like: "MyUserName on freenode".
-           * You should reverse the order of these arguments if the
-           * server should come before the login id in your locale.*/
-          default_display_name = g_strdup_printf (_("%1$s on %2$s"),
-              login_id, tpaw_irc_network_get_name (network));
-        }
-      else if (service == FACEBOOK_SERVICE && self->priv->jid_suffix != NULL)
-        {
-          gchar *tmp;
-
-          tmp = remove_jid_suffix (self, login_id);
-          default_display_name = g_strdup_printf ("Facebook (%s)", tmp);
-          g_free (tmp);
-        }
-      else
-        {
-          default_display_name = g_strdup (login_id);
-        }
-
-      return default_display_name;
-    }
-
-  if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL)
-    protocol = p;
-
-  if (protocol != NULL)
-    {
-      /* To translators: The parameter is the protocol name. The resulting
-       * string will be something like: "Jabber Account" */
-      default_display_name = g_strdup_printf (_("%s Account"), protocol);
-    }
-  else
-    {
-      default_display_name = g_strdup (_("New account"));
-    }
-
-  g_free (login_id);
-
-  return default_display_name;
-}
-
-/* Used by subclass to indicate that widget contains pending changes */
-void
-tpaw_account_widget_changed (TpawAccountWidget *self)
-{
-  account_widget_handle_control_buttons_sensitivity (self);
-  self->priv->contains_pending_changes = TRUE;
-}
-
-void
-tpaw_account_widget_set_account_param (TpawAccountWidget *self,
-    const gchar *account)
-{
-  if (self->priv->param_account_widget == NULL)
-    return;
-
-  gtk_entry_set_text (GTK_ENTRY (self->priv->param_account_widget), account);
-}
-
-void
-tpaw_account_widget_set_password_param (TpawAccountWidget *self,
-    const gchar *account)
-{
-  if (self->priv->param_password_widget == NULL)
-    return;
-
-  gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), account);
-}
-
-EmpathyAccountSettings *
-tpaw_account_widget_get_settings (TpawAccountWidget *self)
-{
-  return self->priv->settings;
-}
-
-void
-tpaw_account_widget_hide_buttons (TpawAccountWidget *self)
-{
-  gtk_widget_hide (self->priv->hbox_buttons);
-}
diff --git a/tp-account-widgets/empathy-account-widget.h b/tp-account-widgets/empathy-account-widget.h
deleted file mode 100644 (file)
index 261901f..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007-2008 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
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Martyn Russell <martyn@imendio.com>
- */
-
-#ifndef __TPAW_ACCOUNT_WIDGET_H__
-#define __TPAW_ACCOUNT_WIDGET_H__
-
-#include <gtk/gtk.h>
-
-#include "empathy-account-settings.h"
-
-G_BEGIN_DECLS
-
-#define TPAW_TYPE_ACCOUNT_WIDGET tpaw_account_widget_get_type()
-#define TPAW_ACCOUNT_WIDGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TPAW_TYPE_ACCOUNT_WIDGET, TpawAccountWidget))
-#define TPAW_ACCOUNT_WIDGET_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TPAW_TYPE_ACCOUNT_WIDGET, TpawAccountWidgetClass))
-#define TPAW_IS_ACCOUNT_WIDGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TPAW_TYPE_ACCOUNT_WIDGET))
-#define TPAW_IS_ACCOUNT_WIDGET_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TPAW_TYPE_ACCOUNT_WIDGET))
-#define TPAW_ACCOUNT_WIDGET_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPAW_TYPE_ACCOUNT_WIDGET, TpawAccountWidgetClass))
-
-typedef struct _TpawAccountWidgetPriv TpawAccountWidgetPriv;
-typedef struct _TpawAccountWidgetUIDetails TpawAccountWidgetUIDetails;
-
-typedef struct {
-  GtkBox parent;
-
-  TpawAccountWidgetUIDetails *ui_details;
-
-  TpawAccountWidgetPriv *priv;
-} TpawAccountWidget;
-
-typedef struct {
-  GtkBoxClass parent_class;
-} TpawAccountWidgetClass;
-
-GType tpaw_account_widget_get_type (void);
-
-TpawAccountWidget * tpaw_account_widget_new_for_protocol (
-    EmpathyAccountSettings *settings,
-    gboolean simple);
-
-gboolean tpaw_account_widget_contains_pending_changes
-    (TpawAccountWidget *widget);
-void tpaw_account_widget_discard_pending_changes
-    (TpawAccountWidget *widget);
-
-gchar * tpaw_account_widget_get_default_display_name (
-    TpawAccountWidget *widget);
-
-void tpaw_account_widget_set_account_param (TpawAccountWidget *widget,
-    const gchar *account);
-
-void tpaw_account_widget_set_password_param (TpawAccountWidget *self,
-    const gchar *password);
-
-void tpaw_account_widget_set_other_accounts_exist (
-    TpawAccountWidget *self, gboolean others_exist);
-
-void tpaw_account_widget_hide_buttons (TpawAccountWidget *self);
-
-void tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self);
-
-/* protected methods */
-void tpaw_account_widget_changed (TpawAccountWidget *widget);
-
-EmpathyAccountSettings * tpaw_account_widget_get_settings (
-    TpawAccountWidget *self);
-
-G_END_DECLS
-
-#endif /* __TPAW_ACCOUNT_WIDGET_H__ */
diff --git a/tp-account-widgets/empathy-account-widgets.gresource.xml b/tp-account-widgets/empathy-account-widgets.gresource.xml
deleted file mode 100644 (file)
index 7ee09e2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/AccountWidgets">
-    <file>empathy-irc-networks.dtd</file>
-    <file compressed="true">empathy-account-widget-generic.ui</file>
-    <file compressed="true">empathy-account-widget-jabber.ui</file>
-    <file compressed="true">empathy-account-widget-msn.ui</file>
-    <file compressed="true">empathy-account-widget-sip.ui</file>
-    <file compressed="true">empathy-account-widget-local-xmpp.ui</file>
-    <file compressed="true">empathy-account-widget-irc.ui</file>
-    <file compressed="true">empathy-account-widget-icq.ui</file>
-    <file compressed="true">empathy-account-widget-yahoo.ui</file>
-    <file compressed="true">empathy-account-widget-groupwise.ui</file>
-    <file compressed="true">empathy-account-widget-aim.ui</file>
-  </gresource>
-</gresources>
-
diff --git a/tp-account-widgets/empathy-irc-network-chooser-dialog.c b/tp-account-widgets/empathy-irc-network-chooser-dialog.c
deleted file mode 100644 (file)
index cd0a716..0000000
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#include "config.h"
-#include "empathy-irc-network-chooser-dialog.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-irc-network-dialog.h"
-#include "empathy-irc-network-manager.h"
-#include "empathy-live-search.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
-
-#include "empathy-irc-network-chooser-dialog.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, TpawIrcNetworkChooserDialog)
-
-enum {
-    PROP_SETTINGS = 1,
-    PROP_NETWORK
-};
-
-enum {
-       RESPONSE_RESET = 0
-};
-
-typedef struct {
-    EmpathyAccountSettings *settings;
-    TpawIrcNetwork *network;
-
-    TpawIrcNetworkManager *network_manager;
-    gboolean changed;
-
-    GtkWidget *treeview;
-    GtkListStore *store;
-    GtkTreeModelFilter *filter;
-    GtkWidget *search;
-    GtkWidget *select_button;
-
-    gulong search_sig;
-    gulong activate_sig;
-} TpawIrcNetworkChooserDialogPriv;
-
-enum {
-  COL_NETWORK_OBJ,
-  COL_NETWORK_NAME,
-};
-
-G_DEFINE_TYPE (TpawIrcNetworkChooserDialog, tpaw_irc_network_chooser_dialog,
-    GTK_TYPE_DIALOG);
-
-static void
-tpaw_irc_network_chooser_dialog_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        priv->settings = g_value_dup_object (value);
-        break;
-      case PROP_NETWORK:
-        priv->network = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-tpaw_irc_network_chooser_dialog_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        g_value_set_object (value, priv->settings);
-        break;
-      case PROP_NETWORK:
-        g_value_set_object (value, priv->network);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-/* The iter returned by *it is a priv->store iter (not a filter one) */
-static TpawIrcNetwork *
-dup_selected_network (TpawIrcNetworkChooserDialog *self,
-    GtkTreeIter *it)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  TpawIrcNetwork *network;
-  GtkTreeSelection *selection;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
-  if (selection == NULL)
-    return NULL;
-
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return NULL;
-
-  gtk_tree_model_get (model, &iter, COL_NETWORK_OBJ, &network, -1);
-  g_assert (network != NULL);
-
-  if (it != NULL)
-    {
-      gtk_tree_model_filter_convert_iter_to_child_iter (priv->filter, it,
-          &iter);
-    }
-
-  return network;
-}
-
-static void
-treeview_changed_cb (GtkTreeView *treeview,
-    TpawIrcNetworkChooserDialog *self)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  TpawIrcNetwork *network;
-
-  network = dup_selected_network (self, NULL);
-  if (network == priv->network)
-    {
-      g_clear_object (&network);
-      return;
-    }
-
-  tp_clear_object (&priv->network);
-  /* Transfer the reference */
-  priv->network = network;
-
-  priv->changed = TRUE;
-}
-
-/* Take a filter iterator as argument */
-static void
-scroll_to_iter (TpawIrcNetworkChooserDialog *self,
-    GtkTreeIter *filter_iter)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreePath *path;
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
-
-  if (path != NULL)
-    {
-      gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->treeview),
-          path, NULL, FALSE, 0, 0);
-
-      gtk_tree_path_free (path);
-    }
-}
-
-/* Take a filter iterator as argument */
-static void
-select_iter (TpawIrcNetworkChooserDialog *self,
-    GtkTreeIter *filter_iter,
-    gboolean emulate_changed)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreeSelection *selection;
-  GtkTreePath *path;
-
-  /* Select the network */
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (priv->treeview));
-
-  gtk_tree_selection_select_iter (selection, filter_iter);
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
-  if (path != NULL)
-    {
-      gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path,
-          NULL, FALSE);
-
-      gtk_tree_path_free (path);
-    }
-
-  /* Scroll to the selected network */
-  scroll_to_iter (self, filter_iter);
-
-  if (emulate_changed)
-    {
-      /* gtk_tree_selection_select_iter doesn't fire the 'cursor-changed' signal
-       * so we call the callback manually. */
-      treeview_changed_cb (GTK_TREE_VIEW (priv->treeview), self);
-    }
-}
-
-static GtkTreeIter
-iter_to_filter_iter (TpawIrcNetworkChooserDialog *self,
-    GtkTreeIter *iter)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreeIter filter_iter;
-
-  g_assert (gtk_tree_model_filter_convert_child_iter_to_iter (priv->filter,
-        &filter_iter, iter));
-
-  return filter_iter;
-}
-
-static void
-fill_store (TpawIrcNetworkChooserDialog *self)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GSList *networks, *l;
-
-  networks = tpaw_irc_network_manager_get_networks (
-      priv->network_manager);
-
-  for (l = networks; l != NULL; l = g_slist_next (l))
-    {
-      TpawIrcNetwork *network = l->data;
-      GtkTreeIter iter;
-
-      gtk_list_store_insert_with_values (priv->store, &iter, -1,
-          COL_NETWORK_OBJ, network,
-          COL_NETWORK_NAME, tpaw_irc_network_get_name (network),
-          -1);
-
-      if (network == priv->network)
-        {
-          GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
-
-          select_iter (self, &filter_iter, FALSE);
-        }
-
-      g_object_unref (network);
-    }
-
-  g_slist_free (networks);
-}
-
-static void
-irc_network_dialog_destroy_cb (GtkWidget *widget,
-    TpawIrcNetworkChooserDialog *self)
-{
-  TpawIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  TpawIrcNetwork *network;
-  GtkTreeIter iter, filter_iter;
-
-  priv->changed = TRUE;
-
-  network = dup_selected_network (self, &iter);
-  if (network == NULL)
-    return;
-
-  /* name could be changed */
-  gtk_list_store_set (GTK_LIST_STORE (priv->store), &iter,
-      COL_NETWORK_NAME, tpaw_irc_network_get_name (network), -1);
-
-  filter_iter = iter_to_filter_iter (self, &iter);
-  scroll_to_iter (self, &filter_iter);
-
-  gtk_widget_grab_focus (priv->treeview);
-
-  g_object_unref (network);
-}
-
-static void
-display_irc_network_dialog (TpawIrcNetworkChooserDialog