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. r2670 - in trunk/src/target/OM-2007.2/daemons/neod: . src
([EMAIL PROTECTED])
2. r2671 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
3. r2672 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
4. r2673 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0
([EMAIL PROTECTED])
5. r2674 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
6. r2675 - in trunk/src/target/OM-2007.2: . misc
misc/openmoko-today2-folders ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-08-09 15:03:28 +0200 (Thu, 09 Aug 2007)
New Revision: 2670
Modified:
trunk/src/target/OM-2007.2/daemons/neod/configure.ac
trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
Log:
neod: save/load power management values via gconf, enable changing PM profile
via power-button-hold menu
Modified: trunk/src/target/OM-2007.2/daemons/neod/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/configure.ac 2007-08-09
12:44:25 UTC (rev 2669)
+++ trunk/src/target/OM-2007.2/daemons/neod/configure.ac 2007-08-09
13:03:28 UTC (rev 2670)
@@ -5,8 +5,6 @@
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
-LIBGTK_VERSION=2.6.0
-
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_CC_STDC
@@ -20,14 +18,9 @@
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $LIBGTK_VERSION)
-PKG_CHECK_MODULES(PULSE, libpulse)
+PKG_CHECK_MODULES(NEOD, gtk+-2.0 gconf-2.0 libpulse)
-CFLAGS=$GTK_CFLAGS
-AC_CHECK_DECLS([g_date_set_time_t],
- [have_date=yes], [have_date=no], [#include <glib.h>])
-AM_CONDITIONAL(HAVE_GDATE_TIME_T, test "x$have_date" = "xyes")
-CFLAGS=$old_cflags
+CFLAGS=$NEOD_CFLAGS
AC_OUTPUT([
Makefile
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-08-09
12:44:25 UTC (rev 2669)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-08-09
13:03:28 UTC (rev 2670)
@@ -4,7 +4,7 @@
-DNEOD_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DDATADIR=\""$(datadir)"\" -D_GNU_SOURCE
-AM_CFLAGS = -Wall -pedantic -std=c99 @GTK_CFLAGS@ @PULSE_CFLAGS@
+AM_CFLAGS = -Wall -pedantic -std=c99 @NEOD_CFLAGS@
bin_PROGRAMS = neod
@@ -12,7 +12,7 @@
buttonactions.c \
neod-main.c
-neod_LDADD = @GTK_LIBS@ @PULSE_LIBS@
+neod_LDADD = @NEOD_LIBS@
MAINTAINERCLEANFILES = config.h.in Makefile.in
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
12:44:25 UTC (rev 2669)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
13:03:28 UTC (rev 2670)
@@ -14,9 +14,12 @@
*/
#include "buttonactions.h"
+#include <gconf/gconf-client.h>
+
#include <gtk/gtklabel.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkcheckmenuitem.h>
#include <gdk/gdkx.h>
@@ -66,6 +69,17 @@
GtkWidget* aux_menu = 0;
GtkWidget* power_menu = 0;
+GConfClient* gconfc = 0;
+
+enum PowerManagementMode
+{
+ FULL = 0,
+ DIM_ONLY = 1,
+ NONE = 2,
+};
+
+int pm_value = 0;
+
typedef enum _PowerState
{
NORMAL,
@@ -191,10 +205,25 @@
}
g_source_attach( button_watcher, NULL );
+ // get PM profile setting from gconf and listen for changes
+ gconfc = gconf_client_get_default();
+ if (!gconfc)
+ {
+ g_error( "can't get connection to gconfd" );
+ return FALSE;
+ }
+ GError* error = 0;
+ pm_value = gconf_client_get_int( gconfc,
"/desktop/openmoko/neod/power_management", &error );
+ if ( error ) g_debug( "gconf error: %s", error->message );
+ gconf_client_add_dir( gconfc, "/desktop/openmoko/neod",
GCONF_CLIENT_PRELOAD_NONE, &error );
+ if ( error ) g_debug( "gconf error: %s", error->message );
+ gconf_client_notify_add( gconfc,
"/desktop/openmoko/neod/power_management", (GConfClientNotifyFunc)
neod_buttonactions_gconf_cb, NULL, NULL, &error );
+ if ( error ) g_debug( "gconf error: %s", error->message );
+
+ neod_buttonactions_powersave_reset();
return TRUE;
}
-
gboolean neod_buttonactions_input_prepare( GSource* source, gint* timeout )
{
return FALSE;
@@ -348,17 +377,17 @@
void neod_buttonactions_popup_selected_fullPM( GtkMenuItem* menu, gpointer
user_data )
{
- //FIXME set PM to full
+ gconf_client_set_int( gconfc, "/desktop/openmoko/neod/power_management",
FULL, NULL );
}
void neod_buttonactions_popup_selected_dimOnly( GtkMenuItem* menu, gpointer
user_data )
{
- //FIXME set PM to dim-only
+ gconf_client_set_int( gconfc, "/desktop/openmoko/neod/power_management",
DIM_ONLY, NULL );
}
void neod_buttonactions_popup_selected_noPM( GtkMenuItem* menu, gpointer
user_data )
{
- //FIXME set PM to none
+ gconf_client_set_int( gconfc, "/desktop/openmoko/neod/power_management",
NONE, NULL );
}
void neod_buttonactions_popup_selected_lock( GtkMenuItem* menu, gpointer
user_data )
@@ -390,6 +419,18 @@
system( "/sbin/poweroff");
}
+void neod_buttonactions_gconf_cb( GConfClient *client, guint cnxn_id,
GConfEntry *entry, gpointer data )
+{
+ g_debug( "gconf callback" );
+ pm_value = gconf_client_get_int( client,
"/desktop/openmoko/neod/power_management", NULL );
+ if ( pm_value < 0 || pm_value > 2 ) pm_value = 0;
+ neod_buttonactions_powersave_reset();
+ neod_buttonactions_set_display( 100 );
+ gtk_widget_destroy( power_menu );
+ //gtk_widget_unref( power_menu );
+ power_menu = 0;
+}
+
gboolean neod_buttonactions_power_timeout( guint timeout )
{
g_debug( "power pressed for %d", timeout );
@@ -444,12 +485,18 @@
// TODO build profile list dynamically from database
GtkWidget* profile = 0;
profile = gtk_check_menu_item_new_with_label( "Full PM" );
+ gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
+ gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == FULL );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_fullPM), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profile );
profile = gtk_check_menu_item_new_with_label( "Dim Only" );
+ gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
+ gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == DIM_ONLY );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_dimOnly), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profile );
profile = gtk_check_menu_item_new_with_label( "No PM" );
+ gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
+ gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == NONE );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_noPM), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profile );
@@ -480,6 +527,9 @@
void neod_buttonactions_powersave_reset()
{
+ if ( pm_value == NONE )
+ return;
+
g_debug( "mainmenu powersave reset" );
if ( powersave_timer1 != -1 )
g_source_remove( powersave_timer1 );
@@ -529,6 +579,8 @@
gboolean neod_buttonactions_powersave_timeout3( guint timeout )
{
+ if ( pm_value != FULL )
+ return;
g_debug( "mainmenu powersave timeout 3" );
//FIXME talk to neod
power_state = SUSPEND;
@@ -587,3 +639,4 @@
);
}
+
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-08-09
12:44:25 UTC (rev 2669)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-08-09
13:03:28 UTC (rev 2670)
@@ -16,13 +16,14 @@
#define BUTTONACTIONS_H
#include <glib.h>
+#include <gconf/gconf-client.h>
#include <gdk/gdk.h>
gboolean neod_buttonactions_input_prepare( GSource* source, gint* timeout );
gboolean neod_buttonactions_input_check( GSource* source );
gboolean neod_buttonactions_input_dispatch( GSource* source, GSourceFunc
callback, gpointer data );
-gboolean neod_buttonactions_touchscreen_cb( GIOChannel *source, GIOCondition
condition, gpointer data );
+void neod_buttonactions_gconf_cb( GConfClient *client, guint cnxn_id,
GConfEntry *entry, gpointer data );
gboolean neod_buttonactions_aux_timeout( guint timeout );
gboolean neod_buttonactions_power_timeout( guint timeout );
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-09 17:45:24 +0200 (Thu, 09 Aug 2007)
New Revision: 2671
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: add runtime debug stuff
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
13:03:28 UTC (rev 2670)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
15:45:24 UTC (rev 2671)
@@ -247,10 +247,11 @@
{
struct input_event event;
int size = read( input_fd[i].fd, &event, sizeof( struct
input_event ) );
-#ifdef DEBUG_THIS_FILE
- g_debug( "read %d bytes from fd %d", size, input_fd[i].fd );
- g_debug( "input event = ( %0x, %0x, %0x )", event.type,
event.code, event.value );
-#endif
+ if ( getenv( "MOKO_DEBUG" ) )
+ {
+ g_debug( "read %d bytes from fd %d", size, input_fd[i].fd );
+ g_debug( "input event = ( %0x, %0x, %0x )", event.type,
event.code, event.value );
+ }
if ( event.type == 1 && event.code == AUX_BUTTON_KEYCODE )
{
if ( event.value == 1 ) /* pressed */
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-09 18:04:37 +0200 (Thu, 09 Aug 2007)
New Revision: 2672
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: fix (hopefully) off-by-one error
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
15:45:24 UTC (rev 2671)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
16:04:37 UTC (rev 2672)
@@ -232,7 +232,7 @@
gboolean neod_buttonactions_input_check( GSource* source )
{
- for ( int i = 0; i < max_input_fd; ++i )
+ for ( int i = 0; i <= max_input_fd; ++i )
if ( input_fd[i].revents & G_IO_IN )
return TRUE;
return FALSE;
@@ -241,7 +241,7 @@
gboolean neod_buttonactions_input_dispatch( GSource* source, GSourceFunc
callback, gpointer data )
{
- for ( int i = 0; i < max_input_fd; ++i )
+ for ( int i = 0; i <= max_input_fd; ++i )
{
if ( input_fd[i].revents & G_IO_IN )
{
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-09 20:47:32 +0200 (Thu, 09 Aug 2007)
New Revision: 2673
Added:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-panel-plugins
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
Log:
openmoko theming: make clock visible (again)
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
2007-08-09 16:04:37 UTC (rev 2672)
+++ trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2007-08-09 18:47:32 UTC (rev 2673)
@@ -133,3 +133,5 @@
#include "mokomessagedialog"
include "openmoko-calculator"
+
+include "openmoko-panel-plugins"
Added:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-panel-plugins
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-panel-plugins
2007-08-09 16:04:37 UTC (rev 2672)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-panel-plugins
2007-08-09 18:47:32 UTC (rev 2673)
@@ -0,0 +1,10 @@
+style "openmoko-panel-clock" {
+ fg[NORMAL] = "#e2e2e2"
+ fg[PRELIGHT] = "#e2e2e2"
+ fg[ACTIVE] = "#e2e2e2"
+}
+widget "*.MatchboxPanelClock" style "openmoko-panel-clock"
+
+# add styling for other panel plugins here...
+
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-09 21:03:09 +0200 (Thu, 09 Aug 2007)
New Revision: 2674
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: fix bug that prevented stopping PM
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
18:47:32 UTC (rev 2673)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-09
19:03:09 UTC (rev 2674)
@@ -528,9 +528,6 @@
void neod_buttonactions_powersave_reset()
{
- if ( pm_value == NONE )
- return;
-
g_debug( "mainmenu powersave reset" );
if ( powersave_timer1 != -1 )
g_source_remove( powersave_timer1 );
@@ -539,6 +536,9 @@
if ( powersave_timer3 != -1 )
g_source_remove( powersave_timer3 );
+ if ( pm_value == NONE )
+ return;
+
//TODO load this from preferences
powersave_timer1 = g_timeout_add( 10 * 1000, (GSourceFunc)
neod_buttonactions_powersave_timeout1, (gpointer)1 );
powersave_timer2 = g_timeout_add( 20 * 1000, (GSourceFunc)
neod_buttonactions_powersave_timeout2, (gpointer)1 );
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-08-09 22:29:21 +0200 (Thu, 09 Aug 2007)
New Revision: 2675
Added:
trunk/src/target/OM-2007.2/misc/
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/AUTHORS
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/All.directory
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Applications.directory
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/COPYING
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Games.directory
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/NEWS
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/README
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Root.order
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Settings.directory
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Utilities.directory
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/configure.ac
Log:
2007-08-09 Stefan Schmidt <[EMAIL PROTECTED]>
Initial import from matchbox desktop-folders.
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/AUTHORS
===================================================================
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/All.directory
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/All.directory
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/All.directory
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=All
+Icon=mbfolder.png
+Type=Directory
+Match=meta-all
Added:
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Applications.directory
===================================================================
---
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Applications.directory
2007-08-09 19:03:09 UTC (rev 2674)
+++
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Applications.directory
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Applications
+Comment=Applications
+Icon=gnome-applications.png
+Type=Directory
+Match=AudioVideo;Audio;Video;Graphics;Network;Office;meta-fallback;
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/COPYING
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/COPYING
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/COPYING
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,4 @@
+2007-08-09 Stefan Schmidt <[EMAIL PROTECTED]>
+
+ Initial import from matchbox desktop-folders.
+
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Games.directory
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Games.directory
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Games.directory
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Games
+Name[de]=Spiele
+Comment=Games of all kind
+Comment[de]=Spiele aller Art
+Icon=mbfolder.png
+Type=Directory
+Match=Game
+
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,8 @@
+folderdir = $(datadir)/today/vfolders
+dist_folder_DATA = \
+ Root.order \
+ All.directory \
+ Applications.directory \
+ Games.directory \
+ Settings.directory \
+ Utilities.directory
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/NEWS
===================================================================
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/README
===================================================================
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Root.order
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Root.order
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Root.order
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,6 @@
+PIM
+Applications
+Utilities
+Games
+Settings
+All
Added:
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Settings.directory
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Settings.directory
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Settings.directory
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Settings
+Name[de]=Einstellungen
+Comment=Settings for your handheld computer
+Comment[de]=Einstellungen für Ihren Handheld-Computer
+Icon=mbfolder.png
+Type=Directory
+Match=Settings
Added:
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Utilities.directory
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Utilities.directory
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Utilities.directory
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Utilities
+Name[de]=Einstellungen
+Comment=Various utilities
+Comment[de]=Verschiedene Hilfsprogramme
+Icon=mbfolder.png
+Type=Directory
+Match=Utility;System;Development;
Added: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/configure.ac
2007-08-09 19:03:09 UTC (rev 2674)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/configure.ac
2007-08-09 20:29:21 UTC (rev 2675)
@@ -0,0 +1,10 @@
+AC_INIT(Root.order)
+AM_INIT_AUTOMAKE(openmoko-today2-folders, 0.1)
+AM_CONFIG_HEADER(config.h)
+
+# Checks for programs.
+AC_PROG_INSTALL
+
+AC_OUTPUT([
+Makefile
+])
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
