Updated Spanish translation

[empathy.git] / libempathy-gtk / empathy-log-window.c

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index f294502c6ce43c838ffffd33d2dcd3331f452404..d58de82e4e20b889e123ee752f5616c1a750f50f 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -30,6 +30,8 @@
 #include <tp-account-widgets/tpaw-builder.h>
 #include <tp-account-widgets/tpaw-images.h>
 #include <tp-account-widgets/tpaw-camera-monitor.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "action-chain-internal.h"
 #include "empathy-account-chooser.h"
@@ -344,7 +346,7 @@ toolbutton_av_clicked (GtkToolButton *toolbutton,
   empathy_call_new_with_streams (
       empathy_contact_get_id (self->priv->selected_contact),
       empathy_contact_get_account (self->priv->selected_contact),
-      TRUE, video, gtk_get_current_event_time ());
+      video, gtk_get_current_event_time ());
 }
 
 static void
@@ -376,7 +378,7 @@ insert_or_change_row (EmpathyLogWindow *self,
       if (icon_info != NULL)
         icon = g_strdup (gtk_icon_info_get_filename (icon_info));
 
-      gtk_icon_info_free (icon_info);
+      g_object_unref (icon_info);
     }
 
   escaped_text = g_string_new (NULL);
@@ -879,8 +881,7 @@ maybe_refresh_logs (TpChannel *channel,
   if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_TEXT) &&
       !(event_mask & TPL_EVENT_MASK_TEXT))
     goto out;
-  if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) ||
-       !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) &&
+  if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) &&
       !(event_mask & TPL_EVENT_MASK_CALL))
     goto out;
 
@@ -1022,8 +1023,7 @@ observe_channels (TpSimpleObserver *observer,
           tp_g_signal_connect_object (channel, "invalidated",
               G_CALLBACK (on_channel_ended), self, 0);
         }
-      else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL) ||
-          !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
+      else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL))
         {
           g_hash_table_insert (self->priv->channels,
               g_object_ref (channel), g_object_ref (account));
@@ -1059,11 +1059,6 @@ log_window_create_observer (EmpathyLogWindow *self)
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
             TP_IFACE_CHANNEL_TYPE_TEXT,
           NULL));
-  tp_base_client_take_observer_filter (self->priv->observer,
-      tp_asv_new (
-          TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-            TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-          NULL));
   tp_base_client_take_observer_filter (self->priv->observer,
       tp_asv_new (
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
@@ -1332,7 +1327,7 @@ log_window_append_call (TplEvent *event,
   GTimeSpan span;
 
   /* If searching, only add the call if the search string appears anywhere */
-  if (!EMP_STR_EMPTY (log_window->priv->last_find))
+  if (!TPAW_STR_EMPTY (log_window->priv->last_find))
     {
       if (strstr (tpl_entity_get_identifier (tpl_event_get_sender (event)),
               log_window->priv->last_find) == NULL &&
@@ -2009,7 +2004,7 @@ log_window_find_populate (EmpathyLogWindow *self,
 
   gtk_list_store_clear (store);
 
-  if (EMP_STR_EMPTY (search_criteria))
+  if (TPAW_STR_EMPTY (search_criteria))
     {
       tp_clear_pointer (&self->priv->hits, tpl_log_manager_search_free);
       webkit_web_view_set_highlight_text_matches (