diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 21:24:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 21:24:26 +0800 |
| commit | 05649508bf21c519402a049ba5be367430eb58d5 (patch) | |
| tree | d36b827cc1b2f1643e7dced5321f4900cd3f67d0 /src/empathy-call-window.ui | |
| parent | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (diff) | |
| parent | bf32eb7eb97820578b4f878e57ca9105fc7f5147 (diff) | |
| download | gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.gz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.bz2 gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.lz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.xz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.zst gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.zip | |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-audio-src.c
Diffstat (limited to 'src/empathy-call-window.ui')
| -rw-r--r-- | src/empathy-call-window.ui | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui index 2158b2b83..2caa242b8 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -164,27 +164,37 @@ <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"> @@ -193,9 +203,6 @@ <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"> @@ -203,9 +210,6 @@ <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"> @@ -213,9 +217,6 @@ <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"> @@ -224,9 +225,6 @@ <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> |