diff options
18 files changed, 19 insertions, 32 deletions
@@ -1,3 +1,9 @@ +2008-02-14 Ross Burton <ross@openedhand.com> + + * applets/battery/data/: + * applets/battery/battery.c: + Don't use private icons, use the icon theme. + 2008-02-13 Ross Burton <ross@openedhand.com> * applets/showdesktop/Makefile.am: diff --git a/applets/battery/Makefile.am b/applets/battery/Makefile.am index 1d37861..20e2625 100644 --- a/applets/battery/Makefile.am +++ b/applets/battery/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = data - AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \ -DGETTEXT_PACKAGE=\"matchbox-panel\" \ -DDATADIR=\"$(pkgdatadir)/battery/\" diff --git a/applets/battery/battery.c b/applets/battery/battery.c index 9e6196b..2f6c06a 100644 --- a/applets/battery/battery.c +++ b/applets/battery/battery.c @@ -38,34 +38,34 @@ timeout (BatteryApplet *applet) apm_read (&info); if (info.battery_status == BATTERY_STATUS_ABSENT) - icon = DATADIR "/ac-adapter.png"; + icon = "ac-adapter.png"; else { if (info.ac_line_status == AC_LINE_STATUS_ON) { if (info.battery_percentage < 10) - icon = DATADIR "battery-charging-000.png"; + icon = "battery-charging-000.png"; else if (info.battery_percentage < 30) - icon = DATADIR "battery-charging-020.png"; + icon = "battery-charging-020.png"; else if (info.battery_percentage < 50) - icon = DATADIR "battery-charging-040.png"; + icon = "battery-charging-040.png"; else if (info.battery_percentage < 70) - icon = DATADIR "battery-charging-060.png"; + icon = "battery-charging-060.png"; else if (info.battery_percentage < 90) - icon = DATADIR "battery-charging-080.png"; + icon = "battery-charging-080.png"; else - icon = DATADIR "battery-charging-100.png"; + icon = "battery-charging-100.png"; } else { if (info.battery_percentage < 10) - icon = DATADIR "battery-discharging-000.png"; + icon = "battery-discharging-000.png"; else if (info.battery_percentage < 30) - icon = DATADIR "battery-discharging-020.png"; + icon = "battery-discharging-020.png"; else if (info.battery_percentage < 50) - icon = DATADIR "battery-discharging-040.png"; + icon = "battery-discharging-040.png"; else if (info.battery_percentage < 70) - icon = DATADIR "battery-discharging-060.png"; + icon = "battery-discharging-060.png"; else if (info.battery_percentage < 90) - icon = DATADIR "battery-discharging-080.png"; + icon = "battery-discharging-080.png"; else - icon = DATADIR "battery-discharging-100.png"; + icon = "battery-discharging-100.png"; } } diff --git a/applets/battery/data/Makefile.am b/applets/battery/data/Makefile.am deleted file mode 100644 index 68915d4..0000000 --- a/applets/battery/data/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -imagedir = $(pkgdatadir)/battery -image_DATA = ac-adapter.png \ - battery-charged.png \ - battery-charging-000.png \ - battery-charging-020.png \ - battery-charging-040.png \ - battery-charging-060.png \ - battery-charging-080.png \ - battery-charging-100.png \ - battery-discharging-000.png \ - battery-discharging-020.png \ - battery-discharging-040.png \ - battery-discharging-060.png \ - battery-discharging-080.png \ - battery-discharging-100.png - -MAINTAINERCLEANFILES = Makefile.in diff --git a/applets/battery/data/ac-adapter.png b/applets/battery/data/ac-adapter.png Binary files differdeleted file mode 100644 index 5374555..0000000 --- a/applets/battery/data/ac-adapter.png +++ /dev/null diff --git a/applets/battery/data/battery-charged.png b/applets/battery/data/battery-charged.png Binary files differdeleted file mode 100644 index 69bf554..0000000 --- a/applets/battery/data/battery-charged.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-000.png b/applets/battery/data/battery-charging-000.png Binary files differdeleted file mode 100644 index 4826400..0000000 --- a/applets/battery/data/battery-charging-000.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-020.png b/applets/battery/data/battery-charging-020.png Binary files differdeleted file mode 100644 index 0811a18..0000000 --- a/applets/battery/data/battery-charging-020.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-040.png b/applets/battery/data/battery-charging-040.png Binary files differdeleted file mode 100644 index b1bd943..0000000 --- a/applets/battery/data/battery-charging-040.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-060.png b/applets/battery/data/battery-charging-060.png Binary files differdeleted file mode 100644 index 55248b5..0000000 --- a/applets/battery/data/battery-charging-060.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-080.png b/applets/battery/data/battery-charging-080.png Binary files differdeleted file mode 100644 index 2ced598..0000000 --- a/applets/battery/data/battery-charging-080.png +++ /dev/null diff --git a/applets/battery/data/battery-charging-100.png b/applets/battery/data/battery-charging-100.png Binary files differdeleted file mode 100644 index 37121db..0000000 --- a/applets/battery/data/battery-charging-100.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-000.png b/applets/battery/data/battery-discharging-000.png Binary files differdeleted file mode 100644 index 400482c..0000000 --- a/applets/battery/data/battery-discharging-000.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-020.png b/applets/battery/data/battery-discharging-020.png Binary files differdeleted file mode 100644 index 830fe4c..0000000 --- a/applets/battery/data/battery-discharging-020.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-040.png b/applets/battery/data/battery-discharging-040.png Binary files differdeleted file mode 100644 index a3361e0..0000000 --- a/applets/battery/data/battery-discharging-040.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-060.png b/applets/battery/data/battery-discharging-060.png Binary files differdeleted file mode 100644 index 3c96ac6..0000000 --- a/applets/battery/data/battery-discharging-060.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-080.png b/applets/battery/data/battery-discharging-080.png Binary files differdeleted file mode 100644 index e9903d9..0000000 --- a/applets/battery/data/battery-discharging-080.png +++ /dev/null diff --git a/applets/battery/data/battery-discharging-100.png b/applets/battery/data/battery-discharging-100.png Binary files differdeleted file mode 100644 index 4750043..0000000 --- a/applets/battery/data/battery-discharging-100.png +++ /dev/null |
