summaryrefslogtreecommitdiff
path: root/mate-volume-control
diff options
context:
space:
mode:
Diffstat (limited to 'mate-volume-control')
-rw-r--r--mate-volume-control/gvc-balance-bar.c2
-rw-r--r--mate-volume-control/gvc-level-bar.c18
-rw-r--r--mate-volume-control/gvc-mixer-dialog.c3
-rw-r--r--mate-volume-control/gvc-sound-theme-chooser.c1
-rw-r--r--mate-volume-control/gvc-speaker-test.c1
-rw-r--r--mate-volume-control/gvc-stream-applet-icon.c5
-rw-r--r--mate-volume-control/gvc-stream-status-icon.c4
7 files changed, 27 insertions, 7 deletions
diff --git a/mate-volume-control/gvc-balance-bar.c b/mate-volume-control/gvc-balance-bar.c
index e4fccb8..3e28345 100644
--- a/mate-volume-control/gvc-balance-bar.c
+++ b/mate-volume-control/gvc-balance-bar.c
@@ -242,7 +242,7 @@ find_stream_lfe_channel (MateMixerStreamControl *control)
static void
gvc_balance_bar_set_control (GvcBalanceBar *bar, MateMixerStreamControl *control)
{
- g_return_if_fail (GVC_BALANCE_BAR (bar));
+ g_return_if_fail (GVC_IS_BALANCE_BAR (bar));
g_return_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control));
if (bar->priv->control != NULL) {
diff --git a/mate-volume-control/gvc-level-bar.c b/mate-volume-control/gvc-level-bar.c
index b697ed5..24ac1f2 100644
--- a/mate-volume-control/gvc-level-bar.c
+++ b/mate-volume-control/gvc-level-bar.c
@@ -215,12 +215,23 @@ update_peak_value (GvcLevelBar *bar)
bar->priv->peak_fraction = value;
if (value > bar->priv->max_peak) {
+ AtkObject *acc_obj;
+ char *acc_string;
+ gdouble peak_percentage;
+
if (bar->priv->max_peak_id > 0)
g_source_remove (bar->priv->max_peak_id);
bar->priv->max_peak_id =
g_timeout_add_seconds (1, (GSourceFunc) reset_max_peak, bar);
bar->priv->max_peak = value;
+ /* Providing an accessible based on peaks, so that
+ * it doesn’t get updated too often. */
+ acc_obj = gtk_widget_get_accessible (GTK_WIDGET (bar));
+ peak_percentage = round (value * 100.0);
+ acc_string = g_strdup_printf (_("Peak: %.0lf"), peak_percentage);
+ atk_object_set_name (acc_obj, acc_string);
+ g_free (acc_string);
}
layout = bar->priv->layout;
@@ -284,7 +295,7 @@ void
gvc_level_bar_set_peak_adjustment (GvcLevelBar *bar,
GtkAdjustment *adjustment)
{
- g_return_if_fail (GVC_LEVEL_BAR (bar));
+ g_return_if_fail (GVC_IS_LEVEL_BAR (bar));
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (bar->priv->peak_adjustment != NULL) {
@@ -310,7 +321,7 @@ void
gvc_level_bar_set_rms_adjustment (GvcLevelBar *bar,
GtkAdjustment *adjustment)
{
- g_return_if_fail (GVC_LEVEL_BAR (bar));
+ g_return_if_fail (GVC_IS_LEVEL_BAR (bar));
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (bar->priv->rms_adjustment != NULL) {
@@ -753,6 +764,9 @@ gvc_level_bar_init (GvcLevelBar *bar)
bar);
gtk_widget_set_has_window (GTK_WIDGET (bar), FALSE);
+
+ atk_object_set_role (gtk_widget_get_accessible (GTK_WIDGET (bar)),
+ ATK_ROLE_STATIC);
}
static void
diff --git a/mate-volume-control/gvc-mixer-dialog.c b/mate-volume-control/gvc-mixer-dialog.c
index 1567eaa..ed0e40b 100644
--- a/mate-volume-control/gvc-mixer-dialog.c
+++ b/mate-volume-control/gvc-mixer-dialog.c
@@ -2108,6 +2108,9 @@ gvc_mixer_dialog_constructor (GType type,
GTK_ORIENTATION_HORIZONTAL);
gvc_level_bar_set_scale (GVC_LEVEL_BAR (self->priv->input_level_bar),
GVC_LEVEL_SCALE_LINEAR);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+ self->priv->input_level_bar);
+ gtk_widget_set_can_focus (self->priv->input_level_bar, TRUE);
gtk_box_pack_start (GTK_BOX (box),
self->priv->input_level_bar,
TRUE, TRUE, 6);
diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
index 7225888..ef526d0 100644
--- a/mate-volume-control/gvc-sound-theme-chooser.c
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
@@ -35,6 +35,7 @@
#include <gtk/gtk.h>
#include <canberra-gtk.h>
#include <libxml/tree.h>
+#include <libxml/parser.h>
#include "gvc-sound-theme-chooser.h"
#include "sound-theme-file-utils.h"
diff --git a/mate-volume-control/gvc-speaker-test.c b/mate-volume-control/gvc-speaker-test.c
index cbca7f2..014188f 100644
--- a/mate-volume-control/gvc-speaker-test.c
+++ b/mate-volume-control/gvc-speaker-test.c
@@ -365,6 +365,7 @@ create_control (ca_context *canberra, MateMixerChannelPosition position)
gtk_box_pack_start (GTK_BOX (control), label, FALSE, FALSE, 0);
test_button = gtk_button_new_with_label (_("Test"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), test_button);
g_signal_connect (G_OBJECT (test_button),
"clicked",
G_CALLBACK (on_test_button_clicked),
diff --git a/mate-volume-control/gvc-stream-applet-icon.c b/mate-volume-control/gvc-stream-applet-icon.c
index 99a32fa..7c1bdb5 100644
--- a/mate-volume-control/gvc-stream-applet-icon.c
+++ b/mate-volume-control/gvc-stream-applet-icon.c
@@ -497,7 +497,7 @@ void
gvc_stream_applet_icon_set_display_name (GvcStreamAppletIcon *icon,
const gchar *name)
{
- g_return_if_fail (GVC_STREAM_APPLET_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_APPLET_ICON (icon));
g_free (icon->priv->display_name);
@@ -511,7 +511,7 @@ void
gvc_stream_applet_icon_set_control (GvcStreamAppletIcon *icon,
MateMixerStreamControl *control)
{
- g_return_if_fail (GVC_STREAM_APPLET_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_APPLET_ICON (icon));
if (icon->priv->control == control)
return;
@@ -763,6 +763,7 @@ gvc_stream_applet_icon_finalize (GObject *object)
icon = GVC_STREAM_APPLET_ICON (object);
g_strfreev (icon->priv->icon_names);
+ g_clear_pointer (&icon->priv->display_name, g_free);
g_signal_handlers_disconnect_by_func (gtk_settings_get_default (),
on_icon_theme_change,
diff --git a/mate-volume-control/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c
index 8ca2849..aac39ba 100644
--- a/mate-volume-control/gvc-stream-status-icon.c
+++ b/mate-volume-control/gvc-stream-status-icon.c
@@ -508,7 +508,7 @@ void
gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
const gchar *name)
{
- g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
g_free (icon->priv->display_name);
@@ -522,7 +522,7 @@ void
gvc_stream_status_icon_set_control (GvcStreamStatusIcon *icon,
MateMixerStreamControl *control)
{
- g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
if (icon->priv->control == control)
return;