← Back to branch summary

~ubuntu-branches/ubuntu/precise/xfce4-power-manager/precise

« back to all changes in this revision

Viewing changes to src/xfpm-button.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-10-02 20:15:41 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20091002201541-ognqyxyov51epj84
Tags: 0.8.4-1ubuntu1
https://launchpad.net/bugs/438754
https://launchpad.net/bugs/437374
* New upstream bugfix release (LP: #438754), merge from Debian unstable,
  remaining Ubuntu changes:
  - debian/patches:
    + xubuntu-use-notification-icons.patch: use our notification-* icons for
      notification bubbles instead of the normal ones LP: #437374
    + 10_pc.patch: added patched files to POTFILES.skip
    + series: created, with these two patches
  - debian/rules: add --with quilt
  - debian/control: build-depends on quilt (>= 0.46-7).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfpm-button.c
63
63
static void
64
64
xfpm_button_xf86_emit_signal (XfpmButton *button, XfpmButtonKey key)
65
65
{
66
 
    if ( key == BUTTON_LID_CLOSED || key == BUTTON_POWER_OFF || key == BUTTON_SLEEP || key == BUTTON_HIBERNATE )
 
66
    if ( key == BUTTON_POWER_OFF || key == BUTTON_SLEEP || key == BUTTON_HIBERNATE )
67
67
    {
68
68
        if ( g_timer_elapsed (button->priv->timer, NULL) > SLEEP_KEY_TIMEOUT )
69
69
        {
126
126
    
127
127
    xf86_mapped = xfpm_button_xf86_get_mapped_buttons (button->priv->xf86);
128
128
 
129
 
    button->priv->hal = xfpm_button_hal_new ();
 
129
    button->priv->hal = xfpm_button_hal_get ();
130
130
    
131
131
    if ( xf86_mapped & SLEEP_KEY && xf86_mapped & POWER_KEY && 
132
132
         xf86_mapped & BRIGHTNESS_KEY && xf86_mapped & HIBERNATE_KEY )