summaryrefslogtreecommitdiff
path: root/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2006-05-13 15:42:03 +0200
committerRene Wagner <rw@handhelds.org>2006-05-13 15:42:03 +0200
commit5a5346dfbec459c10d9e61e16e125b83975a1ef1 (patch)
tree342e16f3fe790d03b93294344e6154459888939f /org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e35772d79306d1d9de19c12b23681618532d.
Diffstat (limited to 'org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1')
-rw-r--r--org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch30
-rw-r--r--org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch77
2 files changed, 107 insertions, 0 deletions
diff --git a/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch b/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
new file mode 100644
index 0000000..f66763f
--- /dev/null
+++ b/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
@@ -0,0 +1,30 @@
+Index: matchbox-panel-0.9.1/applets/mb-applet-battery.c
+===================================================================
+--- matchbox-panel-0.9.1.orig/applets/mb-applet-battery.c 2005-01-21 15:28:14.000000000 +0000
++++ matchbox-panel-0.9.1/applets/mb-applet-battery.c 2005-02-16 14:26:03.000000000 +0000
+@@ -230,7 +230,7 @@
+ printf("bar: %ix%i +%i+%i (%i)\n", bar_width, bar_height, bar_x, bar_y, mb_pixbuf_img_get_width(img_backing) );
+ */
+
+- if (apm_vals[PERCENTAGE] <= 0 || apm_vals[PERCENTAGE] > 99)
++ if (apm_vals[PERCENTAGE] <= 0 || apm_vals[PERCENTAGE] > 100)
+ {
+ r = 0x66; g = 0xff; b = 0x33; ac_power = True;
+ apm_vals[PERCENTAGE] = -1;
+@@ -378,14 +378,14 @@
+ if (apm_vals[AC_POWER] == AC_LINE_STATUS_ON)
+ {
+ if (apm_vals[PERCENTAGE] > 0
+- && apm_vals[PERCENTAGE] < 100 )
++ && apm_vals[PERCENTAGE] <= 100 )
+ sprintf(tray_msg, _("AC Connected\nCharging: %.2i %%\n")
+ , apm_vals[PERCENTAGE]);
+ else
+ sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+ } else {
+ if (apm_vals[PERCENTAGE] > 0
+- && apm_vals[PERCENTAGE] < 100
++ && apm_vals[PERCENTAGE] <= 100
+ /* && apm_vals[TIME_LEFT] > 0 Less strict */)
+ {
+ sprintf(tray_msg,
diff --git a/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch b/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
new file mode 100644
index 0000000..d97afab
--- /dev/null
+++ b/org.handhelds.familiar/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
@@ -0,0 +1,77 @@
+Index: matchbox-panel-0.9.1/applets/mb-applet-battery.c
+===================================================================
+--- matchbox-panel-0.9.1.orig/applets/mb-applet-battery.c 2005-02-16 14:29:16.000000000 +0000
++++ matchbox-panel-0.9.1/applets/mb-applet-battery.c 2005-02-16 16:45:55.000000000 +0000
+@@ -273,24 +273,28 @@
+ mb_pixbuf_img_plot_pixel(pb, img_backing, x, y, r, g, b);
+ }
+
+- /* Bubble alerts */
+- if ((time_left_idx > 0)
+- && !ac_power
+- && apm_vals[PERCENTAGE] > 0
+- /* && apm_vals[TIME_LEFT] > 0 XXX Less strict */
+- && (apm_vals[TIME_LEFT] < time_left_alerts[time_left_idx]))
++ /*dont do this if time values arent supported by this bios*/
++ if (apm_vals[TIME_LEFT] > 0 )
+ {
+- char tray_msg[256];
+- sprintf(tray_msg,
+- _("Battery power very low !\n\nTime Left: %.2i minutes"),
+- time_left_alerts[time_left_idx]);
+- mb_tray_app_tray_send_message(app, tray_msg, 0);
+- time_left_idx--;
+- }
+- else if (time_left_idx < 4
+- && apm_vals[TIME_LEFT] > time_left_alerts[time_left_idx+1])
+- {
+- time_left_idx++;
++ /* Bubble alerts */
++ if ((time_left_idx > 0)
++ && !ac_power
++ && apm_vals[PERCENTAGE] > 0
++ /* && apm_vals[TIME_LEFT] > 0 XXX Less strict */
++ && (apm_vals[TIME_LEFT] < time_left_alerts[time_left_idx]))
++ {
++ char tray_msg[256];
++ sprintf(tray_msg,
++ _("Battery power very low !\n\nTime Left: %.2i minutes"),
++ time_left_alerts[time_left_idx]);
++ mb_tray_app_tray_send_message(app, tray_msg, 0);
++ time_left_idx--;
++ }
++ else if (time_left_idx < 4
++ && apm_vals[TIME_LEFT] > time_left_alerts[time_left_idx+1])
++ {
++ time_left_idx++;
++ }
+ }
+
+ mb_pixbuf_img_render_to_drawable(pb, img_backing, drw, 0, 0);
+@@ -385,12 +389,20 @@
+ sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+ } else {
+ if (apm_vals[PERCENTAGE] > 0
+- && apm_vals[PERCENTAGE] <= 100
+- /* && apm_vals[TIME_LEFT] > 0 Less strict */)
+- {
+- sprintf(tray_msg,
+- _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
+- }
++ && apm_vals[PERCENTAGE] <= 100 )
++ {
++ if (apm_vals[TIME_LEFT] > 0 )
++ {
++ sprintf(tray_msg,
++ _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
++ }
++ else
++ {
++ sprintf(tray_msg,
++ _("Battery Power\nJuice %.2i %%\n"), apm_vals[PERCENTAGE]);
++ }
++
++ }
+ else sprintf(tray_msg, _("Battery Power\n Device read error.\n"));
+ }
+ mb_tray_app_tray_send_message(app, tray_msg, 5000);