Add 'dup' to the names of empathy_contact_from_folks_individual() and folks_individua...

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 440c904826a7d980f22e433c2f857d4abd0ae917..92f6c4b58c156243db3b39bb2b7f276d1dca4ae1 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -579,7 +579,7 @@ contact_widget_cell_toggled (GtkCellRendererToggle *cell,
 
   if (group != NULL)
     {
-      FolksIndividual *individual = folks_individual_from_empathy_contact (
+      FolksIndividual *individual = folks_individual_dup_from_empathy_contact (
           information->contact);
 
       if (individual != NULL)
@@ -809,7 +809,7 @@ contact_widget_button_group_clicked_cb (GtkButton *button,
       COL_ENABLED, TRUE,
       -1);
 
-  individual = folks_individual_from_empathy_contact (information->contact);
+  individual = folks_individual_dup_from_empathy_contact (information->contact);
 
   if (individual != NULL)
     {
@@ -1337,8 +1337,8 @@ contact_widget_entry_alias_focus_event_cb (GtkEditable *editable,
         }
       else
         {
-          FolksIndividual *individual = folks_individual_from_empathy_contact (
-              information->contact);
+          FolksIndividual *individual =
+              folks_individual_dup_from_empathy_contact (information->contact);
 
           if (individual != NULL)
             {
@@ -1535,8 +1535,8 @@ contact_widget_contact_update (EmpathyContactWidget *information)
 
       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE)
         {
-          FolksIndividual *individual = folks_individual_from_empathy_contact (
-              information->contact);
+          FolksIndividual *individual =
+              folks_individual_dup_from_empathy_contact (information->contact);
 
           if (individual != NULL)
             {
@@ -1672,7 +1672,7 @@ static void
 favourite_toggled_cb (GtkToggleButton *button,
     EmpathyContactWidget *information)
 {
-  FolksIndividual *individual = folks_individual_from_empathy_contact (
+  FolksIndividual *individual = folks_individual_dup_from_empathy_contact (
       information->contact);
 
   if (individual != NULL)

diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index a905c1969ce63a1d7fea1e9ffdfe6ad908d7110c..b9a843c571d41ba4bd0b066c30b95c8c8e79734c 100644 (file)
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -125,7 +125,7 @@ empathy_new_individual_dialog_show_with_individual (GtkWindow *parent,
 
   /* Contact info widget */
   if (FOLKS_IS_INDIVIDUAL (individual))
-    contact = empathy_contact_from_folks_individual (individual);
+    contact = empathy_contact_dup_from_folks_individual (individual);
 
   contact_widget = empathy_contact_widget_new (contact,
       EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index ceb95db1d40f151a55e09f0cc2606cdd72e3f271..380d0ac5781a54fa5b78f5cd025e9a6fa380691c 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -191,7 +191,7 @@ empathy_individual_add_menu_item_new (FolksIndividual *individual)
     }
 
   manager = empathy_individual_manager_dup_singleton ();
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   connection = empathy_contact_get_connection (contact);
 
   flags = empathy_individual_manager_get_flags_for_connection (manager,
@@ -244,7 +244,7 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -283,7 +283,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
   EmpathyContact *contact;
   EmpathyCallFactory *factory;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -302,7 +302,7 @@ empathy_individual_audio_call_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -328,7 +328,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
   EmpathyContact *contact;
   EmpathyCallFactory *factory;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -347,7 +347,7 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -372,7 +372,7 @@ individual_log_menu_item_activate_cb (FolksIndividual *individual)
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -391,7 +391,7 @@ empathy_individual_log_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -420,7 +420,7 @@ individual_file_transfer_menu_item_activate_cb (FolksIndividual *individual)
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -438,7 +438,7 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -462,7 +462,7 @@ individual_share_my_desktop_menu_item_activate_cb (FolksIndividual *individual)
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -481,7 +481,7 @@ empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -530,7 +530,7 @@ individual_info_menu_item_activate_cb (FolksIndividual *individual)
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   empathy_contact_information_dialog_show (contact, NULL);
 }
 
@@ -562,7 +562,7 @@ individual_edit_menu_item_activate_cb (FolksIndividual *individual)
 {
   EmpathyContact *contact;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   empathy_contact_edit_dialog_show (contact, NULL);
 }
 
@@ -577,7 +577,7 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -653,7 +653,7 @@ room_sub_menu_activate_cb (GtkWidget *item,
       return;
     }
 
-  contact = empathy_contact_from_folks_individual (data->individual);
+  contact = empathy_contact_dup_from_folks_individual (data->individual);
 
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -693,7 +693,7 @@ empathy_individual_invite_menu_item_new (FolksIndividual *individual)
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index e97b94e889268b4508693adcb1760a6ac58a00b7..2153d1ab85eea663bda7860890d9b93fe4023f8b 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -371,7 +371,7 @@ individual_store_add_individual (EmpathyIndividualStore *self,
     }
 
   manager = empathy_individual_manager_dup_singleton ();
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   connection = empathy_contact_get_connection (contact);
   flags = empathy_individual_manager_get_flags_for_connection (manager,
       connection);
@@ -1799,7 +1799,7 @@ individual_store_get_individual_status_icon_with_icon_name (
   show_protocols_here = priv->show_protocols && (contact_count == 1);
   if (show_protocols_here)
     {
-      contact = empathy_contact_from_folks_individual (individual);
+      contact = empathy_contact_dup_from_folks_individual (individual);
       protocol_name = empathy_protocol_name_for_contact (contact);
       icon_name = g_strdup_printf ("%s-%s", status_icon_name, protocol_name);
     }

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index bab8b1dfda9404f0fd04049195020537890e0737..a8b294c2b764e4c939542ee561182d8803f53922 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -296,7 +296,7 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view,
       goto OUT;
     }
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   g_object_unref (individual);
 
   if (contact == NULL)
@@ -484,7 +484,7 @@ individual_view_file_drag_received (GtkWidget *view,
       return FALSE;
     }
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
   empathy_send_file_from_uri_list (contact, sel_data);
 
   g_object_unref (individual);
@@ -897,7 +897,7 @@ individual_view_row_activated (GtkTreeView *view,
   if (!individual)
     return;
 
-  contact = empathy_contact_from_folks_individual (individual);
+  contact = empathy_contact_dup_from_folks_individual (individual);
 
   if (contact != NULL)
     {

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 46dcf82d69782848c1e2aced1e761d13f156ee3b..e15dcc8c47dfb58c073726973541e1c834577fb8 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -597,7 +597,7 @@ empathy_folks_individual_contains_contact (FolksIndividual *individual)
  * within the given Individual. Note that this is a temporary convenience. See
  * the TODO above. */
 EmpathyContact *
-empathy_contact_from_folks_individual (FolksIndividual *individual)
+empathy_contact_dup_from_folks_individual (FolksIndividual *individual)
 {
   GList *personas, *l;
   EmpathyContact *contact = NULL;
@@ -627,7 +627,7 @@ empathy_contact_from_folks_individual (FolksIndividual *individual)
  * given EmpathyContact. Note that this is a temporary convenience. See
  * the TODO above. */
 FolksIndividual *
-folks_individual_from_empathy_contact (EmpathyContact *contact)
+folks_individual_dup_from_empathy_contact (EmpathyContact *contact)
 {
   EmpathyIndividualManager *manager;
   FolksIndividual *individual = NULL;
@@ -639,7 +639,7 @@ folks_individual_from_empathy_contact (EmpathyContact *contact)
   for (l = individuals; (l != NULL) && (individual == NULL); l = l->next)
     {
       FolksIndividual *i = FOLKS_INDIVIDUAL (l->data);
-      EmpathyContact *c = empathy_contact_from_folks_individual (i);
+      EmpathyContact *c = empathy_contact_dup_from_folks_individual (i);
 
       if (c == contact)
         individual = g_object_ref (i);

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index a07f575d8dec61fc92c3c10101454c7644c0586c..3168d15164079faac71d5e87b61d17e55ea03d14 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -92,8 +92,8 @@ void empathy_connect_new_account (TpAccount *account,
 
 TpConnectionPresenceType empathy_folks_presence_type_to_tp (FolksPresenceType type);
 gboolean empathy_folks_individual_contains_contact (FolksIndividual *individual);
-EmpathyContact * empathy_contact_from_folks_individual (FolksIndividual *individual);
-FolksIndividual *folks_individual_from_empathy_contact (EmpathyContact *contact);
+EmpathyContact * empathy_contact_dup_from_folks_individual (FolksIndividual *individual);
+FolksIndividual *folks_individual_dup_from_empathy_contact (EmpathyContact *contact);
 
 G_END_DECLS
 

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 58ace96d1b896bd4484af51c0958a1b0a017ac40..c5adf11f2165faf3d806ef3e152460164a669581 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -187,7 +187,7 @@ main_window_flash_foreach (GtkTreeModel *model,
        if (individual == NULL)
                return FALSE;
 
-       contact = empathy_contact_from_folks_individual (individual);
+       contact = empathy_contact_dup_from_folks_individual (individual);
        if (contact != data->event->contact) {
                if (contact != NULL) {
                        g_object_unref (contact);
@@ -329,7 +329,7 @@ main_window_row_activated_cb (EmpathyContactListView *view,
                            -1);
 
        if (individual != NULL) {
-               contact = empathy_contact_from_folks_individual (individual);
+               contact = empathy_contact_dup_from_folks_individual (individual);
        }
 
        if (!contact) {