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. r2004 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r2005 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r2006 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
4. r2007 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
5. r2008 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
6. r2009 - in trunk/oe: conf/distro/include packages
packages/settings-daemon packages/settings-daemon/files
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-18 04:14:04 +0200 (Fri, 18 May 2007)
New Revision: 2004
Modified:
trunk/src/target/kernel/patches/gta01-pcf50606.patch
Log:
fix initialization order: first register input device, then enable interrupt.
Otherwise the interrupt might come in too early and cause kernel oops. (Matt
Hsu)
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-18
00:02:09 UTC (rev 2003)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-18
02:14:04 UTC (rev 2004)
@@ -4,7 +4,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1925 @@
+@@ -0,0 +1,1928 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
+ * (C) 2006 by OpenMoko, Inc.
@@ -1620,6 +1620,23 @@
+
+ /* create virtual charger 'device' */
+
++ /* input device registration */
++ data->input_dev = input_allocate_device();
++ if (!data->input_dev)
++ goto exit_sysfs;
++
++ data->input_dev->name = "FIC Neo1973 PMU events";
++ data->input_dev->phys = "FIXME";
++ data->input_dev->id.bustype = BUS_I2C;
++ data->input_dev->cdev.dev = &new_client->dev;
++
++ data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
++ set_bit(KEY_POWER, data->input_dev->keybit);
++ set_bit(KEY_POWER2, data->input_dev->keybit);
++ set_bit(KEY_BATTERY, data->input_dev->keybit);
++
++ input_register_device(data->input_dev);
++
+ /* register power off handler with core power management */
+ pm_power_off = &pcf50606_go_standby;
+
@@ -1631,7 +1648,7 @@
+ err = request_irq(irq, pcf50606_irq, SA_INTERRUPT,
+ "pcf50606", data);
+ if (err < 0)
-+ goto exit_sysfs;
++ goto exit_input;
+
+ set_irq_type(irq, IRQT_FALLING);
+
@@ -1678,22 +1695,6 @@
+ backlight_update_status(data->backlight);
+ }
+
-+ data->input_dev = input_allocate_device();
-+ if (!data->input_dev)
-+ goto exit_pwm;
-+
-+ data->input_dev->name = "FIC Neo1973 PMU events";
-+ data->input_dev->phys = "FIXME";
-+ data->input_dev->id.bustype = BUS_I2C;
-+ data->input_dev->cdev.dev = &new_client->dev;
-+
-+ data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+ set_bit(KEY_POWER, data->input_dev->keybit);
-+ set_bit(KEY_POWER2, data->input_dev->keybit);
-+ set_bit(KEY_BATTERY, data->input_dev->keybit);
-+
-+ input_register_device(data->input_dev);
-+
+ apm_get_power_status = pcf50606_get_power_status;
+
+#ifdef CONFIG_MACH_NEO1973_GTA01
@@ -1730,8 +1731,10 @@
+ rtc_device_unregister(pcf50606_global->rtc);
+exit_irq:
+ free_irq(pcf50606_global->irq, pcf50606_global);
++exit_input:
++ pm_power_off = NULL;
++ input_unregister_device(pcf->input_dev);
+exit_sysfs:
-+ pm_power_off = NULL;
+ sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
+exit_detach:
+ i2c_detach_client(new_client);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-18 04:28:27 +0200 (Fri, 18 May 2007)
New Revision: 2005
Removed:
trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch
Log:
this patch is now in u-boot mainline
Deleted: trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch 2007-05-18
02:14:04 UTC (rev 2004)
+++ trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch 2007-05-18
02:28:27 UTC (rev 2005)
@@ -1,12 +0,0 @@
-Index: u-boot/common/cmd_mfsl.c
-===================================================================
---- u-boot.orig/common/cmd_mfsl.c
-+++ u-boot/common/cmd_mfsl.c
-@@ -29,7 +29,6 @@
- #include <common.h>
- #include <config.h>
- #include <command.h>
--#include <asm/asm.h>
-
- #if (CONFIG_COMMANDS & CFG_CMD_MFSL)
-
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-18 05:16:16 +0200 (Fri, 18 May 2007)
New Revision: 2006
Modified:
trunk/src/target/kernel/patches/gta01-pcf50606.patch
Log:
* fix typo resulting in compile failure
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-18
02:28:27 UTC (rev 2005)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-18
03:16:16 UTC (rev 2006)
@@ -1733,7 +1733,7 @@
+ free_irq(pcf50606_global->irq, pcf50606_global);
+exit_input:
+ pm_power_off = NULL;
-+ input_unregister_device(pcf->input_dev);
++ input_unregister_device(pcf50606_global->input_dev);
+exit_sysfs:
+ sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
+exit_detach:
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 11:09:30 +0200 (Fri, 18 May 2007)
New Revision: 2007
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
Log:
* libmokoui/moko-message-dialog.c: (moko_message_dialog_init): Add
padding and center align the message text
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 03:16:16 UTC
(rev 2006)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 09:09:30 UTC
(rev 2007)
@@ -1,3 +1,8 @@
+2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-message-dialog.c: (moko_message_dialog_init): Add
+ padding and center align the message text
+
2007-05-17 Thomas Wood <[EMAIL PROTECTED]>
* libmokogsmd/moko-gsmd-connection.h: Add MokoGsmdConnectionProgress
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-05-18 03:16:16 UTC (rev 2006)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-05-18 09:09:30 UTC (rev 2007)
@@ -287,21 +287,20 @@
gtk_misc_set_padding (GTK_MISC (label), 12, 12);
- gtk_widget_set_size_request (GTK_WIDGET (label), 300, -1);
+ gtk_box_pack_end (GTK_BOX (vbox), label, TRUE, TRUE, 6);
- gtk_box_pack_end (GTK_BOX (vbox), label, TRUE, FALSE, 6);
-
gtk_widget_show_all (GTK_WIDGET (GTK_DIALOG (self)->vbox));
gtk_window_set_modal (GTK_WINDOW (self), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), image_alignment, TRUE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), image_alignment, TRUE, TRUE, 0);
gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
gtk_widget_set_size_request (GTK_WIDGET (self), 480, 560);
gtk_window_set_decorated (GTK_WINDOW (self), FALSE);
gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (self), 85);
/* Indicate that we want to paint this ourselves */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 11:13:46 +0200 (Fri, 18 May 2007)
New Revision: 2008
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
Log:
openmoko-dialer: Replace Close and Hide menu items with a single Close item
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-18 09:09:30 UTC (rev 2007)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-18 09:13:46 UTC (rev 2008)
@@ -255,15 +255,11 @@
GtkWidget *window = moko_finger_window_new ();
GtkMenu *appmenu = GTK_MENU (gtk_menu_new ());
- GtkWidget *closeitem = gtk_menu_item_new_with_label ("Close");
- g_signal_connect (G_OBJECT (closeitem), "activate",
- G_CALLBACK (gtk_main_quit), p_dialer_data);
- gtk_menu_shell_append (GTK_MENU_SHELL (appmenu), closeitem);
GtkMenuItem *hideitem =
- GTK_MENU_ITEM (gtk_menu_item_new_with_label ("Hide"));
+ GTK_MENU_ITEM (gtk_menu_item_new_with_label ("Close"));
g_signal_connect_swapped (G_OBJECT (hideitem), "activate",
- G_CALLBACK (gtk_widget_hide),
p_dialer_data->window_dialer);
+ G_CALLBACK (gtk_widget_hide), window);
gtk_menu_shell_append (GTK_MENU_SHELL (appmenu), GTK_WIDGET (hideitem));
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-05-18 11:28:38 +0200 (Fri, 18 May 2007)
New Revision: 2009
Added:
trunk/oe/packages/settings-daemon/
trunk/oe/packages/settings-daemon/files/
trunk/oe/packages/settings-daemon/files/70settings-daemon
trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
trunk/oe/packages/settings-daemon/settings-daemon_svn.bb
Modified:
trunk/oe/conf/distro/include/sane-srcdates.inc
Log:
oe: add settings-daemon and set preferred srcdate for it
Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc 2007-05-18 09:13:46 UTC
(rev 2008)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc 2007-05-18 09:28:38 UTC
(rev 2009)
@@ -33,6 +33,7 @@
SRCDATE_matchbox-stroke ?= "20060612"
SRCDATE_matchbox-themes-extra ?= "20060612"
SRCDATE_matchbox-wm ?= "20060612"
+SRCDATE_settings-daemon = "now"
SRCDATE_libmatchbox ?= "20060612"
SRCDATE_libfakekey ?= "20051101"
SRCDATE_zaurusd ?= "20060628"
Added: trunk/oe/packages/settings-daemon/files/70settings-daemon
===================================================================
--- trunk/oe/packages/settings-daemon/files/70settings-daemon 2007-05-18
09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/70settings-daemon 2007-05-18
09:28:38 UTC (rev 2009)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/settings-daemon &
Property changes on: trunk/oe/packages/settings-daemon/files/70settings-daemon
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
===================================================================
--- trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,76 @@
+Index: settings-daemon.c
+===================================================================
+--- settings-daemon.c (revision 1490)
++++ settings-daemon.c (working copy)
+@@ -130,8 +130,8 @@
+ * translations, below. The more specific the paths, the better.
+ */
+ static const char* toplevels[] = {
+- "/desktop/poky/interface",
+- "/desktop/poky/peripherals",
++ "/desktop/openmoko/interface",
++ "/desktop/openmoko/peripherals",
+ #ifdef HAVE_XFT2
+ FONT_RENDER_DIR
+ #endif
+@@ -144,42 +144,42 @@
+ /* TODO: include the Xft settings here for neatness */
+ static const TranslationEntry translations [] = {
+ /* Hardware settings */
+- { "/desktop/poky/peripherals/mouse/double_click", "Net/DoubleClickTime",
++ { "/desktop/openmoko/peripherals/mouse/double_click", "Net/DoubleClickTime",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/peripherals/mouse/drag_threshold", "Net/DndDragThreshold",
++ { "/desktop/openmoko/peripherals/mouse/drag_threshold",
"Net/DndDragThreshold",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/peripherals/stylus_mode", "Gtk/StylusMode",
++ { "/desktop/openmoko/peripherals/stylus_mode", "Gtk/StylusMode",
+ GCONF_VALUE_BOOL, translate_bool_int },
+ /* Appearance */
+- { "/desktop/poky/interface/gtk-color-palette", "Gtk/ColorPalette",
++ { "/desktop/openmoko/interface/gtk-color-palette", "Gtk/ColorPalette",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/font_name", "Gtk/FontName",
++ { "/desktop/openmoko/interface/font_name", "Gtk/FontName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk_key_theme", "Gtk/KeyThemeName",
++ { "/desktop/openmoko/interface/gtk_key_theme", "Gtk/KeyThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/toolbar_style", "Gtk/ToolbarStyle",
++ { "/desktop/openmoko/interface/toolbar_style", "Gtk/ToolbarStyle",
+ GCONF_VALUE_STRING, translate_string_string_toolbar },
+- { "/desktop/poky/interface/toolbar_icon_size", "Gtk/ToolbarIconSize",
++ { "/desktop/openmoko/interface/toolbar_icon_size", "Gtk/ToolbarIconSize",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/can_change_accels", "Gtk/CanChangeAccels",
++ { "/desktop/openmoko/interface/can_change_accels", "Gtk/CanChangeAccels",
+ GCONF_VALUE_BOOL, translate_bool_int },
+- { "/desktop/poky/interface/cursor_blink", "Net/CursorBlink",
++ { "/desktop/openmoko/interface/cursor_blink", "Net/CursorBlink",
+ GCONF_VALUE_BOOL,translate_bool_int },
+- { "/desktop/poky/interface/cursor_blink_time", "Net/CursorBlinkTime",
++ { "/desktop/openmoko/interface/cursor_blink_time", "Net/CursorBlinkTime",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/interface/theme", "Net/ThemeName",
++ { "/desktop/openmoko/interface/theme", "Net/ThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle",
++ { "/desktop/openmoko/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk-im-status-style", "Gtk/IMStatusStyle",
++ { "/desktop/openmoko/interface/gtk-im-status-style", "Gtk/IMStatusStyle",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/icon_theme", "Net/IconThemeName",
++ { "/desktop/openmoko/interface/icon_theme", "Net/IconThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/file_chooser_backend", "Gtk/FileChooserBackend",
++ { "/desktop/openmoko/interface/file_chooser_backend",
"Gtk/FileChooserBackend",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/menus_have_icons", "Gtk/MenuImages",
++ { "/desktop/openmoko/interface/menus_have_icons", "Gtk/MenuImages",
+ GCONF_VALUE_BOOL, translate_bool_int },
+- { "/desktop/poky/interface/touchscreen", "Gtk/TouchscreenMode",
++ { "/desktop/openmoko/interface/touchscreen", "Gtk/TouchscreenMode",
+ GCONF_VALUE_BOOL, translate_bool_int },
+ };
+
Added: trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
===================================================================
--- trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,177 @@
+Index: settings-daemon/settings-daemon.schemas
+===================================================================
+--- settings-daemon/settings-daemon.schemas (wersja 1544)
++++ settings-daemon/settings-daemon.schemas (kopia robocza)
+@@ -3,11 +3,11 @@
+ <schemalist>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/theme</key>
+- <applyto>/desktop/poky/interface/theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/theme</key>
++ <applyto>/desktop/openmoko/interface/theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+- <default>Clearlooks</default>
++ <default>openmoko-standard</default>
+ <locale name="C">
+ <short>Desktop theme</short>
+ <long>The theme name for Matchbox and GTK+ to use.</long>
+@@ -15,8 +15,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-color-palette</key>
+- <applyto>/desktop/poky/interface/gtk-color-palette</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-color-palette</key>
++ <applyto>/desktop/openmoko/interface/gtk-color-palette</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -26,8 +26,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/font_name</key>
+- <applyto>/desktop/poky/interface/font_name</applyto>
++ <key>/schemas/desktop/openmoko/interface/font_name</key>
++ <applyto>/desktop/openmoko/interface/font_name</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>Sans 8</default>
+@@ -38,8 +38,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk_key_theme</key>
+- <applyto>/desktop/poky/interface/gtk_key_theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk_key_theme</key>
++ <applyto>/desktop/openmoko/interface/gtk_key_theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>Default</default>
+@@ -50,8 +50,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/toolbar_style</key>
+- <applyto>/desktop/poky/interface/toolbar_style</applyto>
++ <key>/schemas/desktop/openmoko/interface/toolbar_style</key>
++ <applyto>/desktop/openmoko/interface/toolbar_style</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>icons</default>
+@@ -63,8 +63,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/toolbar_icon_size</key>
+- <applyto>/desktop/poky/interface/toolbar_icon_size</applyto>
++ <key>/schemas/desktop/openmoko/interface/toolbar_icon_size</key>
++ <applyto>/desktop/openmoko/interface/toolbar_icon_size</applyto>
+ <type>int</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -74,8 +74,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/can_change_accels</key>
+- <applyto>/desktop/poky/interface/can_change_accels</applyto>
++ <key>/schemas/desktop/openmoko/interface/can_change_accels</key>
++ <applyto>/desktop/openmoko/interface/can_change_accels</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>false</default>
+@@ -87,8 +87,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/cursor_blink</key>
+- <applyto>/desktop/poky/interface/cursor_blink</applyto>
++ <key>/schemas/desktop/openmoko/interface/cursor_blink</key>
++ <applyto>/desktop/openmoko/interface/cursor_blink</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>true</default>
+@@ -99,8 +99,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/cursor_blink_time</key>
+- <applyto>/desktop/poky/interface/cursor_blink_time</applyto>
++ <key>/schemas/desktop/openmoko/interface/cursor_blink_time</key>
++ <applyto>/desktop/openmoko/interface/cursor_blink_time</applyto>
+ <type>int</type>
+ <owner>settings-daemon</owner>
+ <default>1200</default>
+@@ -111,11 +111,11 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/icon_theme</key>
+- <applyto>/desktop/poky/interface/icon_theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/icon_theme</key>
++ <applyto>/desktop/openmoko/interface/icon_theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+- <default>Sato</default>
++ <default>openmoko-standard</default>
+ <locale name="C">
+ <short>Icon Theme</short>
+ <long>The name of the icon theme to use in applications</long>
+@@ -123,8 +123,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/file_chooser_backend</key>
+- <applyto>/desktop/poky/interface/file_chooser_backend</applyto>
++ <key>/schemas/desktop/openmoko/interface/file_chooser_backend</key>
++ <applyto>/desktop/openmoko/interface/file_chooser_backend</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -136,8 +136,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/menus_have_icons</key>
+- <applyto>/desktop/poky/interface/menus_have_icons</applyto>
++ <key>/schemas/desktop/openmoko/interface/menus_have_icons</key>
++ <applyto>/desktop/openmoko/interface/menus_have_icons</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>false</default>
+@@ -148,8 +148,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/touchscreen</key>
+- <applyto>/desktop/poky/interface/touchscreen</applyto>
++ <key>/schemas/desktop/openmoko/interface/touchscreen</key>
++ <applyto>/desktop/openmoko/interface/touchscreen</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>true</default>
+@@ -162,8 +162,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-im-preedit-style</key>
+- <applyto>/desktop/poky/interface/gtk-im-preedit-style</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-im-preedit-style</key>
++ <applyto>/desktop/openmoko/interface/gtk-im-preedit-style</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default>callback</default>
+@@ -174,8 +174,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-im-status-style</key>
+- <applyto>/desktop/poky/interface/gtk-im-status-style</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-im-status-style</key>
++ <applyto>/desktop/openmoko/interface/gtk-im-status-style</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default>callback</default>
Added: trunk/oe/packages/settings-daemon/settings-daemon_svn.bb
===================================================================
--- trunk/oe/packages/settings-daemon/settings-daemon_svn.bb 2007-05-18
09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/settings-daemon_svn.bb 2007-05-18
09:28:38 UTC (rev 2009)
@@ -0,0 +1,27 @@
+DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
+LICENSE = "GPL"
+DEPENDS = "gconf xst glib-2.0"
+SECTION = "x11"
+PR = "r2"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+ file://70settings-daemon "
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig gettext
+
+do_configure_append() {
+ if [ "${DISTRO}" = "openmoko" ]; then
+ sed -i -e "s,poky,openmoko," settings-daemon.c
+ sed -i -e "s,poky,openmoko," settings-daemon.schemas
+ sed -i -e "s,Clearlooks,openmoko-standard,"
settings-daemon.schemas
+ fi
+}
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/70settings-daemon
${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+FILES_${PN} = "${bindir}/* ${sysconfdir}"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
