Rename empathy_contact_new_static to empathy_contact_new_for_log

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 27f3ff9c26b3f3302138e74c5d0ffa1797448a2d..fe8cf8234f5016d0c488f29cc63be694d2b3ab5f 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -389,10 +389,10 @@ empathy_contact_new (TpContact *tp_contact)
 }
 
 EmpathyContact *
 }
 
 EmpathyContact *

-empathy_contact_new_static (McAccount *account,
-                            const gchar *id,
-                            const gchar *name,
-                            gboolean is_user)
+empathy_contact_new_for_log (McAccount *account,
+                             const gchar *id,
+                             const gchar *name,
+                             gboolean is_user)

 {
   g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (id != NULL, NULL);
 {
   g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (id != NULL, NULL);

diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 0fab90462b9fac6119084dc86b4e69bb8067a42f..c10561d0f479e04ea5bf33c13c82e269c2d32f98 100644 (file)
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -68,7 +68,7 @@ typedef enum {
 
 GType empathy_contact_get_type (void) G_GNUC_CONST;
 EmpathyContact * empathy_contact_new (TpContact *tp_contact);
 
 GType empathy_contact_get_type (void) G_GNUC_CONST;
 EmpathyContact * empathy_contact_new (TpContact *tp_contact);

-EmpathyContact * empathy_contact_new_static (McAccount *account,
+EmpathyContact * empathy_contact_new_for_log (McAccount *account,

     const gchar *id, const gchar *name, gboolean is_user);
 TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact);
 const gchar * empathy_contact_get_id (EmpathyContact *contact);
     const gchar *id, const gchar *name, gboolean is_user);
 TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact);
 const gchar * empathy_contact_get_id (EmpathyContact *contact);

diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 6485d007942a5450e306aa143651bd556e21dc38..b74b5e177dbb7fb2b41bf07e791c0ec245812448 100644 (file)
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -481,8 +481,8 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
 
       t = empathy_time_parse (time);
 
 
       t = empathy_time_parse (time);
 

-      sender = empathy_contact_new_static (account, sender_id, sender_name,
-                                          is_user);
+      sender = empathy_contact_new_for_log (account, sender_id, sender_name,
+                                           is_user);

 
       if (!EMP_STR_EMPTY (sender_avatar_token))
         empathy_contact_load_avatar_cache (sender,
 
       if (!EMP_STR_EMPTY (sender_avatar_token))
         empathy_contact_load_avatar_cache (sender,