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. r2343 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
2. r2344 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
3. r2345 - trunk/oe/packages/openmoko-apps ([EMAIL PROTECTED])
--- Begin Message ---
Author: njp
Date: 2007-06-25 14:06:56 +0200 (Mon, 25 Jun 2007)
New Revision: 2343
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-glue.h
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
Log:
Use a staticly-build dbus header file, instead of creating one at compile time
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-06-25 12:04:24 UTC (rev 2342)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-06-25 12:06:56 UTC (rev 2343)
@@ -51,7 +51,7 @@
moko-dialer-glue.h: moko-dialer-dbus.xml
$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool
--prefix=moko_dialer --mode=glib-server --output=$@ $<
-BUILT_SOURCES = \
+#BUILT_SOURCES = \
moko-dialer-glue.h
EXTRA_DIST = \
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-glue.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-glue.h
2007-06-25 12:04:24 UTC (rev 2342)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-glue.h
2007-06-25 12:06:56 UTC (rev 2343)
@@ -0,0 +1,216 @@
+/* Generated by dbus-binding-tool; do not edit! */
+
+
+#ifndef __dbus_glib_marshal_moko_dialer_MARSHAL_H__
+#define __dbus_glib_marshal_moko_dialer_MARSHAL_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v) g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v) g_value_get_int (v)
+#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
+#define g_marshal_value_peek_long(v) g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
+#define g_marshal_value_peek_float(v) g_value_get_float (v)
+#define g_marshal_value_peek_double(v) g_value_get_double (v)
+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v) g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ * Do not access GValues directly in your code. Instead, use the
+ * g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
+#define g_marshal_value_peek_char(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v) (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v) (v)->data[0].v_float
+#define g_marshal_value_peek_double(v) (v)->data[0].v_double
+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.H9MZTT:1) */
+extern void dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER_POINTER (GClosure
*closure,
+ GValue
*return_value,
+ guint
n_param_values,
+ const
GValue *param_values,
+ gpointer
invocation_hint,
+ gpointer
marshal_data);
+void
+dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER_POINTER (GClosure *closure,
+ GValue
*return_value,
+ guint
n_param_values,
+ const GValue
*param_values,
+ gpointer
invocation_hint,
+ gpointer
marshal_data)
+{
+ typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer
data1,
+ gpointer
arg_1,
+ gpointer
arg_2,
+ gpointer
data2);
+ register GMarshalFunc_BOOLEAN__POINTER_POINTER callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ?
marshal_data : cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_pointer (param_values + 1),
+ g_marshal_value_peek_pointer (param_values + 2),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.H9MZTT:2) */
+extern void dbus_glib_marshal_moko_dialer_BOOLEAN__STRING_POINTER (GClosure
*closure,
+ GValue
*return_value,
+ guint
n_param_values,
+ const
GValue *param_values,
+ gpointer
invocation_hint,
+ gpointer
marshal_data);
+void
+dbus_glib_marshal_moko_dialer_BOOLEAN__STRING_POINTER (GClosure *closure,
+ GValue
*return_value,
+ guint
n_param_values,
+ const GValue
*param_values,
+ gpointer
invocation_hint,
+ gpointer
marshal_data)
+{
+ typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer
data2);
+ register GMarshalFunc_BOOLEAN__STRING_POINTER callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_BOOLEAN__STRING_POINTER) (marshal_data ?
marshal_data : cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_pointer (param_values + 2),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:POINTER (/tmp/dbus-binding-tool-c-marshallers.H9MZTT:3) */
+extern void dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER (GClosure
*closure,
+ GValue
*return_value,
+ guint
n_param_values,
+ const GValue
*param_values,
+ gpointer
invocation_hint,
+ gpointer
marshal_data);
+void
+dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
+ gpointer arg_1,
+ gpointer data2);
+ register GMarshalFunc_BOOLEAN__POINTER callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+ g_return_if_fail (n_param_values == 2);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_BOOLEAN__POINTER) (marshal_data ? marshal_data :
cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_pointer (param_values + 1),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+}
+
+G_END_DECLS
+
+#endif /* __dbus_glib_marshal_moko_dialer_MARSHAL_H__ */
+
+#include <dbus/dbus-glib.h>
+static const DBusGMethodInfo dbus_glib_moko_dialer_methods[] = {
+ { (GCallback) moko_dialer_show_dialer,
dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER, 0 },
+ { (GCallback) moko_dialer_show_missed_calls,
dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER, 34 },
+ { (GCallback) moko_dialer_get_status,
dbus_glib_marshal_moko_dialer_BOOLEAN__POINTER_POINTER, 73 },
+ { (GCallback) moko_dialer_dial,
dbus_glib_marshal_moko_dialer_BOOLEAN__STRING_POINTER, 121 },
+ { (GCallback) moko_dialer_hang_up,
dbus_glib_marshal_moko_dialer_BOOLEAN__STRING_POINTER, 160 },
+};
+
+const DBusGObjectInfo dbus_glib_moko_dialer_object_info = {
+ 0,
+ dbus_glib_moko_dialer_methods,
+ 5,
+"org.openmoko.Dialer\0ShowDialer\0S\0\0org.openmoko.Dialer\0ShowMissedCalls\0S\0\0org.openmoko.Dialer\0GetStatus\0S\0status\0O\0F\0N\0i\0\0org.openmoko.Dialer\0Dial\0S\0number\0I\0s\0\0org.openmoko.Dialer\0HangUp\0S\0message\0I\0s\0\0\0",
+"org.openmoko.Dialer\0IncomingCall\0org.openmoko.Dialer\0OutgoingCall\0org.openmoko.Dialer\0Talking\0org.openmoko.Dialer\0HungUp\0org.openmoko.Dialer\0Rejected\0\0",
+"\0"
+};
+
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-25 14:22:36 +0200 (Mon, 25 Jun 2007)
New Revision: 2344
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer.c
Log:
Make sure dbus input args are const
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer.c
2007-06-25 12:06:56 UTC (rev 2343)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer.c
2007-06-25 12:22:36 UTC (rev 2344)
@@ -135,7 +135,7 @@
}
static gboolean
-moko_dialer_dial (MokoDialer *dialer, gchar *number, GError *error)
+moko_dialer_dial (MokoDialer *dialer, const gchar *number, GError *error)
{
MokoDialerPrivate *priv;
@@ -150,7 +150,7 @@
}
static gboolean
-moko_dialer_hang_up (MokoDialer *dialer, gchar *message, GError *error)
+moko_dialer_hang_up (MokoDialer *dialer, const gchar *message, GError *error)
{
g_return_val_if_fail (MOKO_IS_DIALER (dialer), FALSE);
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-26 11:59:15 +0200 (Tue, 26 Jun 2007)
New Revision: 2345
Modified:
trunk/oe/packages/openmoko-apps/openmoko-dialer_svn.bb
Log:
Fixed to include the dbus service file in the package
Modified: trunk/oe/packages/openmoko-apps/openmoko-dialer_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-dialer_svn.bb 2007-06-25
12:22:36 UTC (rev 2344)
+++ trunk/oe/packages/openmoko-apps/openmoko-dialer_svn.bb 2007-06-26
09:59:15 UTC (rev 2345)
@@ -6,3 +6,4 @@
inherit openmoko
+FILES_${PN} += "${datadir}/dbus-1/services"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
