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[] = {
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;
+ 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);
+ 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);
+
+ if (service != NULL)
+ cmp = 1;
+ else
+ cmp = -1;
+
+ g_free (service);
+ }
}
+ g_free (protocol_a);
+ g_free (protocol_b);
return cmp;
}
const TpConnectionManagerProtocol *proto = *iter;
gchar *icon_name;
const gchar *display_name;
- gchar *display_name_set;
const gchar *saved_cm_name;
saved_cm_name = g_hash_table_lookup (priv->protocols, proto->name);
*/
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, "haze") && !tp_strdiff (saved_cm_name, "haze"))
{
GtkTreeIter titer;
gboolean valid;
- const TpConnectionManagerProtocol *haze_proto;
TpConnectionManager *haze_cm;
/* let's this CM replace the haze implementation */
while (valid)
{
+ gchar *haze_proto_name = NULL;
+
gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &titer,
- COL_PROTOCOL, &haze_proto,
+ COL_PROTOCOL_NAME, &haze_proto_name,
COL_CM, &haze_cm, -1);
if (haze_cm == NULL)
continue;
- if (haze_proto == NULL)
- {
- g_object_unref (haze_cm);
- continue;
- }
-
if (!tp_strdiff (haze_cm->name, "haze") &&
- !tp_strdiff (haze_proto->name, proto->name))
+ !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_strdup (proto->name), g_strdup (cm->name));
icon_name = empathy_protocol_icon_name (proto->name);
- display_name = empathy_protocol_name_to_display_name (proto->name);
- if (display_name == NULL)
- display_name = proto->name;
+ display_name = empathy_protocol_name_to_display_name (proto->name);
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
COL_ICON, icon_name,
COL_LABEL, display_name,
COL_CM, cm,
- COL_PROTOCOL, proto,
+ COL_PROTOCOL_NAME, proto->name,
-1);
-
+ if (!tp_strdiff (proto->name, "jabber") &&
+ !tp_strdiff (cm->name, "gabble"))
+ {
+ display_name = empathy_service_name_to_display_name ("google-talk");
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, "im-google-talk",
+ COL_LABEL, display_name,
+ COL_CM, cm,
+ COL_PROTOCOL_NAME, proto->name,
+ COL_SERVICE, "google-talk",
+ -1);
+
+ display_name = empathy_service_name_to_display_name ("facebook");
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, "im-facebook",
+ COL_LABEL, display_name,
+ COL_CM, cm,
+ COL_PROTOCOL_NAME, proto->name,
+ COL_SERVICE, "facebook",
+ -1);
+ }
- g_free (display_name_set);
g_free (icon_name);
}
}
}
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
G_TYPE_STRING, /* Icon name */
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,
+ COL_PROTOCOL_NAME,
protocol_chooser_sort_func,
NULL, NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
- COL_PROTOCOL,
+ COL_PROTOCOL_NAME,
GTK_SORT_ASCENDING);
gtk_combo_box_set_model (GTK_COMBO_BOX (object),
"text", COL_LABEL,
NULL);
- 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
if (priv->protocols)
{
- g_hash_table_destroy (priv->protocols);
+ g_hash_table_unref (priv->protocols);
priv->protocols = NULL;
}
EmpathyProtocolChooser *protocol_chooser = user_data;
EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
TpConnectionManager *cm = NULL;
- TpConnectionManagerProtocol *protocol = NULL;
+ gchar *protocol_name = NULL;
gboolean visible = FALSE;
+ gchar *service;
- gtk_tree_model_get (model, iter, COL_CM, &cm, COL_PROTOCOL, &protocol, -1);
+ gtk_tree_model_get (model, iter,
+ COL_CM, &cm,
+ COL_PROTOCOL_NAME, &protocol_name,
+ COL_SERVICE, &service,
+ -1);
- if (cm != NULL && protocol != NULL)
+ if (cm != NULL && protocol_name != NULL)
{
- visible = priv->filter_func (cm, protocol, priv->filter_user_data);
- g_object_unref (cm);
+ TpConnectionManagerProtocol *protocol;
+
+ protocol = (TpConnectionManagerProtocol *)
+ tp_connection_manager_get_protocol (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;
}
TpConnectionManager *
empathy_protocol_chooser_dup_selected (
EmpathyProtocolChooser *protocol_chooser,
- TpConnectionManagerProtocol **protocol)
+ TpConnectionManagerProtocol **protocol,
+ gchar **service)
{
GtkTreeIter iter;
TpConnectionManager *cm = NULL;
-1);
if (protocol != NULL)
- gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &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 = (TpConnectionManagerProtocol *)
+ tp_connection_manager_get_protocol (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;
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;
+ TpConnectionManagerProtocol *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 (proto->name);
+
+ /* 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 (cm->name, proto->name, service, str);
+
+ g_free (str);
+
+ if (!tp_strdiff (service, "google-talk"))
+ {
+ gchar *fallback_servers[] = {
+ "talkx.l.google.com",
+ "talkx.l.google.com:443,oldssl",
+ "talkx.l.google.com:80",
+ NULL};
+
+ 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_string (settings, "server",
+ extra_certificate_identities[0]);
+ empathy_account_settings_set_boolean (settings, "require-encryption",
+ TRUE);
+ empathy_account_settings_set_strv (settings, "fallback-servers",
+ fallback_servers);
+
+ if (empathy_account_settings_have_tp_param (settings,
+ "extra-certificate-identities"))
+ {
+ empathy_account_settings_set_strv (settings,
+ "extra-certificate-identities", extra_certificate_identities);
+ }
+ }
+ else if (!tp_strdiff (service, "facebook"))
+ {
+ empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+ NULL, NULL);
+ empathy_account_settings_set_boolean (settings, "require-encryption",
+ TRUE);
+ empathy_account_settings_set_string (settings, "server",
+ "chat.facebook.com");
+ }
+
+out:
+ tp_clear_object (&cm);
+ g_free (service);
+ return settings;
+}
projects / empathy.git / blobdiff