aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-03-11 10:22:05 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-14 23:54:09 +0800
commitb1dd537c09d9c9a19abb5bd78c04a55c28326dfc (patch)
tree53a19c5d4b9f74342a6ac3ef4a9a90e798928f44
parent6529909cd55cbbf949f8b2c7347b130036e89faf (diff)
downloadgsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar.gz
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar.bz2
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar.lz
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar.xz
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.tar.zst
gsoc2013-empathy-b1dd537c09d9c9a19abb5bd78c04a55c28326dfc.zip
Add ShowIHaveVideoTo property to Privacy Settings UI
-rw-r--r--libempathy-gtk/empathy-account-widget-skype.c9
-rw-r--r--libempathy-gtk/empathy-account-widget-skype.ui38
2 files changed, 43 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c
index b5d9a4d65..e8f84be15 100644
--- a/libempathy-gtk/empathy-account-widget-skype.c
+++ b/libempathy-gtk/empathy-account-widget-skype.c
@@ -176,7 +176,8 @@ account_widget_build_skype_get_privacy_settings_cb (TpProxy *cm,
"allow-skype-calls-from",
"allow-outside-calls-from",
"show-my-avatar-to",
- "show-my-web-status"
+ "show-my-web-status",
+ "show-i-have-video-to"
};
if (in_error != NULL)
@@ -376,6 +377,12 @@ account_widget_skype_privacy_settings (GtkWidget *button,
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,
+ EMP_PRIVACY_SETTING_NOBODY,
+ -1);
+ account_widget_build_skype_setup_combo (self, gui,
"show-my-avatar-to", "ShowMyAvatarTo",
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 178a9c6b2..4c17d09a4 100644
--- a/libempathy-gtk/empathy-account-widget-skype.ui
+++ b/libempathy-gtk/empathy-account-widget-skype.ui
@@ -138,7 +138,7 @@ Get one at &lt;a href="http://www.skype.com/go/register"&gt;Skype.com&lt;/a&gt;<
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
@@ -194,8 +194,8 @@ Get one at &lt;a href="http://www.skype.com/go/register"&gt;Skype.com&lt;/a&gt;<
<property name="mnemonic_widget">show-my-avatar-to</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -262,6 +262,38 @@ Get one at &lt;a href="http://www.skype.com/go/register"&gt;Skype.com&lt;/a&gt;<
<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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Show whether I have _video to:</property>
+ <property name="use_underline">True</property>
+ <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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="show-i-have-video-to">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <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">3</property>
<property name="bottom_attach">4</property>
</packing>