diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-07-07 23:21:43 +0800 |
|---|---|---|
| committer | Travis Reitter <treitter@gmail.com> | 2010-07-22 04:25:09 +0800 |
| commit | b6568db4f81cf4e78e96aa5fe23f020de5ff6557 (patch) | |
| tree | 7f0dd7dbfb45315d5bf16f0db623a98d3fe6f19d /libempathy-gtk/empathy-contact-widget.c | |
| parent | a244924636a2a0cde9da06909ac2b1b141ce3b9e (diff) | |
| download | gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.gz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.bz2 gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.lz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.xz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.zst gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.zip | |
Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias
The "name" API was a relic of Gossip.
Diffstat (limited to 'libempathy-gtk/empathy-contact-widget.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 0da9e0091..77d22c915 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -1086,7 +1086,7 @@ contact_widget_location_update (EmpathyContactWidget *information) champlain_view_add_layer (information->map_view, layer); marker = champlain_marker_new_with_text ( - empathy_contact_get_name (information->contact), NULL, NULL, NULL); + empathy_contact_get_alias (information->contact), NULL, NULL, NULL); champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), lat, lon); clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL); @@ -1378,10 +1378,10 @@ contact_widget_name_notify_cb (EmpathyContactWidget *information) { if (GTK_IS_ENTRY (information->widget_alias)) gtk_entry_set_text (GTK_ENTRY (information->widget_alias), - empathy_contact_get_name (information->contact)); + empathy_contact_get_alias (information->contact)); else gtk_label_set_label (GTK_LABEL (information->widget_alias), - empathy_contact_get_name (information->contact)); + empathy_contact_get_alias (information->contact)); } static void |