Every protocols should now have an "Enabled" checkbox in "edit" mode.

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 932e2f81dcf7f8394ae52fb98da309013de38bf7..e462aa6111ffcce761ced0d5ad1708170f25f41e 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -418,7 +418,8 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
 
 void
 empathy_account_widget_irc_build (EmpathyAccountWidget *self,
-                                const char *filename)
+    const char *filename,
+    GtkWidget **table_common_settings)
 {
   EmpathyAccountWidgetIrc *settings;
   gchar *dir, *user_file_with_path, *global_file_with_path;
@@ -450,6 +451,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
   g_free (user_file_with_path);
 
   self->ui_details->gui = empathy_builder_get_file (filename,
+      "table_irc_settings", table_common_settings,
       "vbox_irc", &self->ui_details->widget,
       "table_irc_settings", &settings->vbox_settings,
       "combobox_network", &settings->combobox_network,

diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index a7678712080c48572cf620b771e75750d8b12bec..022158529d67f1d122da883d788f0a27ba14639a 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -27,7 +27,8 @@
 G_BEGIN_DECLS
 
 void empathy_account_widget_irc_build (EmpathyAccountWidget *self,
-                                       const char *filename);
+    const char *filename,
+    GtkWidget **table_common_settings);
 
 G_END_DECLS
 

diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index afc20fecb8ec4d0944645cff978386218b48db5f..db39ddae4a360ed9b4259cabfb93098fd7361c72 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -65,7 +65,8 @@ account_widget_sip_discover_stun_toggled_cb (
 
 void
 empathy_account_widget_sip_build (EmpathyAccountWidget *self,
-                                  const char *filename)
+    const char *filename,
+    GtkWidget **table_common_settings)
 {
   EmpathyAccountWidgetSip *settings;
   GtkWidget *vbox_settings;
@@ -92,6 +93,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
       settings->self = self;
 
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", table_common_settings,
           "vbox_sip_settings", &vbox_settings,
           "entry_stun-server", &settings->entry_stun_server,
           "spinbutton_stun-port", &settings->spinbutton_stun_part,

diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 435ad6ea1f23d18ca71f9cb41063a6fc345d4c3a..6334a745b6ab99aa1fbed9cb95ddb2aaada9eaab 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -27,7 +27,8 @@
 G_BEGIN_DECLS
 
 void empathy_account_widget_sip_build (EmpathyAccountWidget *self,
-                                       const char *filename);
+    const char *filename,
+    GtkWidget **table_common_settings);
 
 G_END_DECLS
 

diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 84e68b01fded20455f835502b0aecc5d5352578c..65e16473d85860eb477fe926e0b4950ef97b6bba 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -11,7 +11,7 @@
     <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkTable" id="table1">
+      <object class="GtkTable" id="table_common_settings">
         <property name="visible">True</property>
         <property name="n_rows">2</property>
         <property name="n_columns">2</property>

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 7a72deb36628d4e0c5be0df39357a9f8641ecdc5..aa1c6724e5ce6bcee52758f6e46578e651385cf9 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -702,6 +702,7 @@ account_widget_build_generic (EmpathyAccountWidget *self,
   GtkWidget *expander_advanced;
 
   self->ui_details->gui = empathy_builder_get_file (filename,
+      "table_common_settings", &priv->table_common_settings,
       "vbox_generic_settings", &self->ui_details->widget,
       "expander_advanced_settings", &expander_advanced,
       NULL);
@@ -722,7 +723,10 @@ static void
 account_widget_build_salut (EmpathyAccountWidget *self,
     const char *filename)
 {
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
   self->ui_details->gui = empathy_builder_get_file (filename,
+      "table_common_settings", &priv->table_common_settings,
       "vbox_salut_settings", &self->ui_details->widget,
       NULL);
 
@@ -760,6 +764,7 @@ account_widget_build_msn (EmpathyAccountWidget *self,
   else
     {
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_msn_settings", &priv->table_common_settings,
           "vbox_msn_settings", &self->ui_details->widget,
           NULL);
 
@@ -864,6 +869,7 @@ account_widget_build_icq (EmpathyAccountWidget *self,
   else
     {
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
           "vbox_icq_settings", &self->ui_details->widget,
           "spinbutton_port", &spinbutton_port,
           NULL);
@@ -904,6 +910,7 @@ account_widget_build_aim (EmpathyAccountWidget *self,
   else
     {
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
           "vbox_aim_settings", &self->ui_details->widget,
           "spinbutton_port", &spinbutton_port,
           NULL);
@@ -942,6 +949,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
   else
     {
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
           "vbox_yahoo_settings", &self->ui_details->widget,
           NULL);
 
@@ -983,6 +991,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self,
   else
     {
       self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_groupwise_settings", &priv->table_common_settings,
           "vbox_groupwise_settings", &self->ui_details->widget,
           NULL);
 
@@ -1117,9 +1126,13 @@ do_constructed (GObject *obj)
   else if (!tp_strdiff (priv->protocol, "groupwise"))
     account_widget_build_groupwise (self, filename);
   else if (!tp_strdiff (priv->protocol, "irc"))
-    empathy_account_widget_irc_build (self, filename);
+    empathy_account_widget_irc_build (self, filename,
+        &priv->table_common_settings);
   else if (!tp_strdiff (priv->protocol, "sip"))
-    empathy_account_widget_sip_build (self, filename);
+    empathy_account_widget_sip_build (self, filename,
+        &priv->table_common_settings);
+  else if (!tp_strdiff (priv->protocol, "generic"))
+    account_widget_build_generic (self, filename);
   else
     {
       g_free (filename);