Cleanup code from previous merge

[empathy.git] / libempathy / empathy-tp-contact-factory.c

diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 14d2640da484ef7fd4868ef70088ddc5838b4b51..1cce6080c8acea77ac3798f790a72c66bf93dfcf 100644 (file)
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -122,6 +122,8 @@ tp_contact_factory_presences_table_foreach (const gchar    *state_str,
        if (message != NULL) {
                empathy_contact_set_presence_message (contact,
                                                      g_value_get_string (message));
+       } else {
+               empathy_contact_set_presence_message (contact, NULL);
        }
 }
 
@@ -533,6 +535,8 @@ tp_contact_factory_get_capabilities_cb (DBusGProxy *proxy,
        if (error) {
                empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s",
                               error->message);
+               /* FIXME Should set the capabilities of the contacts for which this request
+                * originated to NONE */
                goto OUT;
        }