← Back to branch summary

~ubuntu-branches/ubuntu/maverick/devicekit-power/maverick

« back to all changes in this revision

Viewing changes to devkit-power-gobject/dkp-enum.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-06 19:12:49 UTC
  • mfrom: (1.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090706191249-hr0a9c2ti5u0b5lc
Tags: 009-1
* New upstream release.   
* debian/control: Add myself to uploaders (discussed with Michael).
* debian/devicekit-power.install: Upstream installs udev rules into
  /lib/udev/rules.d now, update accordingly.
* Add 0001-Add-a-notify-flag-to-set_lid_is_closed.patch: Properly fix the
  silencing of the coldplug lid event, so that the first real lid event
  actually works. Thanks to Loïc Minier! (fd.o #22574)

Show diffs side-by-side

added added

removed removed

Lines of Context:
devkit-power-gobject/dkp-enum.c
56
56
        case DKP_DEVICE_TYPE_PHONE:
57
57
                type = "phone";
58
58
                break;
59
 
        case DKP_DEVICE_TYPE_UNKNOWN:
 
59
        default:
60
60
                type = "unknown";
61
61
                break;
62
 
        default:
63
 
                g_assert_not_reached ();
64
 
                break;
65
62
        }
66
63
        return type;
67
64
}
113
110
        case DKP_DEVICE_STATE_FULLY_CHARGED:
114
111
                state = "fully-charged";
115
112
                break;
116
 
        case DKP_DEVICE_STATE_UNKNOWN:
 
113
        case DKP_DEVICE_STATE_PENDING_CHARGE:
 
114
                state = "pending-charged";
 
115
                break;
 
116
        case DKP_DEVICE_STATE_PENDING_DISCHARGE:
 
117
                state = "pending-discharge";
 
118
                break;
 
119
        default:
117
120
                state = "unknown";
118
121
                break;
119
 
        default:
120
 
                g_assert_not_reached ();
121
 
                break;
122
122
        }
123
123
        return state;
124
124
}
139
139
                return DKP_DEVICE_STATE_EMPTY;
140
140
        if (g_strcmp0 (state, "fully-charged") == 0)
141
141
                return DKP_DEVICE_STATE_FULLY_CHARGED;
 
142
        if (g_strcmp0 (state, "pending-charge") == 0)
 
143
                return DKP_DEVICE_STATE_PENDING_CHARGE;
 
144
        if (g_strcmp0 (state, "pending-discharge") == 0)
 
145
                return DKP_DEVICE_STATE_PENDING_DISCHARGE;
142
146
        return DKP_DEVICE_STATE_UNKNOWN;
143
147
}
144
148
 
168
172
        case DKP_DEVICE_TECHNOLOGY_NICKEL_METAL_HYDRIDE:
169
173
                technology = "nickel-metal-hydride";
170
174
                break;
171
 
        case DKP_DEVICE_TECHNOLOGY_UNKNOWN:
 
175
        default:
172
176
                technology = "unknown";
173
177
                break;
174
 
        default:
175
 
                g_assert_not_reached ();
176
 
                break;
177
178
        }
178
179
        return technology;
179
180
}