# HG changeset patch # User Paula Stanciu # Date 1211741067 -10800 # Node ID 6cc858a726b8bab1b7785930cae96b60b2e168a9 # Parent 5808b64d3f689695ba677655042f0d58c5bc31d6 added the marshal files diff -r 5808b64d3f68 -r 6cc858a726b8 src/bluetooth/bluetooth.c --- a/src/bluetooth/bluetooth.c Sun May 25 21:29:48 2008 +0300 +++ b/src/bluetooth/bluetooth.c Sun May 25 21:44:27 2008 +0300 @@ -61,7 +61,10 @@ void refresh_call(void){ - discover_devices() + if(discover_finish == 0) + discover_devices(); + else + printf("Scanning please wait!\n"); printf("refresh function called\n"); } @@ -103,6 +106,7 @@ static void discovery_started(DBusGProxy *object, gpointer user_data) { g_print("Signal: DiscoveryStarted()\n"); + discover_finish = 1; } static void remote_name_updated(DBusGProxy *object, const char *address, char *name, gpointer user_data) @@ -143,6 +147,7 @@ { g_print("Signal: DiscoveryCompleted()\n"); print_results(); + discover_finish =0; } diff -r 5808b64d3f68 -r 6cc858a726b8 src/bluetooth/marshal.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/bluetooth/marshal.c Sun May 25 21:44:27 2008 +0300 @@ -0,0 +1,125 @@ + +#include + + +#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 */ + + +/* VOID:STRING,UINT,INT (marshal.list:1) */ +void +marshal_VOID__STRING_UINT_INT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__STRING_UINT_INT) (gpointer data1, + gpointer arg_1, + guint arg_2, + gint arg_3, + gpointer data2); + register GMarshalFunc_VOID__STRING_UINT_INT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 4); + + 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_VOID__STRING_UINT_INT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_string (param_values + 1), + g_marshal_value_peek_uint (param_values + 2), + g_marshal_value_peek_int (param_values + 3), + data2); +} + +/* VOID:STRING,STRING (marshal.list:2) */ +void +marshal_VOID__STRING_STRING (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__STRING_STRING callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + 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_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_string (param_values + 1), + g_marshal_value_peek_string (param_values + 2), + data2); +} + diff -r 5808b64d3f68 -r 6cc858a726b8 src/bluetooth/marshal.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/bluetooth/marshal.h Sun May 25 21:44:27 2008 +0300 @@ -0,0 +1,28 @@ + +#ifndef __marshal_MARSHAL_H__ +#define __marshal_MARSHAL_H__ + +#include + +G_BEGIN_DECLS + +/* VOID:STRING,UINT,INT (marshal.list:1) */ +extern void marshal_VOID__STRING_UINT_INT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + +/* VOID:STRING,STRING (marshal.list:2) */ +extern void marshal_VOID__STRING_STRING (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + +G_END_DECLS + +#endif /* __marshal_MARSHAL_H__ */ + diff -r 5808b64d3f68 -r 6cc858a726b8 src/bluetooth/marshal.list --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/bluetooth/marshal.list Sun May 25 21:44:27 2008 +0300 @@ -0,0 +1,2 @@ +VOID:STRING,UINT,INT +VOID:STRING,STRING