diff options
author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:32:39 +0800 |
---|---|---|
committer | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:32:39 +0800 |
commit | 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (patch) | |
tree | 69b2fc8984c98b9cad38d2ca5e8563da2b9aad8a /src/empathy-preferences.ui | |
parent | 41e5b31c1918f40c3ba47bff2dc9ab682fe0391f (diff) | |
parent | 87070d25c5f2d9a0ecba73e8ce913eca7f183c79 (diff) | |
download | gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.gz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.bz2 gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.lz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.xz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.zst gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.zip |
Merge branch 'sjoerd-mc5' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
libempathy-gtk/empathy-protocol-chooser.c
Diffstat (limited to 'src/empathy-preferences.ui')
-rw-r--r-- | src/empathy-preferences.ui | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui index 38cfd3419..a383607aa 100644 --- a/src/empathy-preferences.ui +++ b/src/empathy-preferences.ui @@ -38,38 +38,6 @@ <object class="GtkVBox" id="vbox199"> <property name="visible">True</property> <child> - <object class="GtkCheckButton" id="checkbutton_compact_contact_list"> - <property name="label" translatable="yes">Show co_mpact contact list</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton_show_avatars"> - <property name="label" translatable="yes">Show _avatars</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Avatars are user chosen images shown in the contact list</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="checkbutton_show_smileys"> <property name="label" translatable="yes">Show _smileys as images</property> <property name="visible">True</property> @@ -183,68 +151,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkFrame" id="frame13"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment31"> - <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox217"> - <property name="visible">True</property> - <child> - <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_name"> - <property name="label" translatable="yes">Sort by _name</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_state"> - <property name="label" translatable="yes">Sort by s_tate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">radiobutton_contact_list_sort_by_name</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label644"> - <property name="visible">True</property> - <property name="label" translatable="yes">Contact List</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> </object> </child> <child type="tab"> @@ -851,50 +757,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkHBox" id="hbox_adium_theme"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label587"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Adium theme to use:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkFileChooserButton" id="filechooserbutton_adium_theme"> - <property name="visible">True</property> - <property name="preview_widget_active">False</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_invalid_adium_theme"> - <property name="visible">True</property> - <property name="label" translatable="yes">Not a valid adium theme</property> - <attributes> - <attribute name="foreground" value="red"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> |