diff options
| author | Ronald Bultje <rbultje@src.gnome.org> | 2005-08-10 20:20:20 +0000 |
|---|---|---|
| committer | Ronald Bultje <rbultje@src.gnome.org> | 2005-08-10 20:20:20 +0000 |
| commit | d5561064e59ef3897f95323ea3429926bf06cc58 (patch) | |
| tree | d2f370f1a93cdad7531f51d0797323ec5b6e8bd0 /mixer/applet.c | |
| parent | f0c622646e58890fd681b403d44278ca2b3ab7a3 (diff) | |
Use volume (which is more detailed), rather than icon number (which is
* applet.c: (gnome_volume_applet_refresh):
Use volume (which is more detailed), rather than icon number (which
is basically the volume divided by another number), for refresh
decision, since we display the volume in a tooltip, and we want it
to update when external applications change the volume.
Diffstat (limited to 'mixer/applet.c')
| -rw-r--r-- | mixer/applet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mixer/applet.c b/mixer/applet.c index 07f2d2437..65a4da65b 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -1011,7 +1011,7 @@ cb_volume (GtkAdjustment *adj, * Automatic timer. Check for changes. */ -#define STATE(vol,m) ((vol << 1) | (m ? 1 : 0)) +#define STATE(vol,m) (((gint) vol << 1) | (m ? 1 : 0)) static void gnome_volume_applet_refresh (GnomeVolumeApplet *applet, @@ -1049,7 +1049,7 @@ gnome_volume_applet_refresh (GnomeVolumeApplet *applet, n = 4; } - did_change = (force_refresh || (STATE (n, mute) != applet->state) || + did_change = (force_refresh || (STATE (volume, mute) != applet->state) || applet->force_next_update); applet->force_next_update = FALSE; @@ -1061,7 +1061,7 @@ gnome_volume_applet_refresh (GnomeVolumeApplet *applet, } gtk_image_set_from_pixbuf (applet->image, pixbuf); - applet->state = STATE (n, mute); + applet->state = STATE (volume, mute); } if (!did_change || !applet->mixer) |