Merge branch 'emoticons-fix' into 'master'

Remove an extraneous GtkBox in groupchat_control

See merge request !23
This commit is contained in:
Philipp Hörist 2017-01-07 19:33:08 +01:00
commit 996bb2abca
1 changed files with 11 additions and 22 deletions

View File

@ -181,10 +181,6 @@
<child>
<object class="GtkBox" id="actions_hbox">
<property name="height_request">34</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="hbox3023">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -205,13 +201,6 @@
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>