Don't show empathy-call preferences when not building empathy-call

https://bugzilla.gnome.org/show_bug.cgi?id=656582

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 5618caeaf8a72d7e69fb33feeb5843def10535ae..c0fc679cf34496a75a06497a7dcf709d6da6c257 100644 (file)
--- 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 ab06b21bf21d7edf96b141f10e41a9842767314b..791f3fbd9052bf7919d82d1b1220bc7b4e162872 100644 (file)
--- 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>