← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xfce4-power-manager/utopic-proposed

« back to all changes in this revision

Viewing changes to panel-plugins/brightness/brightness-button.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-04-03 22:15:05 UTC
  • mfrom: (2.3.8)
  • Revision ID: package-import@ubuntu.com-20120403221505-2dvza7w2d97zb7qn
Tags: 1.0.11-0ubuntu1
* New upstream bugfix release.
* debian/patches:
  - 0001-Solaris-specific-code-for-determining-the-start-time.patch,
    02_fix-notify-detect.patch,
    07_fix_broken_empty_icon_battery.patch: dropped, included upstream.
  - xubuntu_fix-status-icon-other-devices.patch: refreshed to apply cleanly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel-plugins/brightness/brightness-button.c
185
185
static gboolean
186
186
brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
187
187
{
188
 
    gint x, y, orientation;
189
 
    gint current_level = 0;
 
188
    gint x, y;
 
189
    glong current_level = 0;
190
190
    GdkDisplay *display;
191
191
    GdkScreen *screen;
192
192
    BrightnessButton *button;
234
234
    gdk_window_get_origin (widget->window, &x, &y);
235
235
 
236
236
    pos = xfce_panel_plugin_get_screen_position (button->priv->plugin);
237
 
    orientation = xfce_panel_plugin_get_orientation (button->priv->plugin);
238
237
    
239
238
    /* top */
240
239
    if ( pos == XFCE_SCREEN_POSITION_NW_H || 
320
319
static void
321
320
minus_clicked (GtkWidget *widget, BrightnessButton *button)
322
321
{
323
 
    gint level, max_level;
 
322
    gint level;
324
323
    
325
 
    max_level = xfpm_brightness_get_max_level (button->priv->brightness);
326
324
    level = (gint ) gtk_range_get_value (GTK_RANGE (button->priv->range));
327
325
    
328
326
    if ( level != 0 )
344
342
static void
345
343
range_value_changed (GtkWidget *widget, BrightnessButton *button)
346
344
{
347
 
    gint range_level, hw_level;
 
345
    glong range_level, hw_level;
348
346
    
349
347
    range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
350
348
    
430
428
static void
431
429
brightness_button_up (BrightnessButton *button)
432
430
{
433
 
    gint level;
434
 
    gint max_level;
 
431
    glong level;
 
432
    glong max_level;
435
433
    
436
434
    xfpm_brightness_get_level (button->priv->brightness, &level);
437
435
    max_level = xfpm_brightness_get_max_level (button->priv->brightness);
445
443
static void
446
444
brightness_button_down (BrightnessButton *button)
447
445
{
448
 
    gint level;
 
446
    glong level;
449
447
    xfpm_brightness_get_level (button->priv->brightness, &level);
450
448
    
451
449
    if ( level != 0 )