add an optional panel button to control the input volume
1 unresolved thread
1 unresolved thread
Compare changes
Files
8
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 56
− 21
@@ -61,6 +61,14 @@ static const char *icons[] = {
@@ -95,6 +103,8 @@ struct _PulseaudioButton
@@ -132,7 +142,7 @@ pulseaudio_button_init (PulseaudioButton *button)
@@ -215,7 +225,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS
@@ -228,7 +241,9 @@ static gboolean
@@ -239,7 +254,10 @@ pulseaudio_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
@@ -281,12 +299,14 @@ pulseaudio_button_update_icons (PulseaudioButton *button)
@@ -303,31 +323,43 @@ pulseaudio_button_update (PulseaudioButton *button,
@@ -345,8 +377,8 @@ pulseaudio_button_update (PulseaudioButton *button,
@@ -392,7 +424,8 @@ PulseaudioButton *
@@ -409,8 +442,10 @@ pulseaudio_button_new (PulseaudioPlugin *plugin,