diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-01 19:22:42 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-01 19:22:42 +0800 |
| commit | 158a73838382c23b8e8993cfa18b7d701d463338 (patch) | |
| tree | a500bce0dabf6c8471597d95456801fdd8075ffa | |
| parent | 338a6e059140221da55fce7cb74a472fcf32ffb4 (diff) | |
| download | gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar.gz gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar.bz2 gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar.lz gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar.xz gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.tar.zst gsoc2013-empathy-158a73838382c23b8e8993cfa18b7d701d463338.zip | |
Remove AllowVideoFrom setting
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.ui | 51 |
2 files changed, 9 insertions, 48 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c index fb56ac561..c47dab5ed 100644 --- a/libempathy-gtk/empathy-account-widget-skype.c +++ b/libempathy-gtk/empathy-account-widget-skype.c @@ -537,7 +537,6 @@ account_widget_build_skype_get_privacy_settings_cb (TpProxy *cm, static const char *widgets[] = { "allow-text-chats-from", "allow-skype-calls-from", - "allow-video-from", "show-my-avatar-to", "show-my-web-status", "show-i-have-video-to" @@ -741,11 +740,6 @@ account_widget_skype_privacy_settings (GtkWidget *button, EMP_PRIVACY_SETTING_CONTACTS, -1); account_widget_build_skype_setup_combo (self, gui, - "allow-video-from", "AllowVideoFrom", - EMP_PRIVACY_SETTING_ANYONE, - EMP_PRIVACY_SETTING_CONTACTS, - -1); - account_widget_build_skype_setup_combo (self, gui, "show-i-have-video-to", "ShowIHaveVideoTo", EMP_PRIVACY_SETTING_ANYONE, EMP_PRIVACY_SETTING_CONTACTS, diff --git a/libempathy-gtk/empathy-account-widget-skype.ui b/libempathy-gtk/empathy-account-widget-skype.ui index dbea877da..c59eeddd3 100644 --- a/libempathy-gtk/empathy-account-widget-skype.ui +++ b/libempathy-gtk/empathy-account-widget-skype.ui @@ -139,7 +139,7 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">5</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -172,21 +172,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allow video _from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">allow-video-from</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> @@ -195,8 +180,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="mnemonic_widget">show-my-avatar-to</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -234,24 +219,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> <child> - <object class="GtkComboBox" id="allow-video-from"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> <object class="GtkComboBox" id="show-my-avatar-to"> <property name="visible">True</property> <child> @@ -264,8 +231,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> <child> @@ -277,8 +244,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="mnemonic_widget">show-i-have-video-to</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -296,8 +263,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> </object> |