From 6c44b488c14deed1bac83abd984af87dad21bc31 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon, 14 Mar 2011 11:35:05 +0000
Subject: Remove the PSTN setting and add a Video one

It's insensitive for now as Psyke doesn't implement it yet.
---
 libempathy-gtk/empathy-account-widget-skype.c  | 5 ++---
 libempathy-gtk/empathy-account-widget-skype.ui | 7 ++++---
 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>
-- 
cgit v1.2.3