diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-26 20:03:11 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-26 20:03:11 +0800 |
| commit | 2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893 (patch) | |
| tree | 1e10eda9d904d4d29664f79193b4b6f70823c5a8 /libempathy-gtk/empathy-account-widget-irc.ui | |
| parent | f7a63b4c249208122cfa17f668a19d853d158dfa (diff) | |
| parent | e62460125c8a90e0f77f18326d597868ca01a42c (diff) | |
| download | gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar.gz gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar.bz2 gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar.lz gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar.xz gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.tar.zst gsoc2013-empathy-2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893.zip | |
Merge branch 'irc-widget-588243'
Diffstat (limited to 'libempathy-gtk/empathy-account-widget-irc.ui')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-irc.ui | 78 |
1 files changed, 3 insertions, 75 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index af733fb95..de0aa00cd 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -257,7 +257,6 @@ </object> <object class="GtkVBox" id="vbox_irc"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkTable" id="table_irc_settings"> <property name="visible">True</property> @@ -373,80 +372,6 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox174"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkComboBox" id="combobox_network"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_add_network"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_network"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage" id="image834"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_remove_network"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage" id="image835"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label_network2"> <property name="visible">True</property> <property name="xalign">0</property> @@ -458,6 +383,9 @@ <property name="y_options"></property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">0</property> |