Send commitlog mailing list submissions to
[email protected]
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. r1701 - in
trunk/src/target/OM-2007/applications/openmoko-rssreader: . po
([EMAIL PROTECTED])
2. r1702 -
trunk/src/target/OM-2007/applications/openmoko-rssreader/po
([EMAIL PROTECTED])
3. r1703 - in
trunk/src/target/OM-2007/applications/openmoko-rssreader: src
tests ([EMAIL PROTECTED])
4. r1704 -
trunk/src/target/OM-2007/applications/openmoko-rssreader
([EMAIL PROTECTED])
5. r1705 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: .
src ([EMAIL PROTECTED])
6. r1706 - trunk/src/target/OM-2007/devel/qmake
([EMAIL PROTECTED])
7. r1707 - trunk/src/target/OM-2007/openmoko-libs
([EMAIL PROTECTED])
--- Begin Message ---
Author: zecke
Date: 2007-04-07 21:35:34 +0200 (Sat, 07 Apr 2007)
New Revision: 1701
Added:
trunk/src/target/OM-2007/applications/openmoko-rssreader/po/LINGUAS
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
trunk/src/target/OM-2007/applications/openmoko-rssreader/po/POTFILES.in
Log:
openmoko-rssreader: Make i18n work(?!)
Require intltool and provide an empty LINGUAS file
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
2007-04-07 19:22:36 UTC (rev 1700)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
2007-04-07 19:35:34 UTC (rev 1701)
@@ -9,6 +9,7 @@
AC_PROG_LIBTOOL
#i18n
+AC_PROG_INTLTOOL([0.23])
GETTEXT_PACKAGE=openmoko-rssreader
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
AC_SUBST(GETTEXT_PACKAGE)
Added: trunk/src/target/OM-2007/applications/openmoko-rssreader/po/LINGUAS
===================================================================
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/po/POTFILES.in
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/po/POTFILES.in
2007-04-07 19:22:36 UTC (rev 1700)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/po/POTFILES.in
2007-04-07 19:35:34 UTC (rev 1701)
@@ -1,2 +1,3 @@
src/callbacks.c
src/main.c
+src/rfcdate.c
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 21:36:25 +0200 (Sat, 07 Apr 2007)
New Revision: 1702
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/po/
Log:
openmoko-rssreader: ignore autogenerated i18n files
Property changes on: trunk/src/target/OM-2007/applications/openmoko-rssreader/po
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
Makefile.in.in
POTFILES
*.pot
+ Makefile
Makefile.in
Makefile.in.in
POTFILES
*.pot
*.swp
stamp*
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 23:59:47 +0200 (Sat, 07 Apr 2007)
New Revision: 1703
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
Log:
openmoko-rssreader: Add more tests and besides the memory leaks of Glib we are
doing fine
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 19:36:25 UTC (rev 1702)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 21:59:47 UTC (rev 1703)
@@ -177,9 +177,13 @@
* %a but for the %b we need to look it up properly
*/
int day, year, hour, minute, second;
+ day = year = hour = minute = second = 0;
gchar month_name[4];
sscanf (rfc822date, "%*3s, %d %3s %d %d:%d:%d", &day, month_name, &year,
&hour, &minute, &second );
+ if ( year < 100 )
+ year += 1900;
+
self->timeval.tv_sec = hour*60*60 + minute*60 + second;
self->timeval.tv_usec = 0;
g_date_set_dmy ( self->date, day, rss_month_number (month_name), year);
@@ -216,13 +220,13 @@
g_date_set_time_val (date, &now);
if ( g_date_compare( date, self->date ) == 0 ) {
- date_string = g_string_new (_("Today"));
+ date_string = g_string_new (_("Today,"));
goto exit;
}
g_date_subtract_days( date, 1 );
if ( g_date_compare( date, self->date ) == 0 ) {
- date_string = g_string_new (_("Yesterday"));
+ date_string = g_string_new (_("Yesterday,"));
goto exit;
}
@@ -230,16 +234,19 @@
* copy the date using the current locale. And retry
* until the buffer is big enough
*/
- date_string = g_string_sized_new( 10 );
- while ( g_date_strftime( date_string->str, date_string->allocated_len-1,
"%a, %d %b %Y", self->date ) == 0 ) {
+ date_string = g_string_sized_new( 40 );
+ gsize result;
+ while ( (result = g_date_strftime( date_string->str,
date_string->allocated_len-1, "%a, %e %b %Y", self->date )) == 0 ) {
g_string_set_size( date_string, date_string->allocated_len + 10 );
}
+ g_string_set_size (date_string, result);
+
exit:
/*
* append the time
*/
- g_string_append_printf ( date_string, ", %ld:%ld:%ld",
+ g_string_append_printf ( date_string, " %ld:%ld:%ld",
self->timeval.tv_sec/60/60,
self->timeval.tv_sec/60%60,
self->timeval.tv_sec%60);
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
2007-04-07 19:36:25 UTC (rev 1702)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/tests/date_test.c
2007-04-07 21:59:47 UTC (rev 1703)
@@ -1,5 +1,7 @@
#include <check.h>
#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
#include <glib.h>
#include "rfcdate.h"
@@ -16,13 +18,88 @@
RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
rss_rfc_date_set (date, "Wed, 26 Jan 83 07:57");
+ fail_unless (g_date_valid (date->date), "Date is valid");
fail_unless (g_date_get_month (date->date) == G_DATE_JANUARY, "Seldom year
number, seldom time");
fail_unless (g_date_get_day (date->date) == 26, "Parsed my birthday");
fail_unless (g_date_get_year (date->date) == 1983, "Parsed my birthyear");
- fail_unless (date->timeval.tv_sec == (8*60*60+57*60), "Parsed my birthtime
properly");
+ fail_unless (date->timeval.tv_sec == (7*60*60+57*60), "Parsed my birthtime
properly");
+
+ g_object_unref (date);
}
END_TEST
+START_TEST(test_month_names)
+{
+ gchar date_buffer[40];
+ gchar *month_names[] = {
+ "Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec" };
+
+ RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
+ fail_unless( date != NULL, "Allocated date" );
+
+ for ( int i = 0; i < 12; ++i ) {
+ snprintf (date_buffer, 40, "Mon, 9 %s 2041 23:23:23", month_names[i] );
+ rss_rfc_date_set ( date, date_buffer);
+ fail_unless (g_date_valid(date->date), "Parsing the date failed" );
+ fail_unless (g_date_get_month(date->date) == i+1, "Parsing the month
named failed" );
+ fail_unless (date->timeval.tv_sec == 23*60*60+23*60+23 );
+ }
+
+ g_object_unref (date);
+}
+END_TEST
+
+/*
+ * make sure to run this with LC_ALL=C
+ */
+START_TEST(test_string_representation)
+{
+
+ static gchar * month_names[] = { "", "Jan", "Feb", "Mar", "Apr", "May",
"Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+ RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
+ rss_rfc_date_set( date, "Mon, 6 Mar 1848 13:24:43" );
+ g_print ("Date: %s\n", rss_rfc_date_as_string (date));
+ fail_unless( strcmp(rss_rfc_date_as_string (date), "Mon, 6 Mar 1848
13:24:43") == 0, "formatted string 1" );
+ fail_unless( strcmp(rss_rfc_date_as_string (date), "Mon, 6 Mar 1848
13:24:43") == 0, "formatted stringc cached?" );
+
+
+ GTimeVal now;
+ g_get_current_time (&now);
+ GDate *gdate = g_date_new ();
+ g_date_set_time_val (gdate, &now);
+ g_print( "Day: %d Month: %d Year: %d\n", g_date_day (gdate), g_date_month
(gdate), g_date_year (gdate) );
+
+ gchar date_string[40];
+ snprintf( date_string, 40, "Mon, %d %s %d 23:10:53", g_date_day (gdate),
month_names[g_date_month (gdate)], g_date_year (gdate) );
+ rss_rfc_date_set (date, date_string);
+ g_print ("Date string '%s' '%s'\n", date_string, rss_rfc_date_as_string
(date));
+ fail_unless ( strcmp( "Today, 23:10:53", rss_rfc_date_as_string (date) )
== 0, "Correct today's formatting");
+ fail_unless ( strcmp( "Today, 23:10:53", rss_rfc_date_as_string (date) )
== 0, "Correct today's formatting (cached)");
+
+ g_date_subtract_days (gdate, 1);
+ snprintf( date_string, 40, "Mon, %d %s %d 23:10:53", g_date_day (gdate),
month_names[g_date_month (gdate)], g_date_year (gdate) );
+ rss_rfc_date_set (date, date_string);
+ g_print ("Date string '%s' '%s'\n", date_string, rss_rfc_date_as_string
(date));
+ fail_unless ( strcmp( "Yesterday, 23:10:53", rss_rfc_date_as_string (date)
) == 0, "Correct yesterday's formatting");
+ fail_unless ( strcmp( "Yesterday, 23:10:53", rss_rfc_date_as_string (date)
) == 0, "Correct yesterday's formatting (cached)");
+
+ g_date_free (gdate);
+ g_object_unref (date);
+}
+END_TEST
+
Suite*
date_suite (void)
{
@@ -30,6 +107,8 @@
TCase *tc_core = tcase_create ("Core");
tcase_add_test (tc_core, test_create_date);
tcase_add_test (tc_core, test_parsing_date);
+ tcase_add_test (tc_core, test_month_names);
+ tcase_add_test (tc_core, test_string_representation);
suite_add_tcase (s, tc_core);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-08 00:06:25 +0200 (Sun, 08 Apr 2007)
New Revision: 1704
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/
Log:
openmoko-rssreader: Ignore more i18n autogenerated files
Property changes on: trunk/src/target/OM-2007/applications/openmoko-rssreader
___________________________________________________________________
Name: svn:ignore
- *.swp
stamp-h1
libtool
aclocal.m4
Makefile.in
Makefile
*.bz2
mkinstalldirs
configure
ltmain.sh
config.guess
config.sub
config.h.in
config.h
config.log
config.status
depcomp
missing
install-sh
autom4te.cache
*autogen_bak
INSTALL
config.status
+ *.swp
stamp-h1
libtool
aclocal.m4
Makefile.in
Makefile
*.bz2
mkinstalldirs
configure
ltmain.sh
config.guess
config.sub
config.h.in
config.h
config.log
config.status
depcomp
missing
install-sh
autom4te.cache
*autogen_bak
INSTALL
config.status
intltool-*
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-08 01:14:23 +0200 (Sun, 08 Apr 2007)
New Revision: 1705
Added:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Log:
openmoko-panel-mainmenu: add enabling code for action button events
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-04-07 22:06:25 UTC (rev 1704)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-04-07 23:14:23 UTC (rev 1705)
@@ -1,8 +1,18 @@
MOKOCONFIG = mokoui
MOKOTYPE = panel-plugin
+HEADERS = \
+ src/buttonactions.h \
+ src/mokodesktop.h \
+ src/mokodesktop_item.h \
+ src/stylusmenu.h
+
SOURCES = \
- src/openmoko-panel-mainmenu.c
+ src/openmoko-panel-mainmenu.c \
+ src/buttonactions.c \
+ src/mokodesktop.c \
+ src/mokodesktop_item.c \
+ src/stylusmenu.c
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-04-07 22:06:25 UTC (rev 1704)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-04-07 23:14:23 UTC (rev 1705)
@@ -4,7 +4,12 @@
appletdir = $(libdir)/matchbox-panel/
applet_LTLIBRARIES = libopenmoko-panel-mainmenu.la
-libopenmoko_panel_mainmenu_la_SOURCES = openmoko-panel-mainmenu.c stylusmenu.c
mokodesktop.c mokodesktop_item.c
+libopenmoko_panel_mainmenu_la_SOURCES = \
+ openmoko-panel-mainmenu.c \
+ buttonactions.c \
+ stylusmenu.c \
+ mokodesktop.c \
+ mokodesktop_item.c
libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-04-07 22:06:25 UTC (rev 1704)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-04-07 23:14:23 UTC (rev 1705)
@@ -0,0 +1,158 @@
+/*
+ * openmoko-panel-mainmenu: handle action buttons
+ *
+ * Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2007 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+#include "buttonactions.h"
+
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/input.h>
+
+//FIXME find out through sysfs
+#if 0
+ #define AUX_BUTTON_EVENT_PATH "/dev/input/event0"
+ #define AUX_BUTTON_KEYCODE 169
+ #define POWER_BUTTON_EVENT_PATH "/dev/input/event2"
+ #define POWER_BUTTON_KEYCODE 116
+#else
+ #define AUX_BUTTON_EVENT_PATH "/dev/input/event0"
+ #define AUX_BUTTON_KEYCODE 0x25
+ #define POWER_BUTTON_EVENT_PATH "/dev/input/event2"
+ #define POWER_BUTTON_KEYCODE 0x25
+#endif
+
+GPollFD aux_fd;
+GPollFD power_fd;
+
+GTimer* aux_timer;
+GTimer* power_timer;
+
+gboolean panel_mainmenu_install_watcher()
+{
+ int auxfd = open( AUX_BUTTON_EVENT_PATH, O_RDONLY );
+ if ( auxfd < 0 )
+ {
+ g_debug( "can't open " AUX_BUTTON_EVENT_PATH " (%s)", strerror( errno
) );
+ return FALSE;
+ }
+ int powerfd = open( POWER_BUTTON_EVENT_PATH, O_RDONLY );
+ if ( powerfd < 0 )
+ {
+ g_debug( "can't open " POWER_BUTTON_EVENT_PATH " (%s)", strerror(
errno ) );
+ return FALSE;
+ }
+ static GSourceFuncs funcs = {
+ panel_mainmenu_input_prepare,
+ panel_mainmenu_input_check,
+ panel_mainmenu_input_dispatch,
+ NULL,
+ };
+ GSource* button_watcher = g_source_new( &funcs, sizeof (GSource) );
+ aux_fd.fd = auxfd;
+ aux_fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+ aux_fd.revents = 0;
+ g_source_add_poll( button_watcher, &aux_fd );
+ aux_timer = g_timer_new();
+ power_fd.fd = powerfd;
+ power_fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+ power_fd.revents = 0;
+ g_source_add_poll( button_watcher, &power_fd );
+ power_timer = g_timer_new();
+ g_source_attach( button_watcher, NULL );
+ return TRUE;
+}
+
+
+gboolean panel_mainmenu_input_prepare( GSource* source, gint* timeout )
+{
+ g_debug( "prepare" );
+ return FALSE;
+}
+
+
+gboolean panel_mainmenu_input_check( GSource* source )
+{
+ g_debug( "check" );
+ return ( ( aux_fd.revents & G_IO_IN ) || ( power_fd.revents & G_IO_IN ) );
+}
+
+
+gboolean panel_mainmenu_input_dispatch( GSource* source, GSourceFunc callback,
gpointer data )
+{
+ g_debug( "dispatch" );
+ if ( aux_fd.revents & G_IO_IN )
+ {
+ struct input_event event;
+ int size = read( aux_fd.fd, &event, sizeof( struct input_event ) );
+ g_debug( "read %d bytes from aux_fd %d", size, aux_fd.fd );
+ g_debug( "input event = ( %0x, %0x, %0x )", event.type, event.code,
event.value );
+ //g_timeout_add( 1 * 1000, (GSourceFunc) panel_mainmenu_input_timeout,
NULL);
+ if ( event.type == 1 && event.code == AUX_BUTTON_KEYCODE )
+ {
+ if ( event.value == 1 ) /* pressed */
+ {
+ g_debug( "resetting aux timer" );
+ g_timer_reset( aux_timer );
+ }
+ else if ( event.value == 0 ) /* released */
+ {
+ g_debug( "triggering aux function" );
+ panel_mainmenu_aux_timeout( g_timer_elapsed( aux_timer, NULL )
);
+ }
+ }
+ }
+ if ( power_fd.revents & G_IO_IN )
+ {
+ struct input_event event;
+ int size = read( power_fd.fd, &event, sizeof( struct input_event ) );
+ g_debug( "read %d bytes from power_fd %d", size, power_fd.fd );
+ g_debug( "input event = ( %0x, %0x, %0x )", event.type, event.code,
event.value );
+ //g_timeout_add( 1 * 1000, (GSourceFunc) panel_mainmenu_power_timeout,
NULL);
+ if ( event.type == 1 && event.code == POWER_BUTTON_KEYCODE )
+ {
+ if ( event.value == 1 ) /* pressed */
+ {
+ g_debug( "resetting power timer" );
+ g_timer_reset( power_timer );
+ }
+ else if ( event.value == 0 ) /* released */
+ {
+ g_debug( "triggering power function" );
+ panel_mainmenu_power_timeout( g_timer_elapsed( power_timer,
NULL ) );
+ }
+ }
+ }
+ return TRUE;
+}
+
+gboolean panel_mainmenu_aux_timeout( guint timeout )
+{
+ g_debug( "aux pressed for %d", timeout );
+ return FALSE;
+}
+
+
+gboolean panel_mainmenu_power_timeout( guint timeout )
+{
+ g_debug( "power pressed for %d", timeout );
+ return FALSE;
+}
+
Property changes on:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-04-07 22:06:25 UTC (rev 1704)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-04-07 23:14:23 UTC (rev 1705)
@@ -0,0 +1,13 @@
+#ifndef BUTTONACTIONS_H
+#define BUTTONACTIONS_H
+
+#include <glib.h>
+
+gboolean panel_mainmenu_input_prepare( GSource* source, gint* timeout );
+gboolean panel_mainmenu_input_check( GSource* source );
+gboolean panel_mainmenu_input_dispatch( GSource* source, GSourceFunc callback,
gpointer data );
+
+gboolean panel_mainmenu_aux_timeout( guint timeout );
+gboolean panel_mainmenu_power_timeout( guint timeout );
+
+#endif
Property changes on:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-04-07 22:06:25 UTC (rev 1704)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-04-07 23:14:23 UTC (rev 1705)
@@ -17,6 +17,11 @@
* Current Version: $Rev$ ($Date$) [$Author$]
*/
+#include "buttonactions.h"
+#include "stylusmenu.h"
+#include "mokodesktop.h"
+#include "mokodesktop_item.h"
+
#include <libmokoui/moko-panel-applet.h>
#include <gtk/gtk.h>
@@ -26,9 +31,6 @@
#include <X11/Xatom.h>
#include <unistd.h>
-#include "stylusmenu.h"
-#include "mokodesktop.h"
-#include "mokodesktop_item.h"
static GtkWidget *sm = NULL;
@@ -80,17 +82,10 @@
sm = gtk_menu_new ();
gtk_widget_show (sm);
- MokoDesktopItem *top_item = NULL;
- int ret;
-
- top_item = mokodesktop_item_new_with_params ("Home",
- NULL,
- NULL,
- ITEM_TYPE_ROOT );
-
- ret = mokodesktop_init(top_item, ITEM_TYPE_CNT);
-
+ MokoDesktopItem *top_item = mokodesktop_item_new_with_params ("Home",
NULL, NULL, ITEM_TYPE_ROOT );
+ int ret = mokodesktop_init(top_item, ITEM_TYPE_CNT);
moko_stylus_menu_build(GTK_MENU(sm), top_item);
+ panel_mainmenu_install_watcher();
return GTK_WIDGET(applet);
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-08 01:15:27 +0200 (Sun, 08 Apr 2007)
New Revision: 1706
Modified:
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
Log:
qmake: define some more vars
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-07
23:14:23 UTC (rev 1705)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-07
23:15:27 UTC (rev 1706)
@@ -2,7 +2,6 @@
# Don't use this if your nickname is not mickeyl
#
-
CONFIG = debug warn_on link_pkgconfig console $$MOKOCONFIG
PREFIX = /usr/local
@@ -98,6 +97,6 @@
DEFINES += G_LOG_DOMAIN=\\\"$$TARGET\\\"
DEFINES += GETTEXT_PACKAGE=\\\"$$TARGET\\\"
-DEFINES += LC_ALL
-DEFINES += LOCALEDIR
+DEFINES += LC_ALL=\\\"C\\\"
+DEFINES += LOCALEDIR=\\\"/tmp/$$TARGET\\\"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-08 01:15:48 +0200 (Sun, 08 Apr 2007)
New Revision: 1707
Modified:
trunk/src/target/OM-2007/openmoko-libs/TODO
Log:
openmoko-libs: remove completed stuff from TODO
Modified: trunk/src/target/OM-2007/openmoko-libs/TODO
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/TODO 2007-04-07 23:15:27 UTC (rev
1706)
+++ trunk/src/target/OM-2007/openmoko-libs/TODO 2007-04-07 23:15:48 UTC (rev
1707)
@@ -1,8 +1,5 @@
(Ordered by Priority)
-- Finish Finger Application Framework
-- Implement Popup and FullScreen-Dialogs for Stylus Application Framework
-- Add Theming for Dialogs
- Add MokoBanner (see HildonBanner)
- Start Footer Application and implement Status Bar Interface
- Add Status Bar Interface to MokoApplication
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
