← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-power-manager/maverick-proposed

« back to all changes in this revision

Viewing changes to src/gpm-common.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-08-13 09:22:28 UTC
  • mfrom: (2.1.54 upstream)
  • Revision ID: james.westby@ubuntu.com-20100813092228-t3as2pyseicp20dk
Tags: 2.31.6-0ubuntu1
* New upstream version:
  - Adjust dim timeout when necessary.
  - Backport support for new devices recognised in UPower.
  - Backport various translation fixes and translator comments from git master.
  - Do not assume the lid is open at boot.
  - Do not show gnome-power-statistics in the menus.
  - Do not show the prefs menu on LiveCD's and with GDM.
  - Don't treat percentage=0 as error condition.
  - Fix a crash when displaying the 'No GConf schema warning'.
* Drop 00git-initial-lid-status.patch, upstream now.
* 12-add-appindicators.patch: Port to new upstream version.
* Add 00git-devices-changed-signal.patch: Add a "devices-changed" signal.
  This was already in 2.31.1, but got dropped from the 2.32 branch. However,
  our appindicator patch needs it now.
* 02-notify-osd-support.patch: Unfuzz for new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gpm-common.c
86
86
{
87
87
        if (policy == NULL)
88
88
                return GPM_ICON_POLICY_NEVER;
89
 
        if (g_strcmp0 (policy, "always") == 0 ||
90
 
            g_strcmp0 (policy, "present") == 0)
 
89
        if (g_strcmp0 (policy, "always") == 0)
 
90
                return GPM_ICON_POLICY_ALWAYS;
 
91
        if (g_strcmp0 (policy, "present") == 0)
91
92
                return GPM_ICON_POLICY_PRESENT;
92
93
        if (g_strcmp0 (policy, "charge") == 0)
93
94
                return GPM_ICON_POLICY_CHARGE;
106
107
const gchar *
107
108
gpm_icon_policy_to_string (GpmIconPolicy policy)
108
109
{
 
110
        if (policy == GPM_ICON_POLICY_ALWAYS)
 
111
                return "always";
109
112
        if (policy == GPM_ICON_POLICY_PRESENT)
110
113
                return "present";
111
114
        if (policy == GPM_ICON_POLICY_CHARGE)