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. r1884 - in trunk/oe/packages/linux: . linux-gta01
([EMAIL PROTECTED])
2. r1885 - trunk/oe/packages/linux/linux-gta01
([EMAIL PROTECTED])
3. r1886 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
4. r1887 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
5. r1888 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-01 04:31:10 +0200 (Tue, 01 May 2007)
New Revision: 1884
Modified:
trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
trunk/oe/packages/linux/linux-gta01_2.6.21.1.bb
Log:
bump mokoversion of 2.6.21 kernel to moko10 to reflect major bugfixes
Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
2007-05-01 02:29:39 UTC (rev 1883)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
2007-05-01 02:31:10 UTC (rev 1884)
@@ -33,7 +33,7 @@
#
# General setup
#
-CONFIG_LOCALVERSION="-moko8"
+CONFIG_LOCALVERSION="-moko10"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
Modified: trunk/oe/packages/linux/linux-gta01_2.6.21.1.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.21.1.bb 2007-05-01 02:29:39 UTC
(rev 1883)
+++ trunk/oe/packages/linux/linux-gta01_2.6.21.1.bb 2007-05-01 02:31:10 UTC
(rev 1884)
@@ -2,7 +2,7 @@
SRC_URI +=
"svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
-MOKOR = "moko9"
+MOKOR = "moko10"
PR = "${MOKOR}-r0"
VANILLA_VERSION = "2.6.21.1"
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-01 04:34:03 +0200 (Tue, 01 May 2007)
New Revision: 1885
Modified:
trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
Log:
new defconfig for moko10 version
Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
2007-05-01 02:31:10 UTC (rev 1884)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
2007-05-01 02:34:03 UTC (rev 1885)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21
-# Sun Apr 29 05:01:00 2007
+# Tue May 1 10:13:25 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -33,7 +33,7 @@
#
# General setup
#
-CONFIG_LOCALVERSION="-moko10"
+CONFIG_LOCALVERSION="-moko8"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -167,7 +167,7 @@
# CONFIG_MACH_AML_M5900 is not set
# CONFIG_MACH_VR1000 is not set
CONFIG_MACH_QT2410=y
-CONFIG_MACH_GTA01=y
+CONFIG_MACH_NEO1973_GTA01=y
#
# S3C2412 Machines
@@ -1257,10 +1257,24 @@
#
#
+# SoC Audio for the Freescale i.MX
+#
+
+#
# SoC Audio for the Intel PXA2xx
#
#
+# SoC Audio for the Samsung S3C24XX
+#
+CONFIG_SND_S3C24XX_SOC=m
+CONFIG_SND_S3C24XX_SOC_I2S=m
+CONFIG_SND_S3C24XX_SOC_SMDK2440=m
+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_UDA1380=m
+
+#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-01 06:59:19 +0200 (Tue, 01 May 2007)
New Revision: 1886
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
* make pcf50606 driver irq save by local_irq_{save,restore}() calls, which
fixes the 'i2c timeout' problems
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-05-01 02:34:03 UTC (rev 1885)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-05-01 04:59:19 UTC (rev 1886)
@@ -8,7 +8,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -1976,6 +1976,14 @@
+@@ -1984,6 +1984,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -1784,7 +1784,7 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -49,6 +49,7 @@
+@@ -50,6 +50,7 @@
usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
videomodes.o w83c553f.o \
ks8695eth.o \
@@ -1796,7 +1796,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/pcf50606.c
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,112 @@
+
+#include <common.h>
+
@@ -1804,32 +1804,64 @@
+
+#include <i2c.h>
+#include <pcf50606.h>
++#include <asm/atomic.h>
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+#define PCF50606_I2C_ADDR 0x08
+
-+void pcf50606_reg_write(u_int8_t reg, u_int8_t val)
++void __pcf50606_reg_write(u_int8_t reg, u_int8_t val)
+{
+ i2c_write(PCF50606_I2C_ADDR, reg, 1, &val, 1);
+}
+
-+u_int8_t pcf50606_reg_read(u_int8_t reg)
++u_int8_t __pcf50606_reg_read(u_int8_t reg)
+{
+ u_int8_t tmp;
+ i2c_read(PCF50606_I2C_ADDR, reg, 1, &tmp, 1);
+ return tmp;
+}
+
++void pcf50606_reg_write(u_int8_t reg, u_int8_t val)
++{
++ unsigned long flags;
++
++ local_irq_save(flags);
++ __pcf50606_reg_write(reg, val);
++ local_irq_restore(flags);
++}
++
++u_int8_t pcf50606_reg_read(u_int8_t reg)
++{
++ unsigned long flags;
++ u_int8_t tmp;
++
++ local_irq_save(flags);
++ tmp = __pcf50606_reg_read(reg);
++ local_irq_restore(flags);
++
++ return tmp;
++}
++
+void pcf50606_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val)
+{
-+ u_int8_t tmp = pcf50606_reg_read(reg);
-+ pcf50606_reg_write(reg, (val & mask) | (tmp & ~mask));
++ unsigned long flags;
++ u_int8_t tmp;
++
++ local_irq_save(flags);
++ tmp = __pcf50606_reg_read(reg);
++ __pcf50606_reg_write(reg, (val & mask) | (tmp & ~mask));
++ local_irq_restore(flags);
+}
+
+void pcf50606_reg_clear_bits(u_int8_t reg, u_int8_t bits)
+{
-+ u_int8_t tmp = pcf50606_reg_read(reg);
++ unsigned long flags;
++ u_int8_t tmp;
++
++ local_irq_save(flags);
++ tmp = pcf50606_reg_read(reg);
+ pcf50606_reg_write(reg, (tmp & ~bits));
++ local_irq_restore(flags);
+}
+
+static const u_int8_t regs_valid[] = {
@@ -1852,10 +1884,15 @@
+/* initialize PCF50606 register set */
+void pcf50606_init(void)
+{
++ unsigned long flags;
+ int i;
-+ for (i = 0; i < ARRAY_SIZE(regs_valid); i++)
-+ pcf50606_reg_write(regs_valid[i],
-+ pcf50606_initial_regs[regs_valid[i]]);
++
++ local_irq_save(flags);
++ for (i = 0; i < ARRAY_SIZE(regs_valid); i++) {
++ __pcf50606_reg_write(regs_valid[i],
++ pcf50606_initial_regs[regs_valid[i]]);
++ }
++ local_irq_restore(flags);
+}
+
+void pcf50606_charge_autofast(int on)
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-01 09:39:08 +0200 (Tue, 01 May 2007)
New Revision: 1887
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-omoko.c: (create_contacts_list): Change "Cell Phone" to more
generic "Mobile"
(create_main_window): Set application name to "Contacts". Fixes bug 490.
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-01 04:59:19 UTC (rev 1886)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-01 07:39:08 UTC (rev 1887)
@@ -1,3 +1,9 @@
+2007-05-01 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/contacts-omoko.c: (create_contacts_list): Change "Cell Phone" to
more
+ generic "Mobile"
+ (create_main_window): Set application name to "Contacts". Fixes bug 490.
+
2007-04-25 Rob Bradford <[EMAIL PROTECTED]>
* src/contacts-omoko.c: (create_main_window):
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-05-01 04:59:19 UTC (rev 1886)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-05-01 07:39:08 UTC (rev 1887)
@@ -97,7 +97,7 @@
/* mobile column */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Cell Phone"),
renderer,
+ column = gtk_tree_view_column_new_with_attributes (_("Mobile"),
renderer,
"text",
CONTACT_CELLPHONE_COL, NULL);
gtk_tree_view_column_set_sort_column_id (column, CONTACT_CELLPHONE_COL);
moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), column);
@@ -120,7 +120,7 @@
//? MokoApplication* app =
MOKO_APPLICATION(moko_application_get_instance());
- g_set_application_name ("Phone Book");
+ g_set_application_name (_("Contacts"));
ui->main_window = moko_paned_window_new ();
gtk_window_set_title (GTK_WINDOW (ui->main_window), _("Contacts"));
@@ -286,13 +286,6 @@
g_signal_connect (G_OBJECT(moko_tool_box), "searchbox_visible",
G_CALLBACK (contacts_enable_search_cb),
contacts_data);
- /* temporary settings */
- GtkSettings *settings = gtk_settings_get_default ();
- g_object_set (settings,
- "gtk-theme-name", "openmoko-standard",
- NULL);
-
-
gtk_widget_show_all (ui->main_window);
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-01 10:36:41 +0200 (Tue, 01 May 2007)
New Revision: 1888
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-utils.c
Log:
* src/contacts-callbacks-ebook.c: (contacts_added_cb):
* src/contacts-callbacks-ui.c: (contacts_delete_cb):
* src/contacts-main.c: (main):
* src/contacts-utils.c: (contacts_string_list_as_string):
Merge in changes from mainline Contacts, including:
- Miscellaneous memory fixes
- Add error dialogs if there are problems opening the address book or saving
a contact
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-01 07:39:08 UTC (rev 1887)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-01 08:36:41 UTC (rev 1888)
@@ -1,5 +1,17 @@
2007-05-01 Thomas Wood <[EMAIL PROTECTED]>
+ * src/contacts-callbacks-ebook.c: (contacts_added_cb):
+ * src/contacts-callbacks-ui.c: (contacts_delete_cb):
+ * src/contacts-main.c: (main):
+ * src/contacts-utils.c: (contacts_string_list_as_string):
+
+ Merge in changes from mainline Contacts, including:
+ - Miscellaneous memory fixes
+ - Add error dialogs if there are problems opening the address
book or saving
+ a contact
+
+2007-05-01 Thomas Wood <[EMAIL PROTECTED]>
+
* src/contacts-omoko.c: (create_contacts_list): Change "Cell Phone" to
more
generic "Mobile"
(create_main_window): Set application name to "Contacts". Fixes bug 490.
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-05-01 07:39:08 UTC (rev 1887)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-05-01 08:36:41 UTC (rev 1888)
@@ -95,7 +95,7 @@
(GCompareFunc) strcmp))
{
data->contacts_groups = g_list_prepend
- (data->contacts_groups, group->data);
+ (data->contacts_groups, g_strdup
(group->data));
}
}
g_list_foreach (contact_groups, (GFunc) g_free, NULL);
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
2007-05-01 07:39:08 UTC (rev 1887)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
2007-05-01 08:36:41 UTC (rev 1888)
@@ -253,9 +253,11 @@
default:
break;
}
+ g_list_foreach (contact_list, (GFunc) g_free, NULL);
g_list_free (contact_list);
gtk_widget_destroy (dialog);
contacts_set_widgets_sensitive (widgets);
+ g_list_free (widgets);
}
void
@@ -612,25 +614,42 @@
void
contacts_about_cb (GtkWidget *parent)
{
- gchar *authors[] = {"Chris Lord <[EMAIL PROTECTED]>", NULL};
+ const char *authors[] = {"Chris Lord <[EMAIL PROTECTED]>",
+ "Ross Burton <[EMAIL PROTECTED]>",
+ "Matthew Allum <[EMAIL PROTECTED]>",
+ "Thomas Wood <[EMAIL PROTECTED]>",
+ NULL};
+ const char *license = {
+ N_(
+ "Contacts 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.\n\n"
+ "Contacts 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.\n\n"
+ "You should have received a copy of the GNU General Public License
"
+ "along with Contacts; if not, write to the Free Software
Foundation, Inc., "
+ "51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+ )
+ };
/* Translators: please translate this as your own name and optionally
email
like so: "Your Name <[EMAIL PROTECTED]>" */
- const gchar *translator_credits = _("translator-credits");
- GdkPixbuf *icon;
+ const char *translator_credits = _("translator-credits");
- icon = gdk_pixbuf_new_from_file (DATADIR"/pixmaps/oh-contacts.png",
NULL);
gtk_show_about_dialog (GTK_WINDOW (parent),
"name", GETTEXT_PACKAGE,
"version", VERSION,
"authors", authors,
- "logo", icon,
+ "logo-icon-name", "contacts",
"website", "http://projects.o-hand.com/contacts/";,
- "copyright", "(c) 2006 OpenedHand Ltd",
+ "copyright", "\302\251 2006 OpenedHand Ltd",
"translator-credits", translator_credits,
+ "license", license,
+ "wrap-license", TRUE,
NULL);
- if (icon != NULL)
- g_object_unref (icon);
}
gboolean
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
2007-05-01 07:39:08 UTC (rev 1887)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
2007-05-01 08:36:41 UTC (rev 1888)
@@ -136,11 +136,8 @@
int
main (int argc, char **argv)
{
+ GError *error = NULL;
BaconMessageConnection *mc;
-#ifdef HAVE_GCONF
- const char *search;
- GConfClient *client;
-#endif
ContactsData *data; /* Variable for passing around data -
* see contacts-defs.h.
*/
@@ -182,9 +179,11 @@
//g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
/* Load the system addressbook */
- data->book = e_book_new_system_addressbook (NULL);
- if (!data->book)
- g_critical ("Could not load system addressbook");
+ data->book = e_book_new_system_addressbook (&error);
+ if (!data->book) {
+ g_critical ("Could not load system addressbook: %s",
error->message);
+ g_error_free (error);
+ }
data->contacts_table = g_hash_table_new_full (g_str_hash,
g_str_equal, NULL,
@@ -228,9 +227,6 @@
gtk_widget_show_all (widget);
}
- /* fix icon sizes to 16x16 for the moment... */
- gtk_rc_parse_string
("gtk_icon_sizes=\"gtk-button=16,16:gtk-menu=16,16\"");
-
gtk_main ();
/* if we have modified the current contact, but not saved it, do so now
*/
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-utils.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-utils.c
2007-05-01 07:39:08 UTC (rev 1887)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-utils.c
2007-05-01 08:36:41 UTC (rev 1888)
@@ -161,8 +161,9 @@
{ "EMAIL", 0, N_("Email"), FALSE, 30, FALSE },
{ "ADR", 0, N_("Address"), FALSE, 40, FALSE },
{ "NICKNAME", E_CONTACT_NICKNAME, NULL, FALSE, 110, TRUE },
- { "URL", E_CONTACT_HOMEPAGE_URL, N_("Homepage"), FALSE, 120, FALSE },
- { "NOTE", E_CONTACT_NOTE, NULL, TRUE, 130, TRUE },
+ { "BDAY", E_CONTACT_BIRTH_DATE, NULL, FALSE, 120, TRUE },
+ { "URL", E_CONTACT_HOMEPAGE_URL, N_("Homepage"), FALSE, 130, FALSE },
+ { "NOTE", E_CONTACT_NOTE, NULL, TRUE, 140, TRUE },
{ NULL }
};
@@ -469,7 +470,7 @@
contacts_string_list_as_string (GList *list, const gchar *separator,
gboolean include_empty)
{
- gchar *old_string, *new_string;
+ gchar *old_string, *new_string = NULL;
GList *c;
if (!include_empty)
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
