← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/xfpm-manager.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-05-18 21:50:54 UTC
  • mfrom: (21.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20120518215054-yzwvynnzoo09k89x
Tags: 1.2.0-1ubuntu1
* Merge from Debian experimental, remaining Ubuntu changes:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp #929537
  - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
    environment which have another power manager.
  - 09_fix_insert_battery.patch: Another patch to fix empty icon when
    removing a battery. Thanks Henry Gebhardt for the patch.
  - xubuntu_fix-status-icon-other-devices.patch: fix broken status icons
    for other devices (phone, wireless kbd, mouse, etc.).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfpm-manager.c
318
318
        
319
319
        if ( action == LID_TRIGGER_NOTHING )
320
320
        {
 
321
#ifdef HAVE_DPMS
321
322
            if ( !xfpm_is_multihead_connected () )
322
323
                xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
 
324
#endif
323
325
        }
324
326
        else if ( action == LID_TRIGGER_LOCK_SCREEN )
325
327
        {
340
342
    else
341
343
    {
342
344
        XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
 
345
#ifdef HAVE_DPMS
343
346
        xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
 
347
#endif
344
348
    }
345
349
}
346
350