aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-14 19:35:05 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-14 23:54:10 +0800
commita1b26b826f45c7ba766c7441fea8be9e3fc2a25c (patch)
tree480e1cdbbfd6abfbaa780208a9551d77e0e48c83
parent353a11cf099c4536ad49fc7c39f55993840f675d (diff)
downloadgsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar.gz
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar.bz2
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar.lz
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar.xz
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.tar.zst
gsoc2013-empathy-a1b26b826f45c7ba766c7441fea8be9e3fc2a25c.zip
Remove the PSTN setting and add a Video one
It's insensitive for now as Psyke doesn't implement it yet.
-rw-r--r--libempathy-gtk/empathy-account-widget-skype.c5
-rw-r--r--libempathy-gtk/empathy-account-widget-skype.ui7
2 files changed, 6 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c
index d51cc09a7..44189d8c5 100644
--- a/libempathy-gtk/empathy-account-widget-skype.c
+++ b/libempathy-gtk/empathy-account-widget-skype.c
@@ -483,7 +483,7 @@ account_widget_build_skype_get_privacy_settings_cb (TpProxy *cm,
static const char *widgets[] = {
"allow-text-chats-from",
"allow-skype-calls-from",
- "allow-outside-calls-from",
+ "allow-video-from",
"show-my-avatar-to",
"show-my-web-status",
"show-i-have-video-to"
@@ -680,9 +680,8 @@ account_widget_skype_privacy_settings (GtkWidget *button,
EMP_PRIVACY_SETTING_CONTACTS,
-1);
account_widget_build_skype_setup_combo (self, gui,
- "allow-outside-calls-from", "AllowOutsideCallsFrom",
+ "allow-video-from", "AllowVideoFrom",
EMP_PRIVACY_SETTING_ANYONE,
- EMP_PRIVACY_SETTING_KNOWN_NUMBERS,
EMP_PRIVACY_SETTING_CONTACTS,
-1);
account_widget_build_skype_setup_combo (self, gui,
diff --git a/libempathy-gtk/empathy-account-widget-skype.ui b/libempathy-gtk/empathy-account-widget-skype.ui
index 5d54ab6ba..4d68e1aeb 100644
--- a/libempathy-gtk/empathy-account-widget-skype.ui
+++ b/libempathy-gtk/empathy-account-widget-skype.ui
@@ -175,9 +175,9 @@ Get one at &lt;a href="http://www.skype.com/go/register"&gt;Skype.com&lt;/a&gt;<
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Allow _outside calls from:</property>
+ <property name="label" translatable="yes">Allow video _from:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">allow-outside-calls-from</property>
+ <property name="mnemonic_widget">allow-video-from</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -234,8 +234,9 @@ Get one at &lt;a href="http://www.skype.com/go/register"&gt;Skype.com&lt;/a&gt;<
</packing>
</child>
<child>
- <object class="GtkComboBox" id="allow-outside-calls-from">
+ <object class="GtkComboBox" id="allow-video-from">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext4"/>
<attributes>