aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/org.gnome.Empathy.gschema.xml.in6
-rw-r--r--libempathy/empathy-gsettings.h1
-rw-r--r--src/empathy-call-window.c48
-rw-r--r--src/empathy-preferences.c30
-rw-r--r--src/empathy-preferences.ui82
5 files changed, 0 insertions, 167 deletions
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index de57af80c..f3975fce2 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -233,12 +233,6 @@ present them to the user immediately.</_description>
</key>
</schema>
<schema id="org.gnome.Empathy.call" path="/org/gnome/empathy/call/">
- <key name="volume" type="d">
- <range min="0" max="150"/>
- <default>100.0</default>
- <_summary>Call volume</_summary>
- <_description>Call volume, as a percentage.</_description>
- </key>
<key name="camera-device" type="s">
<default>''</default>
<_summary>Camera device</_summary>
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index fb44b5893..ad55a9442 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -51,7 +51,6 @@ G_BEGIN_DECLS
#define EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT "sounds-contact-logout"
#define EMPATHY_PREFS_CALL_SCHEMA EMPATHY_PREFS_SCHEMA ".call"
-#define EMPATHY_PREFS_CALL_SOUND_VOLUME "volume"
#define EMPATHY_PREFS_CALL_CAMERA_DEVICE "camera-device"
#define EMPATHY_PREFS_CALL_ECHO_CANCELLATION "echo-cancellation"
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index a2b89f2ba..5b7c6e1c1 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -200,8 +200,6 @@ struct _EmpathyCallWindowPriv
gulong video_output_motion_handler_id;
guint bus_message_source_id;
- gdouble volume;
-
/* String that contains the queued tones to send after the current ones
are sent */
GString *tones;
@@ -411,39 +409,6 @@ dtmf_start_tone_cb (EmpathyDialpadWidget *dialpad,
}
static void
-empathy_call_window_mic_volume_changed (EmpathyCallWindow *self)
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
- gdouble volume;
-
- volume = g_settings_get_double (priv->settings,
- EMPATHY_PREFS_CALL_SOUND_VOLUME) / 100.0;
-
- /* Don't store the volume because of muting */
- if (volume > 0 || gtk_toggle_tool_button_get_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->mic_button)))
- priv->volume = volume;
-
- /* Ensure that the toggle button is active if the volume is > 0 and inactive
- * if it's smaller than 0 */
- if ((volume > 0) != gtk_toggle_tool_button_get_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->mic_button)))
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->mic_button), volume > 0);
-
- empathy_audio_src_set_volume (EMPATHY_GST_AUDIO_SRC (priv->audio_input),
- volume);
-}
-
-static void
-empathy_call_window_prefs_volume_changed_cb (GSettings *settings,
- gchar *key,
- EmpathyCallWindow *self)
-{
- empathy_call_window_mic_volume_changed (self);
-}
-
-static void
empathy_call_window_raise_actors (EmpathyCallWindow *self)
{
clutter_actor_raise_top (self->priv->floating_toolbar);
@@ -1904,13 +1869,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
empathy_call_window_show_hangup_button (self, TRUE);
- /* Retrieve initial volume */
- priv->volume = g_settings_get_double (priv->settings,
- EMPATHY_PREFS_CALL_SOUND_VOLUME) / 100.0;
-
- g_signal_connect (priv->settings, "changed::"EMPATHY_PREFS_CALL_SOUND_VOLUME,
- G_CALLBACK (empathy_call_window_prefs_volume_changed_cb), self);
-
empathy_geometry_bind (GTK_WINDOW (self), "call-window");
/* These signals are used to track the window position and save it
* when the window is destroyed. We need to do this as we don't want
@@ -4094,12 +4052,6 @@ empathy_call_window_restart_call (EmpathyCallWindow *window)
(GtkCallback) gtk_widget_destroy, NULL);
create_video_output_widget (window);
-
- /* While the call was disconnected, the input volume might have changed.
- * However, since the audio_input source was destroyed, its volume has not
- * been updated during that time. That's why we manually update it here */
- empathy_call_window_mic_volume_changed (window);
-
priv->outgoing = TRUE;
empathy_call_window_set_state_connecting (window);
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 3eb9e608d..60807ee5b 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -83,8 +83,6 @@ struct _EmpathyPreferencesPriv {
GtkWidget *checkbutton_notifications_contact_signin;
GtkWidget *checkbutton_notifications_contact_signout;
- GtkWidget *scale_call_volume;
- GtkWidget *adj_call_volume;
GtkWidget *echo_cancellation;
GtkWidget *treeview_spell_checker;
@@ -273,12 +271,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
G_SETTINGS_BIND_DEFAULT);
g_settings_bind (priv->gsettings_call,
- EMPATHY_PREFS_CALL_SOUND_VOLUME,
- priv->adj_call_volume,
- "value",
- G_SETTINGS_BIND_DEFAULT);
-
- g_settings_bind (priv->gsettings_call,
EMPATHY_PREFS_CALL_ECHO_CANCELLATION,
priv->echo_cancellation,
"active",
@@ -1108,13 +1100,6 @@ preferences_themes_setup (EmpathyPreferences *preferences)
preferences);
}
-static gchar *
-preferences_call_format_volume_cb (GtkScale *scale,
- gdouble value)
-{
- return g_strdup_printf ("%g%%", value);
-}
-
static void
empathy_preferences_response (GtkDialog *widget,
gint response)
@@ -1162,8 +1147,6 @@ 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);
@@ -1206,10 +1189,6 @@ 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,
NULL);
g_free (filename);
@@ -1235,15 +1214,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
preferences, 0);
preferences_preview_theme_changed_cb (priv->theme_manager, preferences);
- g_signal_connect (priv->scale_call_volume, "format-value",
- 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 46d687901..03a628cb6 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -486,82 +486,6 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="call_volume_scale_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Input volume:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="call_volume_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">call_volume_adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="call_volume_bar_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Input level:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkProgressBar" id="progressbar2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="call_echo_cancellation">
<property name="label" translatable="yes">Use _echo cancellation to improve call quality</property>
<property name="visible">True</property>
@@ -1125,10 +1049,4 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="label12"/>
- <widget name="label13"/>
- </widgets>
- </object>
</interface>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 01:30:55 +0800