assistant: filter out facebook from the new account page

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 65f70ee97b2fde7767df6411ea78eb0821ca7e34..72eb05536428c1df69b3e67e359de4c9e60fbc3b 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -421,12 +421,13 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
   TpConnectionManager *cm = NULL;
   gchar *protocol_name = NULL;
   gboolean visible = FALSE;
-  gboolean is_gtalk;
+  gboolean is_gtalk, is_facebook;
 
   gtk_tree_model_get (model, iter,
       COL_CM, &cm,
       COL_PROTOCOL_NAME, &protocol_name,
       COL_IS_GTALK, &is_gtalk,
+      COL_IS_FACEBOOK, &is_facebook,
       -1);
 
   if (cm != NULL && protocol_name != NULL)
@@ -438,7 +439,7 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
 
       if (protocol != NULL)
         {
-          visible = priv->filter_func (cm, protocol, is_gtalk,
+          visible = priv->filter_func (cm, protocol, is_gtalk, is_facebook,
               priv->filter_user_data);
         }
     }

diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index b4ffeb33c3b0fc6d8df9dea8687b29b9343eeb7d..88b23cba26fa92420d328b960fd75ca014fef35a 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -61,6 +61,7 @@ struct _EmpathyProtocolChooserClass
 typedef gboolean (*EmpathyProtocolChooserFilterFunc) (TpConnectionManager *cm,
     TpConnectionManagerProtocol *protocol,
     gboolean is_gtalk,
+    gboolean is_facebook,
     gpointer user_data);
 
 GType empathy_protocol_chooser_get_type (void) G_GNUC_CONST;

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 99c505b368d18a0daaef92f44dfde818d15b0bd4..f3cfc1f2accb1aa948f0d133b269bb1eadddd947 100644 (file)
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -459,6 +459,7 @@ account_assistant_chooser_enter_details_filter_func (
     TpConnectionManager *cm,
     TpConnectionManagerProtocol *protocol,
     gboolean is_gtalk,
+    gboolean is_facebook,
     gpointer user_data)
 {
   if (!tp_strdiff (protocol->name, "local-xmpp") ||
@@ -473,9 +474,10 @@ account_assistant_chooser_create_account_filter_func (
     TpConnectionManager *cm,
     TpConnectionManagerProtocol *protocol,
     gboolean is_gtalk,
+    gboolean is_facebook,
     gpointer user_data)
 {
-  if (is_gtalk)
+  if (is_gtalk || is_facebook)
     return FALSE;
 
   return tp_connection_manager_protocol_can_register (protocol);