GtkWidget *remote_user_avatar_widget;
GtkWidget *remote_user_avatar_toolbar;
GtkWidget *remote_user_name_toolbar;
+ GtkWidget *remote_user_status_toolbar;
GtkWidget *status_label;
GtkWidget *hangup_button;
GtkWidget *audio_call_button;
"errors_vbox", &priv->errors_vbox,
"pane", &priv->pane,
"remote_user_name_toolbar", &priv->remote_user_name_toolbar,
+ "remote_user_status_toolbar", &priv->remote_user_status_toolbar,
"remote_user_avatar_toolbar", &priv->remote_user_avatar_toolbar,
"status_label", &priv->status_label,
"audiocall", &priv->audio_call_button,
{
const gchar *alias = empathy_contact_get_alias (contact);
const gchar *status = empathy_contact_get_status (contact);
- gchar *label;
- if (status != NULL)
- label = g_strdup_printf ("%s\n<small>%s</small>", alias, status);
- else
- label = g_strdup (alias);
+ gtk_label_set_text (GTK_LABEL (self->priv->remote_user_name_toolbar), alias);
+
+ if (status != NULL) {
+ gchar *markup;
- gtk_label_set_markup (GTK_LABEL (self->priv->remote_user_name_toolbar),
- label);
- g_free (label);
+ markup = g_markup_printf_escaped ("<small>%s</small>", status);
+ gtk_label_set_markup (GTK_LABEL (self->priv->remote_user_status_toolbar),
+ markup);
+ g_free (markup);
+ } else {
+ gtk_label_set_markup (GTK_LABEL (self->priv->remote_user_status_toolbar),
+ "");
+ }
}
static void
<property name="draw">False</property>
<property name="visible">True</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
+
<object class="GtkToolItem" id="toolitem2">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="remote_user_name_toolbar">
- <property name="visible">True</property>
+ <object class="GtkVBox" id="uservbox">
+ <child>
+ <object class="GtkLabel" id="remote_user_name_toolbar">
+ <property name="visible">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="remote_user_status_toolbar">
+ <property name="visible">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</object>
</child>
</object>
- </child>
- <child>
- <object class="GtkToolItem" id="toolbar_space1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- </packing>
+ <packing> <property name="expand">True</property></packing>
</child>
<child>
<object class="GtkToolButton" id="hangup">
<property name="icon_name">call-stop</property>
<property name="tooltip_text" translatable="yes">Hang up current call</property>
</object>
- <packing>
- <property name="homogeneous">False</property>
- </packing>
</child>
<child>
<object class="GtkToolButton" id="videocall">
<property name="icon_name">camera-web</property>
<property name="tooltip_text" translatable="yes">Start a video call</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
<object class="GtkToolButton" id="audiocall">
<property name="icon_name">call-start</property>
<property name="tooltip_text" translatable="yes">Start an audio call</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
<object class="GtkToggleToolButton" id="dialpad">
<property name="icon_name">input-dialpad</property>
<property name="tooltip_text" translatable="yes">Display the dialpad</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
</object>
<packing>