← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/80-policy-timeout-reset-on-startup.patch

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Silverstone
  • Date: 2006-05-02 16:40:05 UTC
  • mfrom: (2.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20060502164005-sorlqv3se7w8lazj
Tags: 2.14.3-0ubuntu1
* UVF Exception under general GNOME exception, granted by Colin Watson
* New upstream release on stable branch
  Highlights since 2.14.0 include:
   - Critical action ignored when battery is 0% (stops some resume->shutdown)
   - Deal sanely with hal/dbus restarts
   - Use 'battery' rather than 'www' closes: launchpad #22451:
   - Throttle when lid is shut, rather than inhibiting.
   - Fix a logic problem related to random suspends wrt. lid closure.
   - Only reenable "fully-charged" notifications when the battery drops
     below 95% to cope with laptops which fluctuate between 99% and 100%
   - Updated translations for Hungarian, Lithuanian, Spanish, Japanese,
     Netherlands, Greek, German and Vietnamese
* Patches removed from this version:
   - 80-policy-timeout-reset-on-startup.patch
     30-remove-sm-disable.patch
     Rolled into upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/80-policy-timeout-reset-on-startup.patch
1
 
diff -Nur gnome-power-manager-2.14.0/src/gpm-manager.c gnome-power-manager-2.14.0.new/src/gpm-manager.c
2
 
--- gnome-power-manager-2.14.0/src/gpm-manager.c        2006-03-13 19:00:04.000000000 +0000
3
 
+++ gnome-power-manager-2.14.0.new/src/gpm-manager.c    2006-03-29 17:36:19.121597448 +0100
4
 
@@ -1913,6 +1913,10 @@
5
 
                                      GPM_PREF_POLICY_TIMEOUT, NULL);
6
 
        gpm_debug ("Using a supressed policy timeout of %i seconds",
7
 
                   manager->priv->suppress_policy_timeout);
8
 
+       
9
 
+        /* Pretend we just resumed when we start to let actions settle */
10
 
+       manager->priv->last_resume_event = time (NULL);
11
 
+
12
 
 }
13
 
 
14
 
 static void