#include "empathy-tp-contact-factory.h"
#include "empathy-utils.h"
-#include "empathy-debug.h"
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv))
-#define DEBUG_DOMAIN "TpContactFactory"
+#define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
-struct _EmpathyTpContactFactoryPriv {
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactFactory)
+typedef struct {
MissionControl *mc;
McAccount *account;
TpConnection *connection;
GList *contacts;
EmpathyContact *user;
-};
-
-static void empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass);
-static void empathy_tp_contact_factory_init (EmpathyTpContactFactory *factory);
+ gpointer token;
+} EmpathyTpContactFactoryPriv;
G_DEFINE_TYPE (EmpathyTpContactFactory, empathy_tp_contact_factory, G_TYPE_OBJECT);
enum {
PROP_0,
PROP_ACCOUNT,
+ PROP_READY
};
static EmpathyContact *
{
EmpathyTpContactFactoryPriv *priv = GET_PRIV (data);
- empathy_debug (DEBUG_DOMAIN, "Remove finalized contact %p",
- where_the_object_was);
+ DEBUG ("Remove finalized contact %p", where_the_object_was);
priv->contacts = g_list_remove (priv->contacts, where_the_object_was);
}
EmpathyContact *contact)
{
const GValue *message;
+ const gchar *message_str = NULL;
empathy_contact_set_presence (contact,
empathy_presence_from_str (state_str));
message = g_hash_table_lookup (presences_table, "message");
- if (message != NULL) {
- empathy_contact_set_presence_message (contact,
- g_value_get_string (message));
+ if (message) {
+ message_str = g_value_get_string (message);
+ }
+
+ if (!G_STR_EMPTY (message_str)) {
+ empathy_contact_set_presence_message (contact, message_str);
} else {
empathy_contact_set_presence_message (contact, NULL);
}
(GHFunc) tp_contact_factory_presences_table_foreach,
contact);
- empathy_debug (DEBUG_DOMAIN, "Changing presence for contact %s (%d) to %s (%d)",
- empathy_contact_get_id (contact),
- handle,
- empathy_contact_get_presence_message (contact),
- empathy_contact_get_presence (contact));
+ DEBUG ("Changing presence for contact %s (%d) to '%s' (%d)",
+ empathy_contact_get_id (contact),
+ handle,
+ empathy_contact_get_presence_message (contact),
+ empathy_contact_get_presence (contact));
}
static void
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error getting presence: %s",
- error->message);
+ DEBUG ("Error getting presence: %s", error->message);
if (error->domain == TP_DBUS_ERRORS &&
error->code == TP_DBUS_ERROR_NO_INTERFACE) {
guint *handles = user_data;
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error setting alias: %s",
- error->message);
+ DEBUG ("Error setting alias: %s", error->message);
}
}
const gchar **name;
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error requesting aliases: %s",
- error->message);
+ DEBUG ("Error requesting aliases: %s", error->message);
+
+ /* If we failed to get alias set it to NULL, like that if
+ * someone is waiting for the name to be ready it won't wait
+ * infinitely */
+ while (*handles != 0) {
+ EmpathyContact *contact;
+
+ contact = tp_contact_factory_find_by_handle (
+ (EmpathyTpContactFactory*) tp_factory,
+ *handles);
+ if (contact) {
+ empathy_contact_set_name (contact, NULL);
+ }
+
+ handles++;
+ }
return;
}
continue;
}
- empathy_debug (DEBUG_DOMAIN, "Renaming contact %s (%d) to %s (request cb)",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- *name);
+ DEBUG ("Renaming contact %s (%d) to %s (request cb)",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact),
+ *name);
empathy_contact_set_name (contact, *name);
EmpathyContact *contact;
renamed_struct = g_ptr_array_index (renamed_handlers, i);
- handle = g_value_get_uint(g_value_array_get_nth (renamed_struct, 0));
- alias = g_value_get_string(g_value_array_get_nth (renamed_struct, 1));
+ handle = g_value_get_uint (g_value_array_get_nth (renamed_struct, 0));
+ alias = g_value_get_string (g_value_array_get_nth (renamed_struct, 1));
contact = tp_contact_factory_find_by_handle (tp_factory, handle);
if (!contact) {
continue;
}
- empathy_debug (DEBUG_DOMAIN, "Renaming contact %s (%d) to %s (changed cb)",
- empathy_contact_get_id (contact),
- handle, alias);
+ DEBUG ("Renaming contact %s (%d) to %s (changed cb)",
+ empathy_contact_get_id (contact),
+ handle, alias);
empathy_contact_set_name (contact, alias);
}
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error setting avatar: %s",
- error->message);
+ DEBUG ("Error setting avatar: %s", error->message);
}
}
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error clearing avatar: %s",
- error->message);
+ DEBUG ("Error clearing avatar: %s", error->message);
}
}
GObject *tp_factory)
{
EmpathyContact *contact;
- EmpathyAvatar *avatar;
contact = tp_contact_factory_find_by_handle (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
handle);
return;
}
- empathy_debug (DEBUG_DOMAIN, "Avatar retrieved for contact %s (%d)",
- empathy_contact_get_id (contact),
- handle);
-
- avatar = empathy_avatar_new (avatar_data->data,
- avatar_data->len,
- mime_type,
- token);
+ DEBUG ("Avatar retrieved for contact %s (%d)",
+ empathy_contact_get_id (contact),
+ handle);
- empathy_contact_set_avatar (contact, avatar);
- empathy_avatar_unref (avatar);
+ empathy_contact_load_avatar_data (contact,
+ avatar_data->data,
+ avatar_data->len,
+ mime_type,
+ token);
}
static void
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error requesting avatars: %s",
- error->message);
+ DEBUG ("Error requesting avatars: %s", error->message);
}
}
}
/* The avatar changed, search the new one in the cache */
- avatar = empathy_avatar_new_from_cache (token);
- if (avatar) {
+ if (empathy_contact_load_avatar_cache (contact, token)) {
/* Got from cache, use it */
- empathy_contact_set_avatar (contact, avatar);
- empathy_avatar_unref (avatar);
return TRUE;
}
TokensData data;
if (error) {
- empathy_debug (DEBUG_DOMAIN,
- "Error getting known avatars tokens: %s",
- error->message);
+ DEBUG ("Error getting known avatars tokens: %s", error->message);
return;
}
tp_contact_factory_avatar_tokens_foreach,
&data);
- empathy_debug (DEBUG_DOMAIN, "Got %d tokens, need to request %d avatars",
- g_hash_table_size (tokens),
- data.handles->len);
+ DEBUG ("Got %d tokens, need to request %d avatars",
+ g_hash_table_size (tokens), data.handles->len);
/* Request needed avatars */
if (data.handles->len > 0) {
return;
}
- empathy_debug (DEBUG_DOMAIN, "Need to request avatar for token %s",
- new_token);
+ DEBUG ("Need to request avatar for token %s", new_token);
handles = g_array_new (FALSE, FALSE, sizeof (guint));
g_array_append_val (handles, handle);
}
}
- empathy_debug (DEBUG_DOMAIN, "Changing capabilities for contact %s (%d) to %d",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- capabilities);
+ DEBUG ("Changing capabilities for contact %s (%d) to %d",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact),
+ capabilities);
empathy_contact_set_capabilities (contact, capabilities);
}
guint i;
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s",
- error->message);
+ DEBUG ("Error getting capabilities: %s", error->message);
/* FIXME Should set the capabilities of the contacts for which this request
* originated to NONE */
return;
EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
guint *dup_handles;
- if (!priv->ready) {
- return;
- }
+ g_return_if_fail (priv->ready);
dup_handles = g_malloc0 ((handles->len + 1) * sizeof (guint));
g_memmove (dup_handles, handles->data, handles->len * sizeof (guint));
dup_handles, g_free,
G_OBJECT (tp_factory));
- dup_handles = g_memdup (handles->data, handles->len * sizeof (guint));
+ /* FIXME: Sometimes the dbus call timesout because CM takes
+ * too much time to request all aliases from the server,
+ * that's why we increase the timeout here. See fd.o bug #14795 */
+ dup_handles = g_malloc0 ((handles->len + 1) * sizeof (guint));
+ g_memmove (dup_handles, handles->data, handles->len * sizeof (guint));
tp_cli_connection_interface_aliasing_call_request_aliases (priv->connection,
- -1,
+ 5*60*1000,
handles,
tp_contact_factory_request_aliases_cb,
dup_handles, g_free,
guint i = 0;
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Failed to request handles: %s",
- error->message);
+ DEBUG ("Failed to request handles: %s", error->message);
return;
}
GList *l;
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Failed to inspect handles: %s",
- error->message);
+ DEBUG ("Failed to inspect handles: %s", error->message);
return;
}
{
EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
- empathy_debug (DEBUG_DOMAIN, "Connection invalidated");
+ DEBUG ("Connection invalidated");
g_object_unref (priv->connection);
priv->connection = NULL;
priv->ready = FALSE;
+ g_object_notify (G_OBJECT (tp_factory), "ready");
+
g_list_foreach (priv->contacts,
tp_contact_factory_disconnect_contact_foreach,
GList *id_needed_contacts = NULL;
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Failed to get self handles: %s",
- error->message);
+ DEBUG ("Failed to get self handles: %s", error->message);
return;
}
- empathy_debug (DEBUG_DOMAIN, "Connection ready");
+ DEBUG ("Connection ready");
empathy_contact_set_handle (priv->user, handle);
priv->ready = TRUE;
+ g_object_notify (tp_factory, "ready");
/* Connect signals */
tp_cli_connection_interface_aliasing_connect_to_aliases_changed (priv->connection,
handle_needed_contacts, tp_contact_factory_list_free,
G_OBJECT (tp_factory));
- tp_contact_factory_request_everything ((EmpathyTpContactFactory*) tp_factory,
- id_needed);
tp_cli_connection_call_inspect_handles (priv->connection,
-1,
TP_HANDLE_TYPE_CONTACT,
id_needed_contacts, tp_contact_factory_list_free,
G_OBJECT (tp_factory));
+ tp_contact_factory_request_everything ((EmpathyTpContactFactory*) tp_factory,
+ id_needed);
+
g_array_free (handle_needed, TRUE);
g_array_free (id_needed, TRUE);
}
tp_contact_factory_status_updated (EmpathyTpContactFactory *tp_factory)
{
EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
- TpConn *tp_conn;
gboolean connection_ready;
if (priv->connection) {
return;
}
- tp_conn = mission_control_get_connection (priv->mc, priv->account, NULL);
- if (!tp_conn) {
+ priv->connection = mission_control_get_tpconnection (priv->mc, priv->account, NULL);
+ if (!priv->connection) {
return;
}
/* We got a new connection, wait for it to be ready */
- priv->connection = tp_conn_dup_connection (tp_conn);
- g_object_unref (tp_conn);
-
g_signal_connect_swapped (priv->connection, "invalidated",
G_CALLBACK (tp_contact_factory_connection_invalidated_cb),
tp_factory);
tp_factory);
priv->contacts = g_list_prepend (priv->contacts, contact);
- empathy_debug (DEBUG_DOMAIN, "Contact added: %s (%d)",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact));
+ DEBUG ("Contact added: %s (%d)",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact));
}
static void
GObject *tp_factory)
{
if (error) {
- empathy_debug (DEBUG_DOMAIN, "Failed to hold handles: %s",
- error->message);
+ DEBUG ("Failed to hold handles: %s", error->message);
}
}
g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+ g_return_if_fail (priv->ready);
g_return_if_fail (empathy_account_equal (empathy_contact_get_account (contact),
priv->account));
- if (!priv->ready) {
- return;
- }
-
handle = empathy_contact_get_handle (contact);
- empathy_debug (DEBUG_DOMAIN, "Setting alias for contact %s (%d) to %s",
- empathy_contact_get_id (contact),
- handle, alias);
+ DEBUG ("Setting alias for contact %s (%d) to %s",
+ empathy_contact_get_id (contact),
+ handle, alias);
new_alias = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
-
- if (!priv->ready) {
- return;
- }
+ g_return_if_fail (priv->ready);
if (data && size > 0 && size < G_MAXUINT) {
GArray avatar;
avatar.data = (gchar*) data;
avatar.len = size;
- empathy_debug (DEBUG_DOMAIN, "Setting avatar on account %s",
- mc_account_get_unique_name (priv->account));
+ DEBUG ("Setting avatar on account %s",
+ mc_account_get_unique_name (priv->account));
tp_cli_connection_interface_avatars_call_set_avatar (priv->connection,
-1,
NULL, NULL,
G_OBJECT (tp_factory));
} else {
- empathy_debug (DEBUG_DOMAIN, "Clearing avatar on account %s",
- mc_account_get_unique_name (priv->account));
+ DEBUG ("Clearing avatar on account %s",
+ mc_account_get_unique_name (priv->account));
tp_cli_connection_interface_avatars_call_clear_avatar (priv->connection,
-1,
}
}
+gboolean
+empathy_tp_contact_factory_is_ready (EmpathyTpContactFactory *tp_factory)
+{
+ EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+
+ g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory), FALSE);
+
+ return priv->ready;
+}
+
static void
tp_contact_factory_get_property (GObject *object,
guint param_id,
case PROP_ACCOUNT:
g_value_set_object (value, priv->account);
break;
+ case PROP_READY:
+ g_value_set_boolean (value, priv->ready);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
GList *l;
- empathy_debug (DEBUG_DOMAIN, "Finalized: %p (%s)",
- object,
- mc_account_get_normalized_name (priv->account));
+ DEBUG ("Finalized: %p (%s)", object,
+ mc_account_get_normalized_name (priv->account));
- dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc),
- "AccountStatusChanged",
- G_CALLBACK (tp_contact_factory_status_changed_cb),
- object);
+ empathy_disconnect_account_status_changed (priv->token);
for (l = priv->contacts; l; l = l->next) {
g_object_weak_unref (G_OBJECT (l->data),
object_class->get_property = tp_contact_factory_get_property;
object_class->set_property = tp_contact_factory_set_property;
- /* Construct-only properties */
g_object_class_install_property (object_class,
PROP_ACCOUNT,
g_param_spec_object ("account",
MC_TYPE_ACCOUNT,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_READY,
+ g_param_spec_boolean ("ready",
+ "Wheter the factor is ready",
+ "Is the factory ready",
+ FALSE,
+ G_PARAM_READABLE));
g_type_class_add_private (object_class, sizeof (EmpathyTpContactFactoryPriv));
}
static void
empathy_tp_contact_factory_init (EmpathyTpContactFactory *tp_factory)
{
- EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+ EmpathyTpContactFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (tp_factory,
+ EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv);
+ tp_factory->priv = priv;
priv->mc = empathy_mission_control_new ();
- dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
- "AccountStatusChanged",
- G_CALLBACK (tp_contact_factory_status_changed_cb),
- tp_factory, NULL);
+ priv->token = empathy_connect_to_account_status_changed (priv->mc,
+ G_CALLBACK (tp_contact_factory_status_changed_cb),
+ tp_factory, NULL);
}
EmpathyTpContactFactory *
projects / empathy.git / blobdiff