indicator-power

Merge lp://staging/~charlesk/indicator-power/icon-policy into lp://staging/indicator-power/1.0

Proposed by Ted Gould on 2012-02-10

Status:	Merged
Merged at revision:	125
Proposed branch:	lp://staging/~charlesk/indicator-power/icon-policy
Merge into:	lp://staging/indicator-power/1.0
Diff against target:	679 lines (+236/-161) 2 files modified data/com.canonical.indicator.power.gschema.xml.in (+11/-1) src/indicator-power.c (+225/-160)
To merge this branch:	bzr merge lp://staging/~charlesk/indicator-power/icon-policy
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lars Karlitski (community)		2012-02-10	Approve on 2012-02-13
Review via email: mp+92575@code.staging.launchpad.net

137. By Charles Kerr on 2012-02-13: make prototypes for update_visibility() and should_be_visible() align with the neighboring forward declarations
138. By Charles Kerr on 2012-02-13: remove unnecessary G_OBJECT() cast
139. By Charles Kerr on 2012-02-13: consistent use of ICON_POLICY_KEY
140. By Charles Kerr on 2012-02-13: remove unncessary private field 'visible'
141. By Charles Kerr on 2012-02-13: move POWER_INDICATOR_ICON_POLICY_* enum to the top of the file
142. By Charles Kerr on 2012-02-13: ensure that we don't have a reference to the proxy or proxy_cancel fields in indicator_power_dispose().