aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-16 07:09:13 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-16 20:05:00 +0800
commitc469fd154c871be294b4dd1f0ddffacf112ef454 (patch)
tree0eb55a88d2bd8ea1f76dbe4d208ffeec46ba8c13
parent897bfbce7f3333362e2dd16bb5e4986aa8fa64cd (diff)
downloadgsoc2013-empathy-c469fd154c871be294b4dd1f0ddffacf112ef454.tar.gz
gsoc2013-empathy-c469fd154c871be294b4dd1f0ddffacf112ef454.tar.zst
gsoc2013-empathy-c469fd154c871be294b4dd1f0ddffacf112ef454.zip
Don't show empathy-call preferences when not building empathy-call
https://bugzilla.gnome.org/show_bug.cgi?id=656582
-rw-r--r--src/empathy-preferences.c9
-rw-r--r--src/empathy-preferences.ui4
2 files changed, 11 insertions, 2 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 5618caeaf..c0fc679cf 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -1160,6 +1160,8 @@ empathy_preferences_init (EmpathyPreferences *preferences)
GtkBuilder *gui;
gchar *filename;
GtkWidget *page;
+ GtkWidget *call_volume_scale_box;
+ GtkWidget *call_volume_bar_box;
priv = preferences->priv = G_TYPE_INSTANCE_GET_PRIVATE (preferences,
EMPATHY_TYPE_PREFERENCES, EmpathyPreferencesPriv);
@@ -1202,6 +1204,8 @@ empathy_preferences_init (EmpathyPreferences *preferences)
"checkbutton_location_resource_network", &priv->checkbutton_location_resource_network,
"checkbutton_location_resource_cell", &priv->checkbutton_location_resource_cell,
"checkbutton_location_resource_gps", &priv->checkbutton_location_resource_gps,
+ "call_volume_scale_box", &call_volume_scale_box,
+ "call_volume_bar_box", &call_volume_bar_box,
"call_volume_scale", &priv->scale_call_volume,
"call_volume_adjustment", &priv->adj_call_volume,
"call_echo_cancellation", &priv->echo_cancellation,
@@ -1233,6 +1237,11 @@ empathy_preferences_init (EmpathyPreferences *preferences)
G_CALLBACK (preferences_call_format_volume_cb),
preferences);
+#ifndef HAVE_CALL
+ gtk_widget_hide (call_volume_scale_box);
+ gtk_widget_hide (call_volume_bar_box);
+#endif
+
preferences_themes_setup (preferences);
preferences_setup_widgets (preferences);
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index ab06b21bf..791f3fbd9 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -486,7 +486,7 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkBox" id="call_volume_scale_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -526,7 +526,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox" id="call_volume_bar_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>