Updated Basque language

[empathy.git] / libempathy / empathy-log-manager.c

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 22404cd1e28f58dbc3d4480f9edbd906db121500..309b3b60f50c87d8a179b0e725e49e87bf7aa11a 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
@@ -29,6 +29,7 @@
 #include <glib/gstdio.h>
 
 #include <telepathy-glib/util.h>
+#include <telepathy-glib/interfaces.h>
 
 #include "empathy-log-manager.h"
 #include "empathy-log-store-empathy.h"
@@ -157,7 +158,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
 
 gboolean
 empathy_log_manager_exists (EmpathyLogManager *manager,
-                            McAccount *account,
+                            EmpathyAccount *account,
                             const gchar *chat_id,
                             gboolean chatroom)
 {
@@ -165,7 +166,6 @@ empathy_log_manager_exists (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE);
-  g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE);
   g_return_val_if_fail (chat_id != NULL, FALSE);
 
   priv = GET_PRIV (manager);
@@ -182,7 +182,7 @@ empathy_log_manager_exists (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_dates (EmpathyLogManager *manager,
-                               McAccount *account,
+                               EmpathyAccount *account,
                                const gchar *chat_id,
                                gboolean chatroom)
 {
@@ -190,7 +190,6 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
@@ -219,7 +218,7 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
-                                           McAccount *account,
+                                           EmpathyAccount *account,
                                            const gchar *chat_id,
                                            gboolean chatroom,
                                            const gchar *date)
@@ -228,7 +227,6 @@ empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
@@ -261,7 +259,7 @@ log_manager_message_date_cmp (gconstpointer a,
 
 GList *
 empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
-                                          McAccount *account,
+                                          EmpathyAccount *account,
                                           const gchar *chat_id,
                                           gboolean chatroom,
                                           guint num_messages,
@@ -274,12 +272,12 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
   guint i = 0;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
 
-  /* Get num_messages from each log store */
+  /* Get num_messages from each log store and keep only the
+   * newest ones in the out list. Keep that list sorted: Older first. */
   for (l = priv->stores; l; l = g_list_next (l))
     {
       EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
@@ -298,7 +296,7 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
             }
           else if (log_manager_message_date_cmp (new->data, out->data) > 0)
             {
-              /* This message is newer than the older message we have in out
+              /* This message is newer than the oldest message we have in out
                * list. Remove the head of out list and insert this message */
               g_object_unref (out->data);
               out = g_list_delete_link (out, out);
@@ -307,7 +305,7 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
             }
           else
             {
-              /* This message is older than the older message we have in out
+              /* This message is older than the oldest message we have in out
                * list. Drop it. */
               g_object_unref (new->data);
             }
@@ -321,13 +319,12 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_chats (EmpathyLogManager *manager,
-                               McAccount *account)
+                               EmpathyAccount *account)
 {
   GList *l, *out = NULL;
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 
   priv = GET_PRIV (manager);