aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-object-marshal.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-07 00:32:12 -0500
committerTed Gould <ted@gould.cx>2011-07-07 00:32:12 -0500
commit709208d42375adfe05102f9dbddd638a81776e16 (patch)
treed8399537ea41dbddf2f816e51bb670867da833a0 /libindicator/indicator-object-marshal.c
parent9a18c1c095a420b16431b4f411d627786448a81a (diff)
parentc1034173faf54120c693c984123f343968621359 (diff)
downloadlibayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.tar.gz
libayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.tar.bz2
libayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.zip
* New upstream release.
* Build Fixes * Adding license to test files (LP: #684886) * Bump API/ABI versions appropriately and make easier to edit them in the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618)
Diffstat (limited to 'libindicator/indicator-object-marshal.c')
-rw-r--r--libindicator/indicator-object-marshal.c43
1 files changed, 3 insertions, 40 deletions
diff --git a/libindicator/indicator-object-marshal.c b/libindicator/indicator-object-marshal.c
index a6415d2..3e29260 100644
--- a/libindicator/indicator-object-marshal.c
+++ b/libindicator/indicator-object-marshal.c
@@ -89,44 +89,7 @@ _indicator_object_marshal_VOID__POINTER_UINT_UINT (GClosure *closure,
data2);
}
-/* VOID:UINT,ENUM (./indicator-object-marshal.list:2) */
-void
-_indicator_object_marshal_VOID__UINT_ENUM (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__UINT_ENUM) (gpointer data1,
- guint arg_1,
- gint arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__UINT_ENUM 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__UINT_ENUM) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_uint (param_values + 1),
- g_marshal_value_peek_enum (param_values + 2),
- data2);
-}
-
-/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:3) */
+/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:2) */
void
_indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -165,7 +128,7 @@ _indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure *closure,
data2);
}
-/* VOID:POINTER,UINT (./indicator-object-marshal.list:4) */
+/* VOID:POINTER,UINT (./indicator-object-marshal.list:3) */
void
_indicator_object_marshal_VOID__POINTER_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -202,7 +165,7 @@ _indicator_object_marshal_VOID__POINTER_UINT (GClosure *closure,
data2);
}
-/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:5) */
+/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:4) */
void
_indicator_object_marshal_VOID__POINTER_BOOLEAN (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,