callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

volumebutton: Update adjustment usage for sealing

Browse Source 
Also rename all variables named "adj" to "adjustment", like they're
called everywhere else.
This commit is contained in:
Benjamin Otte 2011-01-05 23:03:09 +01:00
parent f79c6baa66
commit e62b39c921
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkvolumebutton.c
View File

@ -232,21 +232,21 @@ cb_query_tooltip (GtkWidget *button,
gpointer user_data)
{
GtkScaleButton *scale_button = GTK_SCALE_BUTTON (button);
GtkAdjustment *adj;
GtkAdjustment *adjustment;
gdouble val;
char *str;
AtkImage *image;
image = ATK_IMAGE (gtk_widget_get_accessible (button));
adj = gtk_scale_button_get_adjustment (scale_button);
adjustment = gtk_scale_button_get_adjustment (scale_button);
val = gtk_scale_button_get_value (scale_button);
if (val < (adj->lower + EPSILON))
if (val < (gtk_adjustment_get_lower (adjustment) + EPSILON))
{
str = g_strdup (_("Muted"));
}
else if (val >= (adj->upper - EPSILON))
else if (val >= (gtk_adjustment_get_upper (adjustment) - EPSILON))
{
str = g_strdup (_("Full Volume"));
}
@ -254,7 +254,7 @@ cb_query_tooltip (GtkWidget *button,
{
int percent;
percent = (int) (100. * val / (adj->upper - adj->lower) + .5);
percent = (int) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);
/* Translators: this is the percentage of the current volume,
* as used in the tooltip, eg. "49 %".