← Back to branch summary

~ubuntu-branches/ubuntu/raring/lxpanel/raring

« back to all changes in this revision

Viewing changes to src/plugins/batt/batt_sys.h

  • Committer: Package Import Robot
  • Author(s): Julien Lavergne
  • Date: 2012-02-13 23:40:40 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20120213234040-w24ouhodotl76yav
Tags: 0.5.8+git20120212-0ubuntu1
https://launchpad.net/bugs/889414
https://launchpad.net/bugs/690662
https://launchpad.net/bugs/878117
https://launchpad.net/bugs/692276
https://launchpad.net/bugs/692260
https://launchpad.net/bugs/909127
* New upstream snapshot
 - Run dialog opens up in the background (LP: #889414)
 - Abiliy to configure task Bar Font (LP: #690662)
 - Volume applet uses wrong icon (LP: #878117)
 - Add ability for lxpanel sound applet to launch a GUI for sound management
   (LP: #692276)
 - lxpanel indicator support can't be configured (LP: #692260)
 - Task Bar (Window List) - Options on 64bit version are different than 32bit
   version (LP: #909127)
* debian/patches
 - indicator-support.patch: Remove, merged upstream.
 - fix_indicator_dir.patch: Remove, merged upstream.
 - fix_position.patch: Remove, merged upstream.
 - missing_glades.patch: Remove, fixed upstream.
 - default-config.patch: Refresh.
 - configure_desktop_number.patch: Refresh.
 - 99_refresh_autotools.patch: Refresh.
* debian/control:
 - Build-depends on libwnck-dev.
* debian/lxpanel.install:
 - Add new plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/batt/batt_sys.h
36
36
    int battery_num;
37
37
    /* path to battery dir */
38
38
    const gchar *path;                  
39
 
    int remaining_capacity;
40
 
    int remaining_energy;
41
 
    int present_rate;
42
 
    int voltage;
43
 
    int design_capacity;
44
 
    int design_capacity_unit;
45
 
    int last_capacity;
46
 
    int last_capacity_unit;
47
 
    int hours, minutes, seconds;
 
39
    /* sysfs file contents */
 
40
    int charge_now;
 
41
    int energy_now;
 
42
    int current_now;
 
43
    int power_now;
 
44
    int voltage_now;
 
45
    int charge_full_design;
 
46
    int energy_full_design;
 
47
    int charge_full;
 
48
    int energy_full;
 
49
    /* extra info */
 
50
    int seconds;
48
51
    int percentage;
49
52
    char *state, *poststr;
50
53
    char* capacity_unit;