* Jonny Lamb <jonny.lamb@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
-#include <string.h>
+#include <glib/gi18n-lib.h>
-#include <telepathy-glib/util.h>
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-connection-managers.h"
#include "empathy-protocol-chooser.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/**
* SECTION:empathy-protocol-chooser
typedef struct
{
GtkListStore *store;
+
gboolean dispose_run;
EmpathyConnectionManagers *cms;
+ EmpathyProtocolChooserFilterFunc filter_func;
+ gpointer filter_user_data;
+
+ GHashTable *protocols;
} EmpathyProtocolChooserPriv;
enum
COL_ICON,
COL_LABEL,
COL_CM,
- COL_PROTOCOL,
+ COL_PROTOCOL_NAME,
+ COL_SERVICE,
COL_COUNT
};
GTK_TYPE_COMBO_BOX);
static gint
-protocol_chooser_sort_protocol_value (TpConnectionManagerProtocol *protocol)
+protocol_chooser_sort_protocol_value (const gchar *protocol_name)
{
guint i;
const gchar *names[] = {
"jabber",
- "salut",
+ "local-xmpp",
"gtalk",
NULL
};
for (i = 0 ; names[i]; i++)
{
- if (strcmp (protocol->name, names[i]) == 0)
+ if (strcmp (protocol_name, names[i]) == 0)
return i;
}
GtkTreeIter *iter_b,
gpointer user_data)
{
- TpConnectionManagerProtocol *protocol_a;
- TpConnectionManagerProtocol *protocol_b;
- gint cmp;
+ gchar *protocol_a;
+ gchar *protocol_b;
+ gint cmp = 0;
gtk_tree_model_get (model, iter_a,
- COL_PROTOCOL, &protocol_a,
+ COL_PROTOCOL_NAME, &protocol_a,
-1);
gtk_tree_model_get (model, iter_b,
- COL_PROTOCOL, &protocol_b,
+ COL_PROTOCOL_NAME, &protocol_b,
-1);
cmp = protocol_chooser_sort_protocol_value (protocol_a);
cmp -= protocol_chooser_sort_protocol_value (protocol_b);
if (cmp == 0)
{
- cmp = strcmp (protocol_a->name, protocol_b->name);
- }
-
- return cmp;
-}
+ cmp = strcmp (protocol_a, protocol_b);
+ /* only happens for jabber where there is one entry for gtalk and one for
+ * non-gtalk */
+ if (cmp == 0)
+ {
+ gchar *service;
+
+ gtk_tree_model_get (model, iter_a,
+ COL_SERVICE, &service,
+ -1);
-static const char *
-protocol_chooser_proto_name_to_display_name (const gchar *proto_name)
-{
- int i;
-
- static struct {
- const gchar *proto;
- const gchar *display;
- } names[] = {
- { "jabber", "XMPP" },
- { "msn", "MSN" },
- { "local-xmpp", "Salut" },
- { "irc", "IRC" },
- { "icq", "ICQ" },
- { "aim", "AIM" },
- { "yahoo", "Yahoo" },
- { "groupwise", "GroupWise" },
- { "sip", "SIP" },
- { NULL, NULL }
- };
+ if (service != NULL)
+ cmp = 1;
+ else
+ cmp = -1;
- for (i = 0; names[i].proto != NULL; i++)
- {
- if (!tp_strdiff (proto_name, names[i].proto))
- return names[i].display;
+ g_free (service);
+ }
}
- return NULL;
+ g_free (protocol_a);
+ g_free (protocol_b);
+ return cmp;
}
static void
TpConnectionManager *cm)
{
EmpathyProtocolChooserPriv *priv = GET_PRIV (chooser);
- const TpConnectionManagerProtocol * const *iter;
+ GList *protocols, *l;
+ const gchar *cm_name;
+
+ cm_name = tp_connection_manager_get_name (cm);
+
+ protocols = tp_connection_manager_dup_protocols (cm);
- for (iter = cm->protocols; iter != NULL && *iter != NULL; iter++)
+ for (l = protocols; l != NULL; l = g_list_next (l))
{
- const TpConnectionManagerProtocol *proto = *iter;
+ TpProtocol *protocol = l->data;
gchar *icon_name;
const gchar *display_name;
- gchar *display_name_set;
-
- icon_name = empathy_protocol_icon_name (proto->name);
- display_name = protocol_chooser_proto_name_to_display_name (proto->name);
-
- if (display_name == NULL)
- display_name = proto->name;
-
- if (!tp_strdiff (cm->name, "haze"))
- display_name_set = g_strdup_printf ("%s (Haze)", display_name);
- else
- display_name_set = g_strdup (display_name);
-
- gtk_list_store_insert_with_values (priv->store, NULL, 0,
- COL_ICON, icon_name,
- COL_LABEL, display_name_set,
+ const gchar *saved_cm_name;
+ const gchar *proto_name;
+ GdkPixbuf *pixbuf;
+
+ proto_name = tp_protocol_get_name (protocol);
+ saved_cm_name = g_hash_table_lookup (priv->protocols, proto_name);
+
+ if (!tp_strdiff (cm_name, "haze") && saved_cm_name != NULL &&
+ tp_strdiff (saved_cm_name, "haze"))
+ /* the CM we're adding is a haze implementation of something we already
+ * have; drop it.
+ */
+ continue;
+
+ if (!tp_strdiff (cm_name, "haze") &&
+ !tp_strdiff (proto_name, "facebook"))
+ /* Facebook now supports XMPP so drop the purple facebook plugin; user
+ * should use Gabble */
+ continue;
+
+ if (!tp_strdiff (cm_name, "haze") &&
+ !tp_strdiff (proto_name, "sip"))
+ /* Haze's SIP implementation is pretty useless (bgo #629736) */
+ continue;
+
+ if (!tp_strdiff (cm_name, "butterfly"))
+ /* Butterfly isn't supported any more */
+ continue;
+
+ if (tp_strdiff (cm_name, "haze") && !tp_strdiff (saved_cm_name, "haze"))
+ {
+ GtkTreeIter titer;
+ gboolean valid;
+ TpConnectionManager *haze_cm;
+
+ /* let's this CM replace the haze implementation */
+ valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->store),
+ &titer);
+
+ while (valid)
+ {
+ gchar *haze_proto_name = NULL;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &titer,
+ COL_PROTOCOL_NAME, &haze_proto_name,
+ COL_CM, &haze_cm, -1);
+
+ if (haze_cm == NULL)
+ continue;
+
+ if (!tp_strdiff (tp_connection_manager_get_name (haze_cm), "haze")
+ && !tp_strdiff (haze_proto_name, proto_name))
+ {
+ gtk_list_store_remove (priv->store, &titer);
+ g_object_unref (haze_cm);
+ g_free (haze_proto_name);
+ break;
+ }
+
+ g_object_unref (haze_cm);
+ g_free (haze_proto_name);
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store),
+ &titer);
+ }
+ }
+
+ g_hash_table_insert (priv->protocols,
+ g_strdup (proto_name), g_strdup (cm_name));
+
+ icon_name = empathy_protocol_icon_name (proto_name);
+ pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+
+ display_name = empathy_protocol_name_to_display_name (proto_name);
+
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, pixbuf,
+ COL_LABEL, display_name,
COL_CM, cm,
- COL_PROTOCOL, proto,
+ COL_PROTOCOL_NAME, proto_name,
-1);
- g_free (display_name_set);
+ g_clear_object (&pixbuf);
+
+ if (!tp_strdiff (proto_name, "jabber") &&
+ !tp_strdiff (cm_name, "gabble"))
+ {
+ display_name = empathy_service_name_to_display_name ("google-talk");
+ pixbuf = empathy_pixbuf_from_icon_name ("im-google-talk",
+ GTK_ICON_SIZE_BUTTON);
+
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, pixbuf,
+ COL_LABEL, display_name,
+ COL_CM, cm,
+ COL_PROTOCOL_NAME, proto_name,
+ COL_SERVICE, "google-talk",
+ -1);
+
+ g_clear_object (&pixbuf);
+
+ display_name = empathy_service_name_to_display_name ("facebook");
+ pixbuf = empathy_pixbuf_from_icon_name ("im-facebook",
+ GTK_ICON_SIZE_BUTTON);
+
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, pixbuf,
+ COL_LABEL, display_name,
+ COL_CM, cm,
+ COL_PROTOCOL_NAME, proto_name,
+ COL_SERVICE, "facebook",
+ -1);
+
+ g_clear_object (&pixbuf);
+ }
+
g_free (icon_name);
}
+
+ g_list_free_full (protocols, g_object_unref);
}
static void
}
static void
-protocol_chooser_cms_ready_cb (EmpathyConnectionManagers *cms,
- GParamSpec *pspec,
- EmpathyProtocolChooser *protocol_chooser)
+protocol_chooser_cms_prepare_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- if (empathy_connection_managers_is_ready (cms))
- protocol_chooser_add_cms_list
- (protocol_chooser, empathy_connection_managers_get_cms (cms));
+ EmpathyConnectionManagers *cms = EMPATHY_CONNECTION_MANAGERS (source);
+ EmpathyProtocolChooser *protocol_chooser = user_data;
+
+ if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
+ return;
+
+ protocol_chooser_add_cms_list (protocol_chooser,
+ empathy_connection_managers_get_cms (cms));
}
static void
/* set up combo box with new store */
priv->store = gtk_list_store_new (COL_COUNT,
- G_TYPE_STRING, /* Icon name */
+ GDK_TYPE_PIXBUF, /* Icon */
G_TYPE_STRING, /* Label */
G_TYPE_OBJECT, /* CM */
- G_TYPE_POINTER); /* protocol */
+ G_TYPE_STRING, /* protocol name */
+ G_TYPE_STRING); /* service */
+
+ /* Set the protocol sort function */
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->store),
+ COL_PROTOCOL_NAME,
+ protocol_chooser_sort_func,
+ NULL, NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
+ COL_PROTOCOL_NAME,
+ GTK_SORT_ASCENDING);
gtk_combo_box_set_model (GTK_COMBO_BOX (object),
GTK_TREE_MODEL (priv->store));
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), renderer,
- "icon-name", COL_ICON,
+ "pixbuf", COL_ICON,
NULL);
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), renderer, TRUE);
"text", COL_LABEL,
NULL);
- /* Set the protocol sort function */
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->store),
- COL_PROTOCOL,
- protocol_chooser_sort_func,
- NULL, NULL);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
- COL_PROTOCOL,
- GTK_SORT_ASCENDING);
-
- if (empathy_connection_managers_is_ready (priv->cms))
- protocol_chooser_add_cms_list (protocol_chooser,
- empathy_connection_managers_get_cms (priv->cms));
- else
- g_signal_connect (priv->cms, "notify::ready",
- G_CALLBACK (protocol_chooser_cms_ready_cb), protocol_chooser);
+ empathy_connection_managers_prepare_async (priv->cms,
+ protocol_chooser_cms_prepare_cb, protocol_chooser);
if (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->constructed)
- G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->constructed (object);
+ G_OBJECT_CLASS
+ (empathy_protocol_chooser_parent_class)->constructed (object);
}
static void
priv->dispose_run = FALSE;
priv->cms = empathy_connection_managers_dup_singleton ();
+ priv->protocols = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_free);
protocol_chooser->priv = priv;
}
+static void
+protocol_chooser_finalize (GObject *object)
+{
+ EmpathyProtocolChooser *protocol_chooser = EMPATHY_PROTOCOL_CHOOSER (object);
+ EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
+
+ if (priv->protocols)
+ {
+ g_hash_table_unref (priv->protocols);
+ priv->protocols = NULL;
+ }
+
+ (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->finalize) (object);
+}
+
static void
protocol_chooser_dispose (GObject *object)
{
object_class->constructed = protocol_chooser_constructed;
object_class->dispose = protocol_chooser_dispose;
+ object_class->finalize = protocol_chooser_finalize;
g_type_class_add_private (object_class, sizeof (EmpathyProtocolChooserPriv));
}
+static gboolean
+protocol_chooser_filter_visible_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ EmpathyProtocolChooser *protocol_chooser = user_data;
+ EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
+ TpConnectionManager *cm = NULL;
+ gchar *protocol_name = NULL;
+ gboolean visible = FALSE;
+ gchar *service;
+
+ gtk_tree_model_get (model, iter,
+ COL_CM, &cm,
+ COL_PROTOCOL_NAME, &protocol_name,
+ COL_SERVICE, &service,
+ -1);
+
+ if (cm != NULL && protocol_name != NULL)
+ {
+ TpProtocol *protocol;
+
+ protocol = tp_connection_manager_get_protocol_object (cm, protocol_name);
+
+ if (protocol != NULL)
+ {
+ visible = priv->filter_func (cm, protocol, service,
+ priv->filter_user_data);
+ }
+ }
+
+ if (cm != NULL)
+ g_object_unref (cm);
+
+ g_free (service);
+ return visible;
+}
+
/* public methods */
/**
TpConnectionManager *
empathy_protocol_chooser_dup_selected (
EmpathyProtocolChooser *protocol_chooser,
- TpConnectionManagerProtocol **protocol)
+ TpProtocol **protocol,
+ gchar **service)
{
- EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
GtkTreeIter iter;
TpConnectionManager *cm = NULL;
+ GtkTreeModel *cur_model;
g_return_val_if_fail (EMPATHY_IS_PROTOCOL_CHOOSER (protocol_chooser), NULL);
+ /* get the current model from the chooser, as we could either be filtering
+ * or not.
+ */
+ cur_model = gtk_combo_box_get_model (GTK_COMBO_BOX (protocol_chooser));
+
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (protocol_chooser), &iter))
{
- gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
COL_CM, &cm,
-1);
if (protocol != NULL)
- gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter,
- COL_PROTOCOL, protocol,
- -1);
+ {
+ gchar *protocol_name = NULL;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
+ COL_PROTOCOL_NAME, &protocol_name,
+ -1);
+
+ *protocol = tp_connection_manager_get_protocol_object (cm,
+ protocol_name);
+
+ g_free (protocol_name);
+
+ if (*protocol == NULL)
+ {
+ /* For some reason the CM doesn't know about this protocol
+ * any more */
+ g_object_unref (cm);
+ return NULL;
+ }
+ }
+
+ if (service != NULL)
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
+ COL_SERVICE, service,
+ -1);
+ }
}
return cm;
{
return GTK_WIDGET (g_object_new (EMPATHY_TYPE_PROTOCOL_CHOOSER, NULL));
}
+
+void
+empathy_protocol_chooser_set_visible (EmpathyProtocolChooser *protocol_chooser,
+ EmpathyProtocolChooserFilterFunc func,
+ gpointer user_data)
+{
+ EmpathyProtocolChooserPriv *priv;
+ GtkTreeModel *filter_model;
+
+ g_return_if_fail (EMPATHY_IS_PROTOCOL_CHOOSER (protocol_chooser));
+
+ priv = GET_PRIV (protocol_chooser);
+ priv->filter_func = func;
+ priv->filter_user_data = user_data;
+
+ filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store),
+ NULL);
+ gtk_combo_box_set_model (GTK_COMBO_BOX (protocol_chooser), filter_model);
+ g_object_unref (filter_model);
+
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER
+ (filter_model), protocol_chooser_filter_visible_func,
+ protocol_chooser, NULL);
+
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (protocol_chooser), 0);
+}
+
+EmpathyAccountSettings *
+empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
+{
+ EmpathyAccountSettings *settings = NULL;
+ gchar *str;
+ const gchar *display_name;
+ TpConnectionManager *cm;
+ TpProtocol *proto;
+ gchar *service = NULL;
+
+ cm = empathy_protocol_chooser_dup_selected (self, &proto, &service);
+ if (cm == NULL || proto == NULL)
+ goto out;
+
+ if (service != NULL)
+ display_name = empathy_service_name_to_display_name (service);
+ else
+ display_name = empathy_protocol_name_to_display_name (
+ tp_protocol_get_name (proto));
+
+ /* Create account */
+ /* To translator: %s is the name of the protocol, such as "Google Talk" or
+ * "Yahoo!"
+ */
+ str = g_strdup_printf (_("New %s account"), display_name);
+
+ settings = empathy_account_settings_new (tp_connection_manager_get_name (cm),
+ tp_protocol_get_name (proto), service, str);
+
+ g_free (str);
+
+ if (!tp_strdiff (service, "google-talk"))
+ {
+ const gchar *fallback_servers[] = {
+ "talkx.l.google.com",
+ "talkx.l.google.com:443,oldssl",
+ "talkx.l.google.com:80",
+ NULL};
+
+ const gchar *extra_certificate_identities[] = {
+ "talk.google.com",
+ NULL};
+
+ empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+ NULL, NULL);
+ empathy_account_settings_set (settings, "server",
+ g_variant_new_string (extra_certificate_identities[0]));
+ empathy_account_settings_set (settings, "require-encryption",
+ g_variant_new_boolean (TRUE));
+ empathy_account_settings_set (settings, "fallback-servers",
+ g_variant_new_strv (fallback_servers, -1));
+
+ if (empathy_account_settings_have_tp_param (settings,
+ "extra-certificate-identities"))
+ {
+ empathy_account_settings_set (settings,
+ "extra-certificate-identities",
+ g_variant_new_strv (extra_certificate_identities, -1));
+ }
+ }
+ else if (!tp_strdiff (service, "facebook"))
+ {
+ const gchar *fallback_servers[] = {
+ "chat.facebook.com:443",
+ NULL };
+
+ empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+ NULL, NULL);
+ empathy_account_settings_set (settings, "require-encryption",
+ g_variant_new_boolean (TRUE));
+ empathy_account_settings_set (settings, "server",
+ g_variant_new_string ("chat.facebook.com"));
+ empathy_account_settings_set (settings, "fallback-servers",
+ g_variant_new_strv (fallback_servers, -1));
+ }
+
+out:
+ tp_clear_object (&cm);
+ g_free (service);
+ return settings;
+}
projects / empathy.git / blobdiff