1 --- lablgtk-2.10.1/src/ml_gobject.c.orig Wed May 18 09:58:53 2011 |
|
2 +++ lablgtk-2.10.1/src/ml_gobject.c Wed May 18 10:12:57 2011 |
|
3 @@ -267,7 +267,7 @@ |
|
4 |
|
5 #define DATA (val->data[0]) |
|
6 |
|
7 -static value g_value_get_variant (GValue *val) |
|
8 +static value mylocal_g_value_get_variant (GValue *val) |
|
9 { |
|
10 CAMLparam0(); |
|
11 CAMLlocal1(tmp); |
|
12 @@ -353,9 +353,9 @@ |
|
13 CAMLreturn(ret); |
|
14 } |
|
15 |
|
16 -ML_1 (g_value_get_variant, GValue_val, ID) |
|
17 +ML_1 (mylocal_g_value_get_variant, GValue_val, ID) |
|
18 |
|
19 -static void g_value_set_variant (GValue *val, value arg) |
|
20 +static void mylocal_g_value_set_variant (GValue *val, value arg) |
|
21 { |
|
22 value tag = Field(arg,0); |
|
23 value data = Field(arg,1); |
|
24 @@ -439,7 +439,7 @@ |
|
25 return; |
|
26 } |
|
27 |
|
28 -ML_2 (g_value_set_variant, GValue_val, ID, Unit) |
|
29 +ML_2 (mylocal_g_value_set_variant, GValue_val, ID, Unit) |
|
30 |
|
31 CAMLprim value ml_g_value_get_nativeint(value arg) { |
|
32 GValue *val = GValue_val(arg); |
|
33 @@ -510,7 +510,7 @@ |
|
34 pspec = g_object_class_find_property (class, param->name); |
|
35 if (!pspec) failwith ("Gobject.create"); |
|
36 g_value_init (¶m->value, pspec->value_type); |
|
37 - g_value_set_variant (¶m->value, Field(Field(cell,0),1)); |
|
38 + mylocal_g_value_set_variant (¶m->value, Field(Field(cell,0),1)); |
|
39 param++; |
|
40 } |
|
41 } |
|
42 @@ -533,7 +533,7 @@ |
|
43 value ret; |
|
44 g_value_init (&val, tp); |
|
45 g_object_get_property (obj, String_val(prop), &val); |
|
46 - ret = g_value_get_variant (&val); |
|
47 + ret = mylocal_g_value_get_variant (&val); |
|
48 g_value_unset (&val); |
|
49 return ret; |
|
50 } |
|
51 @@ -544,7 +544,7 @@ |
|
52 GType tp = my_g_object_get_property_type(obj, String_val(prop)); |
|
53 GValue val = {0}; |
|
54 g_value_init (&val, tp); |
|
55 - g_value_set_variant (&val, arg); |
|
56 + mylocal_g_value_set_variant (&val, arg); |
|
57 g_object_set_property (obj, String_val(prop), &val); |
|
58 g_value_unset (&val); |
|
59 return Val_unit; |
|
60 @@ -587,7 +587,7 @@ |
|
61 for (i = 0; i < query.n_params; i++) { |
|
62 g_value_init (&iparams[i+1], |
|
63 query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE); |
|
64 - g_value_set_variant (&iparams[i+1], Field(params,i)); |
|
65 + mylocal_g_value_set_variant (&iparams[i+1], Field(params,i)); |
|
66 } |
|
67 g_signal_emitv (iparams, signal_id, detail, (ret ? GValue_val(ret) : 0)); |
|
68 for (i = 0; i < query.n_params + 1; i++) |
|