empathy r2588 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar  6 11:51:52 2009
New Revision: 2588
URL: http://svn.gnome.org/viewvc/empathy?rev=2588&view=rev

Log:
Use g_list_concat even if the current GList is empty (NULL).

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-log-manager.c

Modified: trunk/libempathy/empathy-log-manager.c
==============================================================================
--- trunk/libempathy/empathy-log-manager.c	(original)
+++ trunk/libempathy/empathy-log-manager.c	Fri Mar  6 11:51:52 2009
@@ -236,12 +236,8 @@
     {
       EmpathyLogSource *source = EMPATHY_LOG_SOURCE (l->data);
 
-      if (!out)
-        out = empathy_log_source_get_messages_for_date (source, account,
-            chat_id, chatroom, date);
-      else
-        out = g_list_concat (out, empathy_log_source_get_messages_for_date (
-              source, account, chat_id, chatroom, date));
+      out = g_list_concat (out, empathy_log_source_get_messages_for_date (
+          source, account, chat_id, chatroom, date));
     }
 
   return out;
@@ -290,11 +286,8 @@
     {
       EmpathyLogSource *source = EMPATHY_LOG_SOURCE (l->data);
 
-      if (!out)
-        out = empathy_log_source_get_chats (source, account);
-      else
-        out = g_list_concat (out,
-            empathy_log_source_get_chats (source, account));
+      out = g_list_concat (out,
+          empathy_log_source_get_chats (source, account));
     }
 
   return out;
@@ -316,11 +309,8 @@
     {
       EmpathyLogSource *source = EMPATHY_LOG_SOURCE (l->data);
 
-      if (!out)
-        out = empathy_log_source_search_new (source, text);
-      else
-        out = g_list_concat (out,
-            empathy_log_source_search_new (source, text));
+      out = g_list_concat (out,
+          empathy_log_source_search_new (source, text));
     }
 
   return out;