Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4567 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery:
. src ([EMAIL PROTECTED])
2. r4568 - trunk/src/target/OM-2007.2/libraries/libmokopanelui2
([EMAIL PROTECTED])
3. r4569 - in trunk/src/target/OM-2007.2/artwork/themes:
openmoko-standard-2/gtk-2.0 openmoko-standard-2-qvga/gtk-2.0
([EMAIL PROTECTED])
4. r4570 - in trunk/src/target/OM-2007.2/artwork/themes:
openmoko-standard-2/gtk-2.0 openmoko-standard-2-qvga/gtk-2.0
([EMAIL PROTECTED])
5. development tree for U-Boot: Changes to 'andy'
([EMAIL PROTECTED])
6. development tree for U-Boot: Changes to 'andy'
([EMAIL PROTECTED])
7. development tree for U-Boot: Changes to 'andy'
([EMAIL PROTECTED])
8. r4572 - trunk/src/target/thumbnails/source
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2008-08-01 03:32:47 +0200 (Fri, 01 Aug 2008)
New Revision: 4567
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
Log:
battery-applet: add libnotify support. closes ticket #1156
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
2008-07-31 15:59:46 UTC (rev 4566)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
2008-08-01 01:32:47 UTC (rev 4567)
@@ -1,3 +1,6 @@
+2008-08-01 Michael Lauer <[EMAIL PROTECTED]>
+ * add libnotify support. Patch by [EMAIL PROTECTED]
+
2007-11-05 Michael Lauer <[EMAIL PROTECTED]>
* src/openmoko-panel-battery.c: Use g_timeout_add_seconds.
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2008-07-31 15:59:46 UTC (rev 4566)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2008-08-01 01:32:47 UTC (rev 4567)
@@ -11,7 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2 dbus-1 dbus-glib-1)
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2 dbus-1 dbus-glib-1 libnotify)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
2008-07-31 15:59:46 UTC (rev 4566)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
2008-08-01 01:32:47 UTC (rev 4567)
@@ -22,6 +22,8 @@
#include <libmokopanelui2/moko-panel-applet.h>
+#include <libnotify/notify.h>
+
#include <gtk/gtklabel.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -105,7 +107,90 @@
dbus_connection_add_filter (bus, signal_filter, applet, NULL);
}
+static void battery_applet_notification (BatteryApplet *applet,
+ apm_info *info, int type)
+{
+ NotifyNotification *n;
+ static gint displayed = 0;
+ const gchar *summary;
+ const gchar *details;
+ gint urgency;
+ /* battery status information */
+ if (type == 1)
+ {
+ switch (info->battery_status)
+ {
+ case BATTERY_STATUS_CHARGING:
+ details = g_strdup ("<b>Status:</b> Charging");
+ break;
+ case BATTERY_STATUS_ABSENT:
+ details = g_strdup ("<b>Status:</b> Missing");
+ break;
+ default:
+ details = g_strdup_printf ("<b>Status</b>: Discharging\n"
+ "<b>Percentage charge:</b> %d%%",
+ info->battery_percentage);
+ break;
+ }
+ summary = g_strdup ("Battery info");
+ urgency = NOTIFY_URGENCY_NORMAL;
+ }
+ else
+ /* battery status notifications */
+ {
+ if (info->battery_status == BATTERY_STATUS_ABSENT ||
+ info->battery_status == BATTERY_STATUS_CHARGING)
+ {
+ displayed = 0;
+ return;
+ }
+ /*
+ display battery critically low notification only if battery
+ level <= 3 and notification wasn't show yet
+ */
+ else if ((info->battery_percentage <= 3) && !(displayed & 0x1))
+ {
+ summary = g_strdup ("Phone battery critically low");
+ details = g_strdup ("The battery is below the critical level and "
+ "this phone will <b>power-off</b> when the "
+ "battery becomes completely empty.");
+ urgency = NOTIFY_URGENCY_CRITICAL;
+ displayed |= 0x1;
+ }
+ /*
+ display battery critically low notification only if battery
+ level <= 10 and notification wasn't show yet
+ */
+ else if ((info->battery_percentage <= 10) && !(displayed & 0x2))
+ {
+ summary = g_strdup ("Phone battery low");
+ details = g_strdup_printf ("You have approximately <b>%d%%</b> "
+ "of remaining battery life.",
+ info->battery_percentage);
+ urgency = NOTIFY_URGENCY_NORMAL;
+ displayed |= 0x2;
+ }
+ else
+ return;
+ }
+
+ /* FIXME: add battery icon to notification popup */
+ n = notify_notification_new (summary, details, NULL,
GTK_WIDGET(applet->mokoapplet));
+
+ notify_notification_set_urgency (n, urgency);
+
+ if (type == 1)
+ /* display status information 3 sec */
+ notify_notification_set_timeout (n, 3000);
+ else
+ /* display notification forever */
+ notify_notification_set_timeout (n, 0);
+
+ if (!notify_notification_show (n, NULL))
+ g_debug ("failed to send notification");
+}
+
/* Called frequently */
static gboolean timeout( BatteryApplet *applet )
{
@@ -145,11 +230,23 @@
applet->last_icon = icon;
+ battery_applet_notification (applet, &info, 0);
moko_panel_applet_set_icon( applet->mokoapplet, icon );
return TRUE;
}
+static void
+on_clicked_cb (GtkButton *button, BatteryApplet *applet)
+{
+ apm_info info;
+
+ memset (&info, 0, sizeof (apm_info));
+ apm_read (&info);
+
+ battery_applet_notification (applet, &info, 1);
+}
+
G_MODULE_EXPORT GtkWidget* mb_panel_applet_create(const char* id,
GtkOrientation orientation)
{
BatteryApplet *applet = g_slice_new (BatteryApplet);
@@ -162,9 +259,14 @@
applet->last_icon = NULL;
+ notify_init ("Battery Applet");
+
timeout( applet );
battery_applet_init_dbus( applet );
applet->timeout_id = g_timeout_add_seconds( 60, (GSourceFunc) timeout,
applet);
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
+
+ g_signal_connect (mokoapplet, "clicked", G_CALLBACK (on_clicked_cb),
applet);
+
return GTK_WIDGET(mokoapplet);
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2008-08-01 03:42:29 +0200 (Fri, 01 Aug 2008)
New Revision: 4568
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
Log:
libmokopanelui2: add dependency to gtk+-2.0. fixes ticket #1271
Modified: trunk/src/target/OM-2007.2/libraries/libmokopanelui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokopanelui2/ChangeLog
2008-08-01 01:32:47 UTC (rev 4567)
+++ trunk/src/target/OM-2007.2/libraries/libmokopanelui2/ChangeLog
2008-08-01 01:42:29 UTC (rev 4568)
@@ -1,3 +1,8 @@
+2008-08-01 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac: add dependency to gtk+-2.0
+ (sudarshan s.)
+
2007-10-23 Michael Lauer <[EMAIL PROTECTED]>
* libmokopanelui/moko-panel-applet.c:
Modified: trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
2008-08-01 01:32:47 UTC (rev 4567)
+++ trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
2008-08-01 01:42:29 UTC (rev 4568)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(libmokopanelui2, 0.3.0, http://www.openmoko.org/)
+AC_INIT(libmokopanelui2, 0.3.1, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(libmokopanelui/moko-panel-applet.c)
AM_CONFIG_HEADER(config.h)
@@ -17,7 +17,7 @@
AM_GLIB_GNU_GETTEXT
# base deps
-PKG_CHECK_MODULES(DEPS, matchbox-panel )
+PKG_CHECK_MODULES(DEPS, matchbox-panel gtk+-2.0)
if test x$MOKO_DEVEL = xon ; then
AC_MSG_NOTICE([removing -O2 from CFLAGS])
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2008-08-01 03:47:04 +0200 (Fri, 01 Aug 2008)
New Revision: 4569
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
Log:
openmoko-standard-2[-qvga]: set fallback font size (if no settings daemon is
used)
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2008-08-01 01:42:29 UTC (rev 4568)
+++ trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2008-08-01 01:47:04 UTC (rev 4569)
@@ -1,3 +1,6 @@
+# Set the default font and font size
+gtk-font-name = "Sans 5"
+
gtk-icon-sizes =
"gtk-button=32,32:gtk-small-toolbar=48,48:gtk-large-toolbar=48,48"
# Note: libtaku supports multiple orientations. To enable:
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2008-08-01 01:42:29 UTC (rev 4568)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2008-08-01 01:47:04 UTC (rev 4569)
@@ -1,3 +1,6 @@
+# Set the default font and font size
+gtk-font-name = "Sans 5"
+
gtk-icon-sizes =
"gtk-button=16,16:gtk-small-toolbar=24,24:gtk-large-toolbar=24,24:taku-icon=32,32"
gtk_button_images = 0
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2008-08-01 03:50:14 +0200 (Fri, 01 Aug 2008)
New Revision: 4570
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
Log:
openmoko-standard-2[-qvga]: hint icon theme to use, if not using settings daemon
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2008-08-01 01:47:04 UTC (rev 4569)
+++ trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2008-08-01 01:50:14 UTC (rev 4570)
@@ -1,5 +1,7 @@
-# Set the default font and font size
-gtk-font-name = "Sans 5"
+# Set the default font and font size (if not using settings daemon)
+gtk-font-name = "Sans 5"
+# same for icon theme
+gtk-icon-theme-name = "openmoko-standard"
gtk-icon-sizes =
"gtk-button=32,32:gtk-small-toolbar=48,48:gtk-large-toolbar=48,48"
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2008-08-01 01:47:04 UTC (rev 4569)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2008-08-01 01:50:14 UTC (rev 4570)
@@ -1,5 +1,7 @@
-# Set the default font and font size
-gtk-font-name = "Sans 5"
+# Set the default font and font size (if not using settings daemon)
+gtk-font-name = "Sans 5"
+# same for icon theme
+gtk-icon-theme-name = "openmoko-standard"
gtk-icon-sizes =
"gtk-button=16,16:gtk-small-toolbar=24,24:gtk-large-toolbar=24,24:taku-icon=32,32"
--- End Message ---
--- Begin Message ---
board/neo1973/common/udc.c | 14 ++++++++++++--
board/neo1973/gta02/gta02.c | 6 ++++++
common/cmd_bootm.c | 7 +++++++
drivers/serial/usbtty.c | 16 ++++++++++++++--
drivers/usb/usbdcore.c | 6 ++++++
drivers/usb/usbdcore_s3c2410.c | 9 ++++++---
6 files changed, 51 insertions(+), 7 deletions(-)
New commits:
commit 5ebb764a8bfb44786ba80e5102c85cbeaa7139c5
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri Aug 1 07:47:19 2008 +0100
fix-stop-sitting-printing-in-time-critical-context.patch
Someone left us a big fat warning in USB device code
/* Don't ever put [serial] debugging in non-error codepaths here, it
* will violate the tight timing constraints of this USB Device
* controller (and lead to bus enumeration failures) */
these "non-error codepaths" go all over the shop, this patch nukes some
serial printf()s that can do what we must never do.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
commit d872d1ffdbbaf93de0f9ee95debeb414cc6da90c
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri Aug 1 07:47:19 2008 +0100
fix-kill-endpoints-before-linux.patch
This patch ties up udc closedown before starting Linux, and
makes sure the endpoints are off in the hardware.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
commit 00c27eb2887c07a9b6cdf095e7be016ab7e42d52
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri Aug 1 07:47:06 2008 +0100
fix-broken-usb-handed-to-linux.patch
The USB callback for udc / enumeration notification is very time
critical. Recently, we started using this for PMU actions, which
occur on the ridiculously slow I2C bus and block the USB stack for
the duration.
This caused a very bad behaviour in the USB Device hardware of
spamming the USB bus at 6MHz for the entire session, even after
Linux had booted, rendering the USB interface not operational.
The chances were about 50:50 per boot you would have broken USB.
This patch removes the I2C action from the time critical path
and instead takes care to track it only if we are spinning
waiting for enumeration because we have a bad battery level.
The I2C transaction then takes place out of any time critical
code.
Enumeration is lost anyway as soon as we enter Linux where the
device is enumerated fresh and the Linux pcf50633 driver will
handle it.
One of the results of Insane Spam Mode on USB is not being able
to enumerate properly with host PC over USB. And that leads
directly to not being able to charge the device for the whole
session.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
board/neo1973/gta02/gta02.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
New commits:
commit c87c058db7890d09f2429758de716bc7c0b71b6f
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri Aug 1 08:44:22 2008 +0100
fix-dont-do-i2c-with-irqs-off.patch
We can't afford turning off interrupts for long periods in
U-Boot as the USB stack fails and leaves the USB device in
Insane Spam Mode.
This patch allowed 50 resets in a row giving normal USB
behaviour with no sign of the issue any more.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
Rebased ref, commits from common ancestor:
commit c9982d25fc70930b522755398b8222be6d02e121
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri Aug 1 08:18:57 2008 +0100
fix-stop-sitting-printing-in-time-critical-context.patch
Someone left us a big fat warning in USB device code
/* Don't ever put [serial] debugging in non-error codepaths here, it
* will violate the tight timing constraints of this USB Device
* controller (and lead to bus enumeration failures) */
these "non-error codepaths" go all over the shop, this patch nukes some
serial printf()s that can do what we must never do.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
Author: julian_chu
Date: 2008-08-01 11:13:43 +0200 (Fri, 01 Aug 2008)
New Revision: 4572
Added:
trunk/src/target/thumbnails/source/communication_qtopia-phone-x11-addressbook.png
trunk/src/target/thumbnails/source/qtopia-phone-x11-dailer.png
Modified:
trunk/src/target/thumbnails/source/games_qtopia-phone-x11-snake.png
Log:
Add more thumbnails for Qtopia-phone-x11
Added:
trunk/src/target/thumbnails/source/communication_qtopia-phone-x11-addressbook.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/thumbnails/source/communication_qtopia-phone-x11-addressbook.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/target/thumbnails/source/games_qtopia-phone-x11-snake.png
===================================================================
(Binary files differ)
Added: trunk/src/target/thumbnails/source/qtopia-phone-x11-dailer.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/thumbnails/source/qtopia-phone-x11-dailer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
