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. r3109 - in
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard:
128x128/apps 32x32/apps 48x48/apps ([EMAIL PROTECTED])
2. r3110 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
3. r3111 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
4. r3112 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
5. r3113 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r3114 - in
trunk/src/target/OM-2007.2/libraries/libmokojournal2: .
doc/reference mokojournal ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-08 12:06:00 +0200 (Mon, 08 Oct 2007)
New Revision: 3109
Added:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/openmoko-calculator.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/openmoko-calculator.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/openmoko-calculator.png
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/Makefile.am
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/Makefile.am
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/Makefile.am
Log:
* Add openmoko-calculator icon
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/Makefile.am
2007-10-08 03:49:33 UTC (rev 3108)
+++
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/Makefile.am
2007-10-08 10:06:00 UTC (rev 3109)
@@ -2,6 +2,6 @@
size = 128x128
context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-clock.png
openmoko-dateandtime.png openmoko-dialer.png openmoko-gps.png
openmoko-mailpreview.png openmoko-messages.png openmoko-photo-album.png
openmoko-picture-preview.png openmoko-rss.png openmoko-sketchbook.png
openmoko-soundandvideo.png openmoko-today.png system-file-manager.png
utilities-terminal.png
+icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-calculator.png
openmoko-clock.png openmoko-dateandtime.png openmoko-dialer.png
openmoko-gps.png openmoko-mailpreview.png openmoko-messages.png
openmoko-photo-album.png openmoko-picture-preview.png openmoko-rss.png
openmoko-sketchbook.png openmoko-soundandvideo.png openmoko-today.png
system-file-manager.png utilities-terminal.png
EXTRA_DIST = $(icons_DATA)
MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/openmoko-calculator.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/128x128/apps/openmoko-calculator.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/Makefile.am
2007-10-08 03:49:33 UTC (rev 3108)
+++
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/Makefile.am
2007-10-08 10:06:00 UTC (rev 3109)
@@ -2,6 +2,6 @@
size = 32x32
context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-clock.png
openmoko-dateandtime.png openmoko-dialer.png openmoko-gps.png
openmoko-mailpreview.png openmoko-messages.png openmoko-photo-album.png
openmoko-picture-preview.png openmoko-rss.png openmoko-sketchbook.png
openmoko-soundandvideo.png openmoko-system-default.png openmoko-today.png
system-file-manager.png utilities-terminal.png
+icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-calculator.png
openmoko-clock.png openmoko-dateandtime.png openmoko-dialer.png
openmoko-gps.png openmoko-mailpreview.png openmoko-messages.png
openmoko-photo-album.png openmoko-picture-preview.png openmoko-rss.png
openmoko-sketchbook.png openmoko-soundandvideo.png openmoko-system-default.png
openmoko-today.png system-file-manager.png utilities-terminal.png
EXTRA_DIST = $(icons_DATA)
MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/openmoko-calculator.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/apps/openmoko-calculator.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/Makefile.am
2007-10-08 03:49:33 UTC (rev 3108)
+++
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/Makefile.am
2007-10-08 10:06:00 UTC (rev 3109)
@@ -2,6 +2,6 @@
size = 48x48
context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-clock.png
openmoko-dateandtime.png openmoko-dialer.png openmoko-gps.png
openmoko-messages.png openmoko-photo-album.png openmoko-picture-preview.png
openmoko-rss.png openmoko-sketchbook.png openmoko-soundandvideo.png
openmoko-system-default.png openmoko-today.png system-file-manager.png
utilities-terminal.png
+icons_DATA = accessories-text-editor.png call-preview.png contacts.png
dates.png help-browser.png openmoko-appmanager.png openmoko-calculator.png
openmoko-clock.png openmoko-dateandtime.png openmoko-dialer.png
openmoko-gps.png openmoko-messages.png openmoko-photo-album.png
openmoko-picture-preview.png openmoko-rss.png openmoko-sketchbook.png
openmoko-soundandvideo.png openmoko-system-default.png openmoko-today.png
system-file-manager.png utilities-terminal.png
EXTRA_DIST = $(icons_DATA)
MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/openmoko-calculator.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/apps/openmoko-calculator.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-08 12:06:39 +0200 (Mon, 08 Oct 2007)
New Revision: 3110
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c:
Import window-ordering fix from libhildondesktop, fix odd
event-eating bug where only 2nd click after using MokoFingerScroll
outside of a MokoFingerScroll would work
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-08
10:06:00 UTC (rev 3109)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-08
10:06:39 UTC (rev 3110)
@@ -1,3 +1,14 @@
+2007-10-08 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-finger-scroll.c: (get_ordered_children),
+ (moko_finger_scroll_get_topmost),
+ (moko_finger_scroll_button_press_cb),
+ (moko_finger_scroll_motion_notify_cb),
+ (moko_finger_scroll_button_release_cb):
+ Import window-ordering fix from libhildondesktop, fix odd
+ event-eating bug where only 2nd click after using MokoFingerScroll
+ outside of a MokoFingerScroll would work
+
2007-10-04 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c: (moko_finger_scroll_timeout),
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-08 10:06:00 UTC (rev 3109)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-08 10:06:39 UTC (rev 3110)
@@ -35,6 +35,7 @@
* - 'Physical' mode for acceleration scrolling
*/
+#include <gdk/gdkx.h>
#include "moko-finger-scroll.h"
G_DEFINE_TYPE (MokoFingerScroll, moko_finger_scroll, GTK_TYPE_EVENT_BOX)
@@ -88,6 +89,30 @@
PROP_SPS,
};
+/* Following function inherited from libhildondesktop */
+static GList *
+get_ordered_children (GdkWindow *window)
+{
+ Window *children, root, parent;
+ guint i, n_children = 0;
+ GList *ret = NULL;
+
+ gdk_error_trap_push ();
+ XQueryTree (GDK_DISPLAY (), GDK_WINDOW_XID (window), &root,
+ &parent, &children, &n_children);
+
+ if (gdk_error_trap_pop ()) return NULL;
+
+ for (i = 0; i < n_children; i++) {
+ GdkWindow *window = gdk_window_lookup (children[i]);
+ if (window) ret = g_list_prepend (ret, window);
+ }
+
+ XFree (children);
+
+ return ret;
+}
+
static GdkWindow *
moko_finger_scroll_get_topmost (GdkWindow *window, gint x, gint y,
gint *tx, gint *ty)
@@ -105,8 +130,9 @@
while (window) {
gint child_x = 0, child_y = 0;
- GList *c, *children = gdk_window_peek_children (window);
+ GList *c, *children = get_ordered_children (window);
GdkWindow *old_window = window;
+
for (c = children; c; c = c->next) {
GdkWindow *child = (GdkWindow *)c->data;
gint wx, wy;
@@ -122,6 +148,9 @@
window = child;
}
}
+
+ g_list_free (children);
+
/*g_debug ("\\|/");*/
if (window == old_window) break;
@@ -174,7 +203,7 @@
if ((!priv->enabled) || (priv->clicked) || (event->button != 1) ||
((event->time == priv->last_time) &&
- (event->type == priv->last_type))) return FALSE;
+ (event->type == priv->last_type))) return TRUE;
g_get_current_time (&priv->click_start);
priv->last_type = event->type;
@@ -382,7 +411,7 @@
if ((!priv->enabled) || (!priv->clicked) ||
((event->time == priv->last_time) &&
- (event->type == priv->last_type))) return FALSE;
+ (event->type == priv->last_type))) return TRUE;
/* Only start the scroll if the mouse cursor passes beyond the
* DnD threshold for dragging.
@@ -461,7 +490,7 @@
if ((!priv->clicked) || (!priv->enabled) || (event->button != 1) ||
((event->time == priv->last_time) &&
(event->type == priv->last_type)))
- return FALSE;
+ return TRUE;
priv->last_type = event->type;
priv->last_time = event->time;
@@ -499,9 +528,8 @@
synth_crossing (priv->child, x, y, event->x_root,
event->y_root, event->time, FALSE);
}
- if (priv->child)
- g_object_remove_weak_pointer ((GObject *)priv->child,
- &priv->child);
+ g_object_remove_weak_pointer ((GObject *)priv->child,
+ &priv->child);
priv->moved = FALSE;
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-08 12:08:49 +0200 (Mon, 08 Oct 2007)
New Revision: 3111
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c:
Fix typo g_list_prepend instead of g_list_append
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-08
10:06:39 UTC (rev 3110)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-08
10:08:49 UTC (rev 3111)
@@ -1,5 +1,10 @@
2007-10-08 Chris Lord <[EMAIL PROTECTED]>
+ * libmokoui/moko-finger-scroll.c: (get_ordered_children):
+ Fix typo g_list_prepend instead of g_list_append
+
+2007-10-08 Chris Lord <[EMAIL PROTECTED]>
+
* libmokoui/moko-finger-scroll.c: (get_ordered_children),
(moko_finger_scroll_get_topmost),
(moko_finger_scroll_button_press_cb),
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-08 10:06:39 UTC (rev 3110)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-08 10:08:49 UTC (rev 3111)
@@ -105,7 +105,7 @@
for (i = 0; i < n_children; i++) {
GdkWindow *window = gdk_window_lookup (children[i]);
- if (window) ret = g_list_prepend (ret, window);
+ if (window) ret = g_list_append (ret, window);
}
XFree (children);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-08 13:26:02 +0200 (Mon, 08 Oct 2007)
New Revision: 3112
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
trunk/src/target/kernel/patches/smedia-glamo.patch
Log:
glamo/gta02: The end address of resouces should be minus by one. This patch
also fixes a typo where glamo-3d uses glamo-2d's resources. (Chia-I Wu)
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-08 10:08:49 UTC
(rev 3111)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-08 11:26:02 UTC
(rev 3112)
@@ -580,7 +580,7 @@
+static struct resource gta02_glamo_resources[] = {
+ [0] = {
+ .start = S3C2410_CS1,
-+ .end = S3C2410_CS1 + 0x1000000,
++ .end = S3C2410_CS1 + 0x1000000 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
Modified: trunk/src/target/kernel/patches/smedia-glamo.patch
===================================================================
--- trunk/src/target/kernel/patches/smedia-glamo.patch 2007-10-08 10:08:49 UTC
(rev 3111)
+++ trunk/src/target/kernel/patches/smedia-glamo.patch 2007-10-08 11:26:02 UTC
(rev 3112)
@@ -73,7 +73,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-regs.h
-@@ -0,0 +1,466 @@
+@@ -0,0 +1,467 @@
+#ifndef _GLAMO_REGS_H
+#define _GLAMO_REGS_H
+
@@ -115,6 +115,7 @@
+ GLAMO_REGOFS_RISC = 0x1680,
+ GLAMO_REGOFS_2D = 0x1700,
+ GLAMO_REGOFS_3D = 0x1b00,
++ GLAMO_REGOFS_END = 0x2400,
+};
+
+
@@ -697,7 +698,7 @@
+ {
+ /* FIXME: those need to be incremented by parent base */
+ .start = GLAMO_REGOFS_MMC,
-+ .end = GLAMO_REGOFS_MMC + 0x100,
++ .end = GLAMO_REGOFS_MPROC0 - 1,
+ .flags = IORESOURCE_MEM
+ }, {
+ .start = IRQ_GLAMO_MMC,
@@ -715,7 +716,7 @@
+static struct resource glamo_jpeg_resources[] = {
+ {
+ .start = GLAMO_REGOFS_JPEG,
-+ .end = GLAMO_REGOFS_MPEG,
++ .end = GLAMO_REGOFS_MPEG - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_GLAMO_JPEG,
@@ -733,7 +734,7 @@
+static struct resource glamo_mpeg_resources[] = {
+ {
+ .start = GLAMO_REGOFS_MPEG,
-+ .end = GLAMO_REGOFS_LCD,
++ .end = GLAMO_REGOFS_LCD - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_GLAMO_MPEG,
@@ -751,7 +752,7 @@
+static struct resource glamo_2d_resources[] = {
+ {
+ .start = GLAMO_REGOFS_2D,
-+ .end = GLAMO_REGOFS_3D,
++ .end = GLAMO_REGOFS_3D - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_GLAMO_2D,
@@ -769,15 +770,15 @@
+static struct resource glamo_3d_resources[] = {
+ {
+ .start = GLAMO_REGOFS_3D,
-+ .end = GLAMO_REGOFS_3D + 0x600,
++ .end = GLAMO_REGOFS_END - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device glamo_3d_dev = {
+ .name = "glamo-3d",
-+ .resource = glamo_2d_resources,
-+ .num_resources = ARRAY_SIZE(glamo_2d_resources),
++ .resource = glamo_3d_resources,
++ .num_resources = ARRAY_SIZE(glamo_3d_resources),
+};
+
+static struct platform_device glamo_spigpio_dev = {
@@ -800,12 +801,12 @@
+ {
+ .name = "glamo-fb-regs",
+ .start = GLAMO_REGOFS_LCD,
-+ .end = GLAMO_REGOFS_LCD + 0x100,
++ .end = GLAMO_REGOFS_MMC - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .name = "glamo-fb-mem",
+ .start = GLAMO_OFFSET_FB,
-+ .end = GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
++ .end = GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-08 13:28:08 +0200 (Mon, 08 Oct 2007)
New Revision: 3113
Modified:
trunk/src/target/kernel/patches/smedia-glamo.patch
Log:
glamo: raise frame rate from 40Hz to 60Hz: DCLK ration is now 2:1 instead of
3:1 (Chia-I Wu)
Modified: trunk/src/target/kernel/patches/smedia-glamo.patch
===================================================================
--- trunk/src/target/kernel/patches/smedia-glamo.patch 2007-10-08 11:26:02 UTC
(rev 3112)
+++ trunk/src/target/kernel/patches/smedia-glamo.patch 2007-10-08 11:28:08 UTC
(rev 3113)
@@ -1103,7 +1103,7 @@
+ { 0xfffe, 300 },
+ { GLAMO_REG_IRQ_ENABLE, 0xffff },
+ { GLAMO_REG_CLOCK_GEN6, 0x2000 },
-+ { GLAMO_REG_CLOCK_GEN7, 0x0102 },
++ { GLAMO_REG_CLOCK_GEN7, 0x0101 },
+ { GLAMO_REG_CLOCK_GEN8, 0x0100 },
+ { GLAMO_REG_CLOCK_HOST, 0x000d },
+ { 0x200, 0x0ef0 },
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-08 13:33:03 +0200 (Mon, 08 Oct 2007)
New Revision: 3114
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-sections.txt
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal.types
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
Log:
Patch by: Emmanuele Bassi <[EMAIL PROTECTED]>
* doc/reference/Makefile.am:
* doc/reference/libmokojournal-docs.sgml:
* doc/reference/libmokojournal.types
* doc/reference/libmokojournal-sections.txt
* mokojournal/moko-journal.c:
* mokojournal/moko-journal.h:
Generate a correct sections.txt file.
Fixed a couple of inconsistencies in the API.
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-08 11:28:08 UTC (rev 3113)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-08 11:33:03 UTC (rev 3114)
@@ -1,3 +1,18 @@
+2007-10-08 Thomas Wood <[EMAIL PROTECTED]>
+
+ Patch by: Emmanuele Bassi <[EMAIL PROTECTED]>
+
+ * doc/reference/Makefile.am:
+ * doc/reference/libmokojournal-docs.sgml:
+ * doc/reference/libmokojournal.types
+ * doc/reference/libmokojournal-sections.txt
+ * mokojournal/moko-journal.c:
+ * mokojournal/moko-journal.h:
+
+ Generate a correct sections.txt file.
+
+ Fixed a couple of inconsistencies in the API.
+
2007-10-04 Thomas Wood <[EMAIL PROTECTED]>
* mokojournal/moko-journal.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
2007-10-08 11:33:03 UTC (rev 3114)
@@ -47,7 +47,7 @@
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
+IGNORE_HFILES=moko-time-priv.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
@@ -75,7 +75,7 @@
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = version.xml.in
+EXTRA_DIST += version.xml.in
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
2007-10-08 11:33:03 UTC (rev 3114)
@@ -16,7 +16,6 @@
<chapter>
<title>libmokojournal2</title>
<xi:include href="xml/moko-journal.xml"/>
- <xi:include href="xml/moko-time-priv.xml"/>
<xi:include href="xml/moko-time.xml"/>
</chapter>
</book>
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-sections.txt
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-sections.txt
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-sections.txt
2007-10-08 11:33:03 UTC (rev 3114)
@@ -0,0 +1,103 @@
+<SECTION>
+<FILE>moko-journal</FILE>
+<TITLE>MokoJournal</TITLE>
+MokoJournal
+MokoJournalClass
+moko_journal_open_default
+moko_journal_close
+moko_journal_add_entry
+moko_journal_get_nb_entries
+moko_journal_get_entry_at
+moko_journal_remove_entry_at
+moko_journal_remove_entry_by_uid
+moko_journal_write_to_storage
+moko_journal_load_from_storage
+
+<SUBSECTION>
+MokoJournalEntryType
+MokoJournalEntry
+moko_journal_entry_new
+moko_journal_entry_ref
+moko_journal_entry_unref
+moko_journal_entry_get_entry_type
+moko_journal_entry_set_entry_type
+
+<SUBSECTION>
+moko_journal_entry_get_uid
+moko_journal_entry_get_contact_uid
+moko_journal_entry_set_contact_uid
+moko_journal_entry_get_summary
+moko_journal_entry_set_summary
+moko_journal_entry_get_start_location
+moko_journal_entry_set_start_location
+MessageDirection
+moko_journal_entry_get_direction
+moko_journal_entry_set_direction
+moko_journal_entry_get_dtstart
+moko_journal_entry_set_dtstart
+moko_journal_entry_get_source
+moko_journal_entry_set_source
+moko_journal_entry_set_gsm_location
+moko_journal_entry_get_gsm_location
+moko_journal_entry_set_wifi_ap_mac_address
+moko_journal_entry_get_wifi_ap_mac_address
+moko_journal_entry_has_voice_info
+
+<SUBSECTION>
+moko_journal_voice_info_set_distant_number
+moko_journal_voice_info_get_distant_number
+moko_journal_voice_info_set_local_number
+moko_journal_voice_info_get_local_number
+moko_journal_voice_info_set_was_missed
+moko_journal_voice_info_get_was_missed
+
+<SUBSECTION>
+moko_journal_entry_has_fax_info
+moko_journal_entry_has_data_info
+moko_journal_entry_has_sms_info
+moko_journal_entry_has_email_info
+
+<SUBSECTION>
+MokoLocation
+moko_location_copy
+moko_location_free
+
+<SUBSECTION>
+MokoGSMLocation
+moko_gsm_location_copy
+moko_gsm_location_free
+
+<SUBSECTION Standard>
+MOKO_JOURNAL
+MOKO_IS_JOURNAL
+MOKO_JOURNAL_CLASS
+MOKO_IS_JOURNAL_CLASS
+MOKO_JOURNAL_GET_CLASS
+
+<SUBSECTION Private>
+MOKO_TYPE_JOURNAL
+MOKO_TYPE_LOCATION
+MOKO_TYPE_GSM_LOCATION
+MOKO_TYPE_JOURNAL_ENTRY
+moko_journal_get_type
+moko_location_get_type
+moko_gsm_location_get_type
+moko_journal_entry_get_type
+</SECTION>
+
+<SECTION>
+<FILE>moko-time</FILE>
+MokoTime
+moko_time_new_today
+moko_time_from_timet
+moko_time_from_string
+moko_time_copy
+moko_time_free
+moko_time_as_timet
+moko_time_as_ical_string
+
+<SUBSECTION Private>
+MOKO_TYPE_TIME
+moko_time_get_type
+</SECTION>
+
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal.types
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal.types
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal.types
2007-10-08 11:33:03 UTC (rev 3114)
@@ -0,0 +1 @@
+moko_journal_get_type
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-10-08 11:33:03 UTC (rev 3114)
@@ -1624,15 +1624,15 @@
/**
- * moko_journal_entry_set_type:
+ * moko_journal_entry_set_entry_type:
* @entry: the current instance of journal entry
* @type: the new type
*
* Set the type of the journal entry
*/
void
-moko_journal_entry_set_type (MokoJournalEntry *a_entry,
- MokoJournalEntryType a_type)
+moko_journal_entry_set_entry_type (MokoJournalEntry *a_entry,
+ MokoJournalEntryType a_type)
{
g_return_if_fail (a_entry) ;
g_return_if_fail (a_type != UNDEF_ENTRY) ;
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-10-08 11:28:08 UTC (rev 3113)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-10-08 11:33:03 UTC (rev 3114)
@@ -47,172 +47,169 @@
* emails issued or received.
***********************************************************/
-typedef struct _MokoJournal MokoJournal ;
-typedef struct _MokoJournalClass MokoJournalClass ;
-typedef struct _MokoJournalEntry MokoJournalEntry ;
+typedef struct _MokoJournal MokoJournal;
+typedef struct _MokoJournalClass MokoJournalClass;
+typedef struct _MokoJournalEntry MokoJournalEntry;
+
+typedef struct _MokoLocation MokoLocation;
+typedef struct _MokoGSMLocation MokoGSMLocation;
+
struct _MokoJournal
{
GObject parent;
-} ;
+};
struct _MokoJournalClass
{
GObjectClass parent_class;
- void (*entry_added) (MokoJournal *journal, const MokoJournalEntry *entry) ;
- void (*entry_removed) (MokoJournal *journal, const MokoJournalEntry *entry) ;
+ void (*entry_added) (MokoJournal *journal,
+ const MokoJournalEntry *entry);
+ void (*entry_removed) (MokoJournal *journal,
+ const MokoJournalEntry *entry);
} ;
/**
* MokoJournalEntryType:
+ * @UNDEF_ENTRY: used internally
+ * @EMAIL_JOURNAL_ENTRY: E-mail
+ * @SMS_JOURNAL_ENTRY: SMS calls
+ * @VOICE_JOURNAL_ENTRY: voice calls
+ * @FAX_JOURNAL_ENTRY: fax calls
+ * @DATA_JOURNAL_ENTRY: data calls (like modules)
+ * @NB_OF_ENTRY_TYPES: terminator of entry types
*
- * this represents the primary type of a journal entry.
+ * Reresents the primary type of a journal entry.
*/
typedef enum {
- UNDEF_ENTRY=0,
+ UNDEF_ENTRY,
EMAIL_JOURNAL_ENTRY,
- /*sms calls*/
SMS_JOURNAL_ENTRY,
- /*voice calls*/
VOICE_JOURNAL_ENTRY,
- /*fax call*/
FAX_JOURNAL_ENTRY,
- /*data calls (like modems)*/
DATA_JOURNAL_ENTRY,
- NB_OF_ENTRY_TYPES /*must always be the last*/
-} MokoJournalEntryType ;
+ NB_OF_ENTRY_TYPES
+} MokoJournalEntryType;
+
typedef enum {
- DIRECTION_IN=0,
+ DIRECTION_IN,
DIRECTION_OUT
-} MessageDirection ;
+} MessageDirection;
-typedef struct
+/**
+ * MokoLocation:
+ * @longitude: longitude of a journal entry
+ * @latitude: latitude of a journal entry
+ *
+ * Geographical location of a journal entry
+ */
+struct _MokoLocation
{
- gfloat longitude ;
- gfloat latitude ;
-} MokoLocation ;
+ gfloat longitude;
+ gfloat latitude;
+};
-typedef struct
+/**
+ * MokoGSMLocation:
+ * @lac: local area code
+ * @id: cell id
+ *
+ * GSM location of a journal entry
+ */
+struct _MokoGSMLocation
{
- /*local area code*/
- gushort lac ;
- /*cell id*/
- gushort cid ;
-} MokoGSMLocation ;
+ gushort lac;
+ gushort cid;
+};
-/* The 'entry added' callback function */
+MokoJournal *moko_journal_open_default (void);
+void moko_journal_close (MokoJournal *journal);
+gboolean moko_journal_add_entry (MokoJournal *journal,
+ MokoJournalEntry *entry);
+gint moko_journal_get_nb_entries (MokoJournal *journal) ;
+gboolean moko_journal_get_entry_at (MokoJournal *journal,
+ guint index_,
+ MokoJournalEntry **entry) ;
+gboolean moko_journal_remove_entry_at (MokoJournal *journal,
+ guint index_);
+gboolean moko_journal_remove_entry_by_uid (MokoJournal *journal,
+ const gchar *uid);
+gboolean moko_journal_write_to_storage (MokoJournal *journal);
+gboolean moko_journal_load_from_storage (MokoJournal *journal);
+/* journal entries management */
+MokoJournalEntry * moko_journal_entry_new
(MokoJournalEntryType type);
+MokoJournalEntryType moko_journal_entry_get_entry_type
(MokoJournalEntry *entry);
+void moko_journal_entry_set_entry_type
(MokoJournalEntry *entry,
+
MokoJournalEntryType type);
+G_CONST_RETURN gchar *moko_journal_entry_get_uid
(MokoJournalEntry *entry);
+G_CONST_RETURN gchar *moko_journal_entry_get_contact_uid
(MokoJournalEntry *entry);
+void moko_journal_entry_set_contact_uid
(MokoJournalEntry *entry,
+ const gchar
*uid);
+G_CONST_RETURN gchar *moko_journal_entry_get_summary
(MokoJournalEntry *entry);
+void moko_journal_entry_set_summary
(MokoJournalEntry *entry,
+ const gchar
*summary);
+gboolean moko_journal_entry_get_start_location
(MokoJournalEntry *entry,
+ MokoLocation
*location);
+gboolean moko_journal_entry_set_start_location
(MokoJournalEntry *entry,
+ MokoLocation
*location);
+gboolean moko_journal_entry_get_direction
(MokoJournalEntry *entry,
+
MessageDirection *direction);
+void moko_journal_entry_set_direction
(MokoJournalEntry *entry,
+
MessageDirection direction);
+const MokoTime * moko_journal_entry_get_dtstart
(MokoJournalEntry *entry);
+void moko_journal_entry_set_dtstart
(MokoJournalEntry *entry,
+ MokoTime
*dtstart);
+G_CONST_RETURN gchar *moko_journal_entry_get_source
(MokoJournalEntry *entry);
+void moko_journal_entry_set_source
(MokoJournalEntry *entry,
+ const gchar
*source);
+gboolean moko_journal_entry_set_gsm_location
(MokoJournalEntry *entry,
+
MokoGSMLocation *location);
+gboolean moko_journal_entry_get_gsm_location
(MokoJournalEntry *entry,
+
MokoGSMLocation *location);
+gboolean moko_journal_entry_set_wifi_ap_mac_address
(MokoJournalEntry *entry,
+ const guchar
*address);
+const guchar * moko_journal_entry_get_wifi_ap_mac_address
(MokoJournalEntry *entry);
-/*<journal management>*/
-MokoJournal* moko_journal_open_default () ;
-void moko_journal_close (MokoJournal *journal) ;
-gboolean moko_journal_add_entry (MokoJournal *journal, MokoJournalEntry
*entry) ;
-int moko_journal_get_nb_entries (MokoJournal *journal) ;
-gboolean moko_journal_get_entry_at (MokoJournal *journal,
- guint index,
- MokoJournalEntry **entry) ;
-gboolean moko_journal_remove_entry_at (MokoJournal *journal,
- guint index) ;
-gboolean moko_journal_remove_entry_by_uid (MokoJournal *journal,
- const gchar* uid) ;
-gboolean moko_journal_write_to_storage (MokoJournal *journal) ;
-gboolean moko_journal_load_from_storage (MokoJournal *journal) ;
+/* voice call info */
+gboolean moko_journal_entry_has_voice_info
(MokoJournalEntry *entry);
+void moko_journal_voice_info_set_distant_number
(MokoJournalEntry *info,
+ const gchar
*number);
+G_CONST_RETURN gchar *moko_journal_voice_info_get_distant_number
(MokoJournalEntry *info);
+void moko_journal_voice_info_set_local_number
(MokoJournalEntry *info,
+ const gchar
*number);
+G_CONST_RETURN gchar *moko_journal_voice_info_get_local_number
(MokoJournalEntry *info);
+void moko_journal_voice_info_set_was_missed
(MokoJournalEntry *info,
+ gboolean
missing);
+gboolean moko_journal_voice_info_get_was_missed
(MokoJournalEntry *info);
-/*<journal entries querying>*/
-/*</journal entries querying>*/
+/* fax call info */
+gboolean moko_journal_entry_has_fax_info (MokoJournalEntry *entry);
+gboolean moko_journal_entry_has_data_info (MokoJournalEntry *entry);
-/*</journal management>*/
+/* sms info */
+gboolean moko_journal_entry_has_sms_info (MokoJournalEntry *entry);
+/* email info */
+gboolean moko_journal_entry_has_email_info (MokoJournalEntry *entry);
-/*<journal entries management>*/
-MokoJournalEntry* moko_journal_entry_new (MokoJournalEntryType type) ;
-MokoJournalEntryType moko_journal_entry_get_entry_type (MokoJournalEntry
*entry);
-void moko_journal_entry_set_type (MokoJournalEntry *entry,
- MokoJournalEntryType type) ;
-const gchar* moko_journal_entry_get_uid (MokoJournalEntry *entry) ;
-const gchar* moko_journal_entry_get_contact_uid (MokoJournalEntry *entry) ;
-void moko_journal_entry_set_contact_uid (MokoJournalEntry *entry,
- const gchar *uid) ;
-const gchar* moko_journal_entry_get_summary (MokoJournalEntry *entry) ;
-void moko_journal_entry_set_summary (MokoJournalEntry *entry,
- const gchar* summary) ;
-gboolean moko_journal_entry_get_start_location (MokoJournalEntry *entry,
- MokoLocation *location) ;
-gboolean moko_journal_entry_set_start_location (MokoJournalEntry *entry,
- MokoLocation *location) ;
-gboolean moko_journal_entry_get_direction (MokoJournalEntry *entry,
- MessageDirection *direction) ;
-void moko_journal_entry_set_direction (MokoJournalEntry *entry,
- MessageDirection direction) ;
-const MokoTime* moko_journal_entry_get_dtstart (MokoJournalEntry *entry) ;
-void moko_journal_entry_set_dtstart (MokoJournalEntry *entry, MokoTime*
dtstart);
-const gchar* moko_journal_entry_get_source (MokoJournalEntry *entry) ;
-void moko_journal_entry_set_source (MokoJournalEntry *entry,
- const gchar *source) ;
-gboolean moko_journal_entry_info_set_gsm_location (MokoJournalEntry *entry,
- MokoGSMLocation *location) ;
-gboolean moko_journal_entry_get_gsm_location (MokoJournalEntry *entry,
- MokoGSMLocation *location);
-gboolean moko_journal_entry_set_wifi_ap_mac_address (MokoJournalEntry *entry,
- const guchar *address) ;
-const guchar *moko_journal_entry_get_wifi_ap_mac_address
- (MokoJournalEntry *entry) ;
-/*<voice call info>*/
+/* helpers for bindings */
+GType moko_journal_get_type (void) G_GNUC_CONST;
+GType moko_location_get_type (void) G_GNUC_CONST;
+GType moko_gsm_location_get_type (void) G_GNUC_CONST;
+GType moko_journal_entry_get_type (void) G_GNUC_CONST;
-gboolean moko_journal_entry_has_voice_info (MokoJournalEntry *entry);
-void moko_journal_voice_info_set_distant_number (MokoJournalEntry *info,
- const gchar *number) ;
-const gchar* moko_journal_voice_info_get_distant_number
- (MokoJournalEntry *info) ;
-void moko_journal_voice_info_set_local_number (MokoJournalEntry *info,
- const gchar *number) ;
-const gchar* moko_journal_voice_info_get_local_number
- (MokoJournalEntry *info) ;
-void moko_journal_voice_info_set_was_missed (MokoJournalEntry *info,
- gboolean a_flag) ;
-gboolean moko_journal_voice_info_get_was_missed (MokoJournalEntry *info) ;
+MokoLocation* moko_location_copy (const MokoLocation *location);
+void moko_location_free (MokoLocation *location);
-/*</voice call info>*/
+MokoGSMLocation* moko_gsm_location_copy (const MokoGSMLocation *location);
+void moko_gsm_location_free (MokoGSMLocation *location);
-/*<fax call info>*/
+MokoJournalEntry* moko_journal_entry_ref (MokoJournalEntry *entry);
+void moko_journal_entry_unref (MokoJournalEntry *entry);
-gboolean moko_journal_entry_has_fax_info (MokoJournalEntry *entry) ;
-
-gboolean moko_journal_entry_has_data_info (MokoJournalEntry *entry) ;
-/*</fax call info>*/
-
-/*<sms info>*/
-gboolean moko_journal_entry_has_sms_info (MokoJournalEntry *entry) ;
-/*</sms info>*/
-
-/*<email info>*/
-
-gboolean moko_journal_entry_has_email_info (MokoJournalEntry *entry) ;
-
-/*</email info>*/
-
-
-/*</journal entries management>*/
-
-/*<helpers for bindings>*/
-GType moko_journal_get_type (void) ;
-GType moko_location_get_type (void) ;
-GType moko_gsm_location_get_type (void) ;
-GType moko_journal_entry_get_type (void) ;
-
-MokoLocation* moko_location_copy (const MokoLocation*) ;
-void moko_location_free (MokoLocation*) ;
-
-MokoGSMLocation* moko_gsm_location_copy (const MokoGSMLocation*);
-void moko_gsm_location_free (MokoGSMLocation*);
-
-MokoJournalEntry* moko_journal_entry_ref (MokoJournalEntry*);
-void moko_journal_entry_unref (MokoJournalEntry*);
-
-/*</helpers for bindings>*/
-
G_END_DECLS
#endif /*__MOKO_JOURNAL_H__*/
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
