commit 2e467c33879f48e788774d5de0a5a7559531da7b
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 18 08:52:23 2017 -0500
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 18 09:12:12 2017 -0500
tree f5a1f33a8dcfebb458a66cf1ed23e64a1b60bc5f
parent 4a1f06425c9f6201961abd1c0bc06cda61ad2868

ui : update instances names

- widgets used to screen the uri had _uri suffix. Now they can screen
the registered name, so the suffix has been updated _bestId.

Tuleap: #1248
Change-Id: I9f3d8290d4f24529303c37467d3ff1ad18fe43e0

src/incomingcallview.cpp

diff --git a/src/incomingcallview.cpp b/src/incomingcallview.cpp
index a9ba5df..80bb749 100644
--- a/src/incomingcallview.cpp
+++ b/src/incomingcallview.cpp
@@ -49,7 +49,7 @@
     GtkWidget *paned_call;
     GtkWidget *image_incoming;
     GtkWidget *label_name;
-    GtkWidget *label_uri;
+    GtkWidget *label_bestId;
     GtkWidget *spinner_status;
     GtkWidget *placeholder;
     GtkWidget *label_status;
@@ -133,7 +133,7 @@
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, paned_call);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, image_incoming);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, label_name);
-    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, label_uri);
+    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, label_bestId);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, spinner_status);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, placeholder);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, label_status);
@@ -214,12 +214,12 @@
     /* get uri, if different from name */
     auto uri = call->peerContactMethod()->uri();
     if (name != uri) {
-        auto cat_uri = g_strdup_printf("(%s) %s"
+        auto cat_bestId = g_strdup_printf("(%s) %s"
                                        ,call->peerContactMethod()->category()->name().toUtf8().constData()
                                        ,uri.toUtf8().constData());
-        gtk_label_set_text(GTK_LABEL(priv->label_uri), cat_uri);
-        g_free(cat_uri);
-        gtk_widget_show(priv->label_uri);
+        gtk_label_set_text(GTK_LABEL(priv->label_bestId), cat_bestId);
+        g_free(cat_bestId);
+        gtk_widget_show(priv->label_bestId);
     }
 
     /* change some things depending on call state */