[rhythmbox/wip/sam/meson: 2/3] Remove marshallers
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/wip/sam/meson: 2/3] Remove marshallers
- Date: Tue, 13 Sep 2016 00:41:30 +0000 (UTC)
commit 889f02cbb04a18217a44ea89ee696e6d2e502ce0
Author: Sam Thursfield <sam afuera me uk>
Date: Tue Sep 13 00:55:43 2016 +0100
Remove marshallers
GLib >= 2.30.0 adds g_cclosure_marshal_generic() which removes the need
for us to generate our own custom marshallers.
.gitignore | 2 -
backends/gstreamer/rb-player-gst-xfade.c | 11 ++--
backends/gstreamer/rb-player-gst.c | 9 +--
backends/rb-encoder.c | 10 +--
backends/rb-player-gst-filter.c | 5 +-
backends/rb-player-gst-tee.c | 5 +-
backends/rb-player.c | 22 +++----
configure.ac | 1 -
doc/reference/Makefile.am | 1 -
doc/reference/rhythmbox.types | 1 -
lib/Makefile.am | 18 ------
lib/rb-marshal.list | 61 --------------------
metadata/rb-ext-db.c | 5 +-
plugins/audioscrobbler/rb-audioscrobbler-account.c | 2 +-
plugins/audioscrobbler/rb-audioscrobbler-user.c | 12 ++--
plugins/audioscrobbler/rb-audioscrobbler.c | 2 +-
plugins/daap/rb-dacp-player.c | 2 +-
plugins/ipod/rb-ipod-db.c | 2 +-
plugins/mmkeys/rb-mmkeys-plugin.c | 1 -
plugins/visualizer/rb-visualizer-page.c | 6 +-
podcast/rb-podcast-add-dialog.c | 4 +-
podcast/rb-podcast-manager.c | 7 +-
podcast/rb-podcast-search.c | 4 +-
rhythmdb/rhythmdb-import-job.c | 9 +--
rhythmdb/rhythmdb-property-model.c | 2 +-
rhythmdb/rhythmdb-query-model.c | 13 ++--
rhythmdb/rhythmdb-query-result-list.c | 2 +-
rhythmdb/rhythmdb.c | 27 ++++-----
shell/rb-play-order.c | 3 +-
shell/rb-playlist-manager.c | 8 +-
shell/rb-removable-media-manager.c | 9 +--
shell/rb-shell-player.c | 18 +++---
shell/rb-shell.c | 11 ++--
shell/rb-track-transfer-batch.c | 18 +++---
shell/rb-track-transfer-queue.c | 5 +-
sources/rb-display-page-model.c | 3 +-
sources/rb-display-page-tree.c | 5 +-
sources/rb-display-page.c | 4 +-
sources/rb-source.c | 6 +-
sources/sync/rb-sync-settings.c | 2 +-
sources/sync/rb-sync-state.c | 2 +-
widgets/rb-cell-renderer-pixbuf.c | 2 +-
widgets/rb-cell-renderer-rating.c | 3 +-
widgets/rb-entry-view.c | 14 ++--
widgets/rb-fading-image.c | 4 +-
widgets/rb-import-dialog.c | 4 +-
widgets/rb-property-view.c | 10 ++--
widgets/rb-rating.c | 6 +-
widgets/rb-search-entry.c | 6 +-
widgets/rb-song-info.c | 4 +-
widgets/rb-uri-dialog.c | 2 +-
51 files changed, 143 insertions(+), 252 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4428507..5f11d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,6 @@ help/*/fdl-appendix.xml
help/*/*.stamp
#
-lib/rb-marshal.c
-lib/rb-marshal.h
lib/*-inline.h
#
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index 0f53f25..066963a 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -154,7 +154,6 @@
#include "rb-debug.h"
#include "rb-file-helpers.h"
#include "rb-util.h"
-#include "rb-marshal.h"
#include "rb-player-gst-tee.h"
#include "rb-player-gst-filter.h"
#include "rb-player-gst-helper.h"
@@ -688,7 +687,7 @@ rb_player_gst_xfade_class_init (RBPlayerGstXFadeClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstXFadeClass, prepare_source),
NULL, NULL,
- rb_marshal_VOID__STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -698,7 +697,7 @@ rb_player_gst_xfade_class_init (RBPlayerGstXFadeClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstXFadeClass, can_reuse_stream),
NULL, NULL,
- rb_marshal_BOOLEAN__STRING_STRING_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
3,
G_TYPE_STRING, G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -708,7 +707,7 @@ rb_player_gst_xfade_class_init (RBPlayerGstXFadeClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstXFadeClass, reuse_stream),
NULL, NULL,
- rb_marshal_VOID__STRING_STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
3,
G_TYPE_STRING, G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -718,7 +717,7 @@ rb_player_gst_xfade_class_init (RBPlayerGstXFadeClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no point handling this internally */
NULL, NULL,
- rb_marshal_VOID__POINTER_POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
3,
G_TYPE_POINTER, G_TYPE_STRV, G_TYPE_STRV);
@@ -728,7 +727,7 @@ rb_player_gst_xfade_class_init (RBPlayerGstXFadeClass *klass)
G_SIGNAL_RUN_LAST,
0,
rb_signal_accumulator_value_array, NULL,
- rb_marshal_BOXED__STRING,
+ NULL,
G_TYPE_ARRAY,
1,
G_TYPE_STRING);
diff --git a/backends/gstreamer/rb-player-gst.c b/backends/gstreamer/rb-player-gst.c
index e6ce9dd..a439c32 100644
--- a/backends/gstreamer/rb-player-gst.c
+++ b/backends/gstreamer/rb-player-gst.c
@@ -40,7 +40,6 @@
#include <gst/pbutils/pbutils.h>
#include "rb-debug.h"
-#include "rb-marshal.h"
#include "rb-util.h"
#include "rb-player.h"
@@ -1166,7 +1165,7 @@ rb_player_gst_class_init (RBPlayerGstClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstClass, prepare_source),
NULL, NULL,
- rb_marshal_VOID__STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -1176,7 +1175,7 @@ rb_player_gst_class_init (RBPlayerGstClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstClass, can_reuse_stream),
NULL, NULL,
- rb_marshal_BOOLEAN__STRING_STRING_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
3,
G_TYPE_STRING, G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -1186,7 +1185,7 @@ rb_player_gst_class_init (RBPlayerGstClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerGstClass, reuse_stream),
NULL, NULL,
- rb_marshal_VOID__STRING_STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
3,
G_TYPE_STRING, G_TYPE_STRING, GST_TYPE_ELEMENT);
@@ -1196,7 +1195,7 @@ rb_player_gst_class_init (RBPlayerGstClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no point handling this internally */
NULL, NULL,
- rb_marshal_VOID__POINTER_POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
3,
G_TYPE_POINTER, G_TYPE_STRV, G_TYPE_STRV);
diff --git a/backends/rb-encoder.c b/backends/rb-encoder.c
index 3fa1ddf..1814151 100644
--- a/backends/rb-encoder.c
+++ b/backends/rb-encoder.c
@@ -30,7 +30,6 @@
#include "rb-encoder.h"
#include "rb-encoder-gst.h"
-#include "rb-marshal.h"
/**
* SECTION:rb-encoder
@@ -89,7 +88,7 @@ rb_encoder_factory_class_init (RBEncoderFactoryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEncoderFactoryClass, prepare_source),
NULL, NULL,
- rb_marshal_VOID__STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_OBJECT);
/**
@@ -109,7 +108,7 @@ rb_encoder_factory_class_init (RBEncoderFactoryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEncoderFactoryClass, prepare_sink),
NULL, NULL,
- rb_marshal_VOID__STRING_OBJECT,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_OBJECT);
}
@@ -130,7 +129,7 @@ rb_encoder_interface_init (RBEncoderIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEncoderIface, progress),
NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_DOUBLE);
/**
@@ -149,8 +148,7 @@ rb_encoder_interface_init (RBEncoderIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEncoderIface, completed),
- NULL, NULL,
- rb_marshal_VOID__UINT64_STRING_POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE,
3, G_TYPE_UINT64, G_TYPE_STRING, G_TYPE_POINTER);
}
diff --git a/backends/rb-player-gst-filter.c b/backends/rb-player-gst-filter.c
index 9890460..2ea2f1d 100644
--- a/backends/rb-player-gst-filter.c
+++ b/backends/rb-player-gst-filter.c
@@ -28,7 +28,6 @@
#include <config.h>
#include "rb-player-gst-filter.h"
-#include "rb-marshal.h"
/**
* SECTION:rb-player-gst-filter
@@ -64,7 +63,7 @@ rb_player_gst_filter_interface_init (RBPlayerGstFilterIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerGstFilterIface, filter_inserted),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
@@ -82,7 +81,7 @@ rb_player_gst_filter_interface_init (RBPlayerGstFilterIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerGstFilterIface, filter_pre_remove),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
diff --git a/backends/rb-player-gst-tee.c b/backends/rb-player-gst-tee.c
index dd8240a..755f38f 100644
--- a/backends/rb-player-gst-tee.c
+++ b/backends/rb-player-gst-tee.c
@@ -28,7 +28,6 @@
#include <config.h>
#include "rb-player-gst-tee.h"
-#include "rb-marshal.h"
/**
* SECTION:rb-player-gst-tee
@@ -64,7 +63,7 @@ rb_player_gst_tee_interface_init (RBPlayerGstTeeIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerGstTeeIface, tee_inserted),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
@@ -82,7 +81,7 @@ rb_player_gst_tee_interface_init (RBPlayerGstTeeIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerGstTeeIface, tee_pre_remove),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
}
diff --git a/backends/rb-player.c b/backends/rb-player.c
index f090d22..443b9d4 100644
--- a/backends/rb-player.c
+++ b/backends/rb-player.c
@@ -30,7 +30,6 @@
#include "rb-player.h"
#include "rb-player-gst.h"
#include "rb-player-gst-xfade.h"
-#include "rb-marshal.h"
#include "rb-util.h"
/**
@@ -120,7 +119,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerIface, eos),
NULL, NULL,
- rb_marshal_VOID__POINTER_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
@@ -140,7 +139,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, info),
NULL, NULL,
- rb_marshal_VOID__POINTER_INT_POINTER,
+ NULL,
G_TYPE_NONE,
3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_VALUE);
@@ -159,7 +158,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (RBPlayerIface, error),
NULL, NULL,
- rb_marshal_VOID__POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, G_TYPE_POINTER);
@@ -181,8 +180,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, tick),
- NULL, NULL,
- rb_marshal_VOID__POINTER_INT64_INT64,
+ NULL, NULL, NULL,
G_TYPE_NONE,
3,
G_TYPE_POINTER, G_TYPE_INT64, G_TYPE_INT64);
@@ -203,7 +201,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, buffering),
NULL, NULL,
- rb_marshal_VOID__POINTER_UINT,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, G_TYPE_UINT);
@@ -227,7 +225,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (RBPlayerIface, event),
NULL, NULL,
- rb_marshal_VOID__POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, G_TYPE_POINTER);
@@ -248,7 +246,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, playing_stream),
NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
@@ -266,7 +264,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, volume_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__FLOAT,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_FLOAT);
@@ -286,7 +284,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, image),
NULL, NULL,
- rb_marshal_VOID__POINTER_OBJECT,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, GDK_TYPE_PIXBUF);
@@ -305,7 +303,7 @@ rb_player_interface_init (RBPlayerIface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayerIface, redirect),
NULL, NULL,
- rb_marshal_VOID__POINTER_STRING,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, G_TYPE_STRING);
diff --git a/configure.ac b/configure.ac
index a22d630..8b091a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,7 +382,6 @@ AC_SUBST(HAVE_LIBBRASERO_MEDIA)
AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
AC_SUBST(RHYTHMBOX_CFLAGS)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index e16c32c..933c562 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -37,7 +37,6 @@ IGNORE_HFILES= \
eggwrapbox-enums.h \
md5.h \
rb-cut-and-paste-code.h \
- rb-marshal.h \
rb-thread.h \
rhythmdb-private.h \
rhythmdb-tree.h \
diff --git a/doc/reference/rhythmbox.types b/doc/reference/rhythmbox.types
index 33c94c4..dea279f 100644
--- a/doc/reference/rhythmbox.types
+++ b/doc/reference/rhythmbox.types
@@ -25,7 +25,6 @@
#include "rb-import-errors-source.h"
#include "rb-library-browser.h"
#include "rb-library-source.h"
-#include "rb-marshal.h"
#include "rb-media-player-source.h"
#include "rb-metadata.h"
#include "rb-missing-files-source.h"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0b8afee..ac814cf 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -52,22 +52,4 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/widgets \
$(RHYTHMBOX_CFLAGS)
-BUILT_SOURCES=
-
-CLEAN_FILES = $(BUILT_SOURCES)
-
-rb-marshal.c: rb-marshal.list
- @GLIB_GENMARSHAL@ --prefix=rb_marshal $(srcdir)/rb-marshal.list --header --body > rb-marshal.c
-
-rb-marshal.h: rb-marshal.list
- @GLIB_GENMARSHAL@ --prefix=rb_marshal $(srcdir)/rb-marshal.list --header > rb-marshal.h
-
-BUILT_SOURCES += \
- rb-marshal.c \
- rb-marshal.h
-
-librb_la_SOURCES += $(BUILT_SOURCES)
-
librb_la_LDFLAGS = -export-dynamic
-
-EXTRA_DIST = rb-marshal.list
diff --git a/metadata/rb-ext-db.c b/metadata/rb-ext-db.c
index 1a42624..3e241e6 100644
--- a/metadata/rb-ext-db.c
+++ b/metadata/rb-ext-db.c
@@ -38,7 +38,6 @@
#include <lib/rb-file-helpers.h>
#include <lib/rb-debug.h>
#include <lib/rb-util.h>
-#include <lib/rb-marshal.h>
/**
* SECTION:rb-ext-db
@@ -489,7 +488,7 @@ rb_ext_db_class_init (RBExtDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBExtDBClass, store),
g_signal_accumulator_first_wins, NULL,
- rb_marshal_POINTER__BOXED,
+ NULL,
G_TYPE_POINTER,
1, G_TYPE_VALUE);
/**
@@ -508,7 +507,7 @@ rb_ext_db_class_init (RBExtDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBExtDBClass, load),
g_signal_accumulator_first_wins, NULL,
- rb_marshal_POINTER__BOXED,
+ NULL,
G_TYPE_POINTER,
1, G_TYPE_VALUE);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-account.c
b/plugins/audioscrobbler/rb-audioscrobbler-account.c
index d610734..982bed6 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-account.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-account.c
@@ -179,7 +179,7 @@ rb_audioscrobbler_account_class_init (RBAudioscrobblerAccountClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBAudioscrobblerAccountClass, login_status_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__ENUM,
+ NULL,
G_TYPE_NONE,
1,
RB_TYPE_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-user.c b/plugins/audioscrobbler/rb-audioscrobbler-user.c
index cd37123..eee615a 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-user.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-user.c
@@ -277,7 +277,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RB_TYPE_AUDIOSCROBBLER_USER_DATA);
@@ -288,7 +288,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_PTR_ARRAY);
@@ -299,7 +299,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_PTR_ARRAY);
@@ -310,7 +310,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_PTR_ARRAY);
@@ -321,7 +321,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_PTR_ARRAY);
@@ -332,7 +332,7 @@ rb_audioscrobbler_user_class_init (RBAudioscrobblerUserClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_PTR_ARRAY);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler.c b/plugins/audioscrobbler/rb-audioscrobbler.c
index 4857e87..59a0542 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler.c
@@ -288,7 +288,7 @@ rb_audioscrobbler_class_init (RBAudioscrobblerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBAudioscrobblerClass, authentication_error),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/plugins/daap/rb-dacp-player.c b/plugins/daap/rb-dacp-player.c
index 3c5aaa0..89f13e1 100644
--- a/plugins/daap/rb-dacp-player.c
+++ b/plugins/daap/rb-dacp-player.c
@@ -151,7 +151,7 @@ rb_dacp_player_class_init (RBDACPPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDACPPlayerClass, player_updated),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
object_class->finalize = rb_dacp_player_finalize;
diff --git a/plugins/ipod/rb-ipod-db.c b/plugins/ipod/rb-ipod-db.c
index db90de2..049b825 100644
--- a/plugins/ipod/rb-ipod-db.c
+++ b/plugins/ipod/rb-ipod-db.c
@@ -230,7 +230,7 @@ rb_ipod_db_class_init (RbIpodDbClass *klass)
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/plugins/mmkeys/rb-mmkeys-plugin.c b/plugins/mmkeys/rb-mmkeys-plugin.c
index 37d2eae..4643158 100644
--- a/plugins/mmkeys/rb-mmkeys-plugin.c
+++ b/plugins/mmkeys/rb-mmkeys-plugin.c
@@ -45,7 +45,6 @@
#include "rb-debug.h"
#include "rb-shell.h"
#include "rb-shell-player.h"
-#include "rb-marshal.h"
#ifdef HAVE_MMKEYS
#include <X11/Xlib.h>
diff --git a/plugins/visualizer/rb-visualizer-page.c b/plugins/visualizer/rb-visualizer-page.c
index 4179843..df60030 100644
--- a/plugins/visualizer/rb-visualizer-page.c
+++ b/plugins/visualizer/rb-visualizer-page.c
@@ -420,7 +420,7 @@ rb_visualizer_page_class_init (RBVisualizerPageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
signals[STOP] = g_signal_new ("stop",
@@ -428,7 +428,7 @@ rb_visualizer_page_class_init (RBVisualizerPageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
signals[FULLSCREEN] = g_signal_new_class_handler ("toggle-fullscreen",
@@ -436,7 +436,7 @@ rb_visualizer_page_class_init (RBVisualizerPageClass *klass)
G_SIGNAL_RUN_LAST,
G_CALLBACK (toggle_fullscreen),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
}
diff --git a/podcast/rb-podcast-add-dialog.c b/podcast/rb-podcast-add-dialog.c
index fcbdc7b..4ee7bfd 100644
--- a/podcast/rb-podcast-add-dialog.c
+++ b/podcast/rb-podcast-add-dialog.c
@@ -901,7 +901,7 @@ rb_podcast_add_dialog_class_init (RBPodcastAddDialogClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RBPodcastAddDialogClass, close),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
signals[CLOSED] = g_signal_new ("closed",
@@ -909,7 +909,7 @@ rb_podcast_add_dialog_class_init (RBPodcastAddDialogClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPodcastAddDialogClass, closed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/podcast/rb-podcast-manager.c b/podcast/rb-podcast-manager.c
index 3d082c1..a8446c4 100644
--- a/podcast/rb-podcast-manager.c
+++ b/podcast/rb-podcast-manager.c
@@ -43,7 +43,6 @@
#include "rb-podcast-search.h"
#include "rb-file-helpers.h"
#include "rb-debug.h"
-#include "rb-marshal.h"
#include "rhythmdb.h"
#include "rhythmdb-query-model.h"
#include "rb-podcast-parse.h"
@@ -199,7 +198,7 @@ rb_podcast_manager_class_init (RBPodcastManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPodcastManagerClass, start_download),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -210,7 +209,7 @@ rb_podcast_manager_class_init (RBPodcastManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPodcastManagerClass, finish_download),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -221,7 +220,7 @@ rb_podcast_manager_class_init (RBPodcastManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPodcastManagerClass, feed_updates_available),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
diff --git a/podcast/rb-podcast-search.c b/podcast/rb-podcast-search.c
index 0a963f1..0c8737e 100644
--- a/podcast/rb-podcast-search.c
+++ b/podcast/rb-podcast-search.c
@@ -82,7 +82,7 @@ rb_podcast_search_class_init (RBPodcastSearchClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_POINTER);
signals[FINISHED] = g_signal_new ("finished",
@@ -90,7 +90,7 @@ rb_podcast_search_class_init (RBPodcastSearchClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_BOOLEAN);
}
diff --git a/rhythmdb/rhythmdb-import-job.c b/rhythmdb/rhythmdb-import-job.c
index c201716..8f1442e 100644
--- a/rhythmdb/rhythmdb-import-job.c
+++ b/rhythmdb/rhythmdb-import-job.c
@@ -34,7 +34,6 @@
#include "rhythmdb-entry-type.h"
#include "rb-util.h"
#include "rb-file-helpers.h"
-#include "rb-marshal.h"
#include "rb-debug.h"
#include "rb-missing-plugins.h"
#include "rb-task-progress.h"
@@ -799,7 +798,7 @@ rhythmdb_import_job_class_init (RhythmDBImportJobClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBImportJobClass, entry_added),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1, RHYTHMDB_TYPE_ENTRY);
/**
@@ -816,7 +815,7 @@ rhythmdb_import_job_class_init (RhythmDBImportJobClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBImportJobClass, status_changed),
NULL, NULL,
- rb_marshal_VOID__INT_INT,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_INT, G_TYPE_INT);
/**
@@ -834,7 +833,7 @@ rhythmdb_import_job_class_init (RhythmDBImportJobClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBImportJobClass, scan_complete),
NULL, NULL,
- g_cclosure_marshal_VOID__INT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_INT);
/**
@@ -850,7 +849,7 @@ rhythmdb_import_job_class_init (RhythmDBImportJobClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBImportJobClass, complete),
NULL, NULL,
- g_cclosure_marshal_VOID__INT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_INT);
diff --git a/rhythmdb/rhythmdb-property-model.c b/rhythmdb/rhythmdb-property-model.c
index 648e818..40ddae4 100644
--- a/rhythmdb/rhythmdb-property-model.c
+++ b/rhythmdb/rhythmdb-property-model.c
@@ -245,7 +245,7 @@ rhythmdb_property_model_class_init (RhythmDBPropertyModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBPropertyModelClass, pre_row_deletion),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/rhythmdb/rhythmdb-query-model.c b/rhythmdb/rhythmdb-query-model.c
index f87aa85..98edac9 100644
--- a/rhythmdb/rhythmdb-query-model.c
+++ b/rhythmdb/rhythmdb-query-model.c
@@ -40,7 +40,6 @@
#include "rhythmdb-query-model.h"
#include "rb-debug.h"
#include "rb-tree-dnd.h"
-#include "rb-marshal.h"
#include "rb-util.h"
struct ReverseSortData
@@ -407,7 +406,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, entry_prop_changed),
NULL, NULL,
- rb_marshal_VOID__BOXED_INT_POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
4, RHYTHMDB_TYPE_ENTRY, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER);
/**
@@ -425,7 +424,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, entry_removed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1, RHYTHMDB_TYPE_ENTRY);
/**
@@ -443,7 +442,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, non_entry_dropped),
NULL, NULL,
- rb_marshal_VOID__POINTER_INT,
+ NULL,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
/**
* RhythmDBQueryModel::complete:
@@ -457,7 +456,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, complete),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* RhythmDBQueryModel::post-entry-delete:
@@ -472,7 +471,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, post_entry_delete),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1, RHYTHMDB_TYPE_ENTRY);
/**
@@ -491,7 +490,7 @@ rhythmdb_query_model_class_init (RhythmDBQueryModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryModelClass, filter_entry_drop),
NULL, NULL,
- rb_marshal_BOOLEAN__BOXED,
+ NULL,
G_TYPE_BOOLEAN,
1, RHYTHMDB_TYPE_ENTRY);
diff --git a/rhythmdb/rhythmdb-query-result-list.c b/rhythmdb/rhythmdb-query-result-list.c
index 7107349..e8368ef 100644
--- a/rhythmdb/rhythmdb-query-result-list.c
+++ b/rhythmdb/rhythmdb-query-result-list.c
@@ -129,7 +129,7 @@ rhythmdb_query_result_list_class_init (RhythmDBQueryResultListClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBQueryResultListClass, complete),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
g_type_class_add_private (klass, sizeof (RhythmDBQueryResultListPrivate));
diff --git a/rhythmdb/rhythmdb.c b/rhythmdb/rhythmdb.c
index 4319317..b1828bb 100644
--- a/rhythmdb/rhythmdb.c
+++ b/rhythmdb/rhythmdb.c
@@ -56,7 +56,6 @@
#include <gdk/gdk.h>
-#include "rb-marshal.h"
#include "rb-file-helpers.h"
#include "rb-debug.h"
#include "rb-util.h"
@@ -383,7 +382,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_added),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1, RHYTHMDB_TYPE_ENTRY);
@@ -400,7 +399,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_deleted),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1, RHYTHMDB_TYPE_ENTRY);
@@ -419,7 +418,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_changed),
NULL, NULL,
- rb_marshal_VOID__BOXED_BOXED,
+ NULL,
G_TYPE_NONE, 2,
RHYTHMDB_TYPE_ENTRY, G_TYPE_PTR_ARRAY);
@@ -437,7 +436,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_added),
NULL, NULL,
- rb_marshal_VOID__BOXED_BOXED,
+ NULL,
G_TYPE_NONE,
2, RHYTHMDB_TYPE_ENTRY, RB_TYPE_REFSTRING);
@@ -455,7 +454,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_deleted),
NULL, NULL,
- rb_marshal_VOID__BOXED_BOXED,
+ NULL,
G_TYPE_NONE,
2, RHYTHMDB_TYPE_ENTRY, RB_TYPE_REFSTRING);
@@ -479,7 +478,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (RhythmDBClass, entry_extra_metadata_request),
rhythmdb_entry_extra_metadata_accumulator, NULL,
- rb_marshal_BOXED__BOXED,
+ NULL,
G_TYPE_VALUE, 1,
RHYTHMDB_TYPE_ENTRY);
@@ -499,7 +498,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (RhythmDBClass, entry_extra_metadata_notify),
NULL, NULL,
- rb_marshal_VOID__BOXED_STRING_BOXED,
+ NULL,
G_TYPE_NONE, 3,
RHYTHMDB_TYPE_ENTRY, G_TYPE_STRING, G_TYPE_VALUE);
@@ -522,7 +521,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, entry_extra_metadata_gather),
NULL, NULL,
- rb_marshal_VOID__BOXED_OBJECT,
+ NULL,
G_TYPE_NONE, 2,
RHYTHMDB_TYPE_ENTRY, RB_TYPE_STRING_VALUE_MAP);
@@ -538,7 +537,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, load_complete),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -554,7 +553,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, save_complete),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -572,7 +571,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, save_error),
NULL, NULL,
- rb_marshal_VOID__STRING_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
@@ -592,7 +591,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RhythmDBClass, read_only),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@@ -611,7 +610,7 @@ rhythmdb_class_init (RhythmDBClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no need for an internal handler */
rb_signal_accumulator_object_handled, NULL,
- rb_marshal_OBJECT__VOID,
+ NULL,
G_TYPE_MOUNT_OPERATION,
0);
diff --git a/shell/rb-play-order.c b/shell/rb-play-order.c
index 7a2a076..577fba5 100644
--- a/shell/rb-play-order.c
+++ b/shell/rb-play-order.c
@@ -36,7 +36,6 @@
#include "rb-shell-player.h"
#include "rb-debug.h"
-#include "rb-marshal.h"
/**
* SECTION:rb-play-order
@@ -173,7 +172,7 @@ rb_play_order_class_init (RBPlayOrderClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlayOrderClass, have_next_previous_changed),
NULL, NULL,
- rb_marshal_VOID__BOOLEAN_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
diff --git a/shell/rb-playlist-manager.c b/shell/rb-playlist-manager.c
index 9d4178b..c4809a6 100644
--- a/shell/rb-playlist-manager.c
+++ b/shell/rb-playlist-manager.c
@@ -1998,7 +1998,7 @@ rb_playlist_manager_class_init (RBPlaylistManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlaylistManagerClass, playlist_added),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
@@ -2015,7 +2015,7 @@ rb_playlist_manager_class_init (RBPlaylistManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlaylistManagerClass, playlist_created),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
@@ -2032,7 +2032,7 @@ rb_playlist_manager_class_init (RBPlaylistManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlaylistManagerClass, load_start),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0, G_TYPE_NONE);
/**
@@ -2048,7 +2048,7 @@ rb_playlist_manager_class_init (RBPlaylistManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPlaylistManagerClass, load_finish),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0, G_TYPE_NONE);
diff --git a/shell/rb-removable-media-manager.c b/shell/rb-removable-media-manager.c
index 6d8f73a..2442cc2 100644
--- a/shell/rb-removable-media-manager.c
+++ b/shell/rb-removable-media-manager.c
@@ -56,7 +56,6 @@
#include "rb-dialog.h"
#include "rb-stock-icons.h"
#include "rhythmdb.h"
-#include "rb-marshal.h"
#include "rb-util.h"
static void rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass);
@@ -190,7 +189,7 @@ rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBRemovableMediaManagerClass, medium_added),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_OBJECT);
@@ -213,7 +212,7 @@ rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBRemovableMediaManagerClass, create_source_device),
rb_signal_accumulator_object_handled, NULL,
- rb_marshal_OBJECT__OBJECT,
+ NULL,
RB_TYPE_SOURCE,
1, G_TYPE_OBJECT);
/**
@@ -235,7 +234,7 @@ rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBRemovableMediaManagerClass, create_source_volume),
rb_signal_accumulator_object_handled, NULL,
- rb_marshal_OBJECT__OBJECT,
+ NULL,
RB_TYPE_SOURCE,
1, G_TYPE_VOLUME);
@@ -258,7 +257,7 @@ rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBRemovableMediaManagerClass, create_source_mount),
rb_signal_accumulator_object_handled, NULL,
- rb_marshal_OBJECT__OBJECT_OBJECT,
+ NULL,
RB_TYPE_SOURCE,
2, G_TYPE_MOUNT, MPID_TYPE_DEVICE);
diff --git a/shell/rb-shell-player.c b/shell/rb-shell-player.c
index d197202..4f7ab0a 100644
--- a/shell/rb-shell-player.c
+++ b/shell/rb-shell-player.c
@@ -81,7 +81,6 @@
#include "rb-play-queue-source.h"
#include "rhythmdb.h"
#include "rb-podcast-manager.h"
-#include "rb-marshal.h"
#include "rb-missing-plugins.h"
#include "rb-ext-db.h"
@@ -3628,7 +3627,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, window_title_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -3646,7 +3645,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, elapsed_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__UINT,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_UINT);
@@ -3664,7 +3663,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, playing_source_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
RB_TYPE_SOURCE);
@@ -3682,7 +3681,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, playing_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@@ -3700,7 +3699,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, playing_song_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -3719,7 +3718,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, playing_uri_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -3740,7 +3739,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, playing_song_property_changed),
NULL, NULL,
- rb_marshal_VOID__STRING_STRING_POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
4,
G_TYPE_STRING, G_TYPE_STRING,
@@ -3760,8 +3759,7 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellPlayerClass, elapsed_nano_changed),
- NULL, NULL,
- rb_marshal_VOID__INT64,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
G_TYPE_INT64);
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index f6a671b..555e0ee 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -89,7 +89,6 @@
#include "rb-util.h"
#include "rb-display-page-model.h"
#include "rb-song-info.h"
-#include "rb-marshal.h"
#include "rb-missing-plugins.h"
#include "rb-header.h"
#include "rb-podcast-manager.h"
@@ -1320,7 +1319,7 @@ rb_shell_class_init (RBShellClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellClass, visibility_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@@ -1340,7 +1339,7 @@ rb_shell_class_init (RBShellClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellClass, visibility_changing),
NULL, NULL,
- rb_marshal_BOOLEAN__BOOLEAN_BOOLEAN,
+ NULL,
G_TYPE_BOOLEAN,
2,
G_TYPE_BOOLEAN,
@@ -1362,7 +1361,7 @@ rb_shell_class_init (RBShellClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBShellClass, create_song_info),
NULL, NULL,
- rb_marshal_VOID__OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE,
2,
RB_TYPE_SONG_INFO, G_TYPE_BOOLEAN);
@@ -1380,7 +1379,7 @@ rb_shell_class_init (RBShellClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@@ -1401,7 +1400,7 @@ rb_shell_class_init (RBShellClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- rb_marshal_VOID__UINT_STRING_STRING_STRING_BOOLEAN,
+ NULL,
G_TYPE_NONE,
5,
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
diff --git a/shell/rb-track-transfer-batch.c b/shell/rb-track-transfer-batch.c
index 5918a04..2e39d52 100644
--- a/shell/rb-track-transfer-batch.c
+++ b/shell/rb-track-transfer-batch.c
@@ -36,7 +36,6 @@
#include "rb-track-transfer-batch.h"
#include "rb-track-transfer-queue.h"
#include "rb-encoder.h"
-#include "rb-marshal.h"
#include "rb-debug.h"
#include "rb-util.h"
#include "rb-gst-media-types.h"
@@ -1067,7 +1066,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, started),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -1084,7 +1083,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, complete),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -1102,7 +1101,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, cancelled),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -1124,7 +1123,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, get_dest_uri),
NULL, NULL,
- rb_marshal_STRING__BOXED_STRING_STRING,
+ NULL,
G_TYPE_STRING,
3, RHYTHMDB_TYPE_ENTRY, G_TYPE_STRING, G_TYPE_STRING);
@@ -1144,7 +1143,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, overwrite_prompt),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_STRING);
@@ -1164,7 +1163,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, track_started),
NULL, NULL,
- rb_marshal_VOID__BOXED_STRING,
+ NULL,
G_TYPE_NONE,
2, RHYTHMDB_TYPE_ENTRY, G_TYPE_STRING);
@@ -1186,7 +1185,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, track_progress),
NULL, NULL,
- rb_marshal_VOID__BOXED_STRING_INT_INT_DOUBLE,
+ NULL,
G_TYPE_NONE,
5, RHYTHMDB_TYPE_ENTRY, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_DOUBLE);
@@ -1208,8 +1207,7 @@ rb_track_transfer_batch_class_init (RBTrackTransferBatchClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferBatchClass, track_done),
- NULL, NULL,
- rb_marshal_VOID__BOXED_STRING_UINT64_STRING_POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE,
5, RHYTHMDB_TYPE_ENTRY, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_STRING,
G_TYPE_POINTER);
diff --git a/shell/rb-track-transfer-queue.c b/shell/rb-track-transfer-queue.c
index 75a87cc..d5f9de0 100644
--- a/shell/rb-track-transfer-queue.c
+++ b/shell/rb-track-transfer-queue.c
@@ -30,7 +30,6 @@
#include "rb-track-transfer-queue.h"
#include "rb-encoder.h"
-#include "rb-marshal.h"
#include "rb-library-source.h"
#include "rb-debug.h"
#include "rb-dialog.h"
@@ -748,7 +747,7 @@ rb_track_transfer_queue_class_init (RBTrackTransferQueueClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBTrackTransferQueueClass, transfer_progress),
NULL, NULL,
- rb_marshal_VOID__INT_INT_DOUBLE_INT,
+ NULL,
G_TYPE_NONE,
4, G_TYPE_INT, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_INT);
/**
@@ -768,7 +767,7 @@ rb_track_transfer_queue_class_init (RBTrackTransferQueueClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- rb_marshal_BOOLEAN__POINTER_POINTER_POINTER,
+ NULL,
G_TYPE_BOOLEAN,
3,
G_TYPE_STRV, G_TYPE_STRV, G_TYPE_CLOSURE);
diff --git a/sources/rb-display-page-model.c b/sources/rb-display-page-model.c
index 144ee44..e5c082a 100644
--- a/sources/rb-display-page-model.c
+++ b/sources/rb-display-page-model.c
@@ -39,7 +39,6 @@
#include "rb-display-page-model.h"
#include "rb-tree-dnd.h"
#include "rb-debug.h"
-#include "rb-marshal.h"
#include "rb-playlist-source.h"
#include "rb-auto-playlist-source.h"
#include "rb-static-playlist-source.h"
@@ -911,7 +910,7 @@ rb_display_page_model_class_init (RBDisplayPageModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDisplayPageModelClass, drop_received),
NULL, NULL,
- rb_marshal_VOID__OBJECT_INT_POINTER,
+ NULL,
G_TYPE_NONE,
3,
RB_TYPE_DISPLAY_PAGE, G_TYPE_INT, G_TYPE_POINTER);
diff --git a/sources/rb-display-page-tree.c b/sources/rb-display-page-tree.c
index 2152f2f..e73f0fc 100644
--- a/sources/rb-display-page-tree.c
+++ b/sources/rb-display-page-tree.c
@@ -42,7 +42,6 @@
#include "rb-display-page-tree.h"
#include "rb-display-page-model.h"
#include "rb-debug.h"
-#include "rb-marshal.h"
#include "rb-cell-renderer-pixbuf.h"
#include "gossip-cell-renderer-expander.h"
#include "rb-tree-dnd.h"
@@ -1077,7 +1076,7 @@ rb_display_page_tree_class_init (RBDisplayPageTreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDisplayPageTreeClass, selected),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_OBJECT);
@@ -1096,7 +1095,7 @@ rb_display_page_tree_class_init (RBDisplayPageTreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDisplayPageTreeClass, drop_received),
NULL, NULL,
- rb_marshal_VOID__POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER, G_TYPE_POINTER);
diff --git a/sources/rb-display-page.c b/sources/rb-display-page.c
index 7aae6d5..c2f5b6f 100644
--- a/sources/rb-display-page.c
+++ b/sources/rb-display-page.c
@@ -685,7 +685,7 @@ rb_display_page_class_init (RBDisplayPageClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDisplayPageClass, deleted),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
/**
@@ -700,7 +700,7 @@ rb_display_page_class_init (RBDisplayPageClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBDisplayPageClass, status_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/sources/rb-source.c b/sources/rb-source.c
index 0e4a6a6..b52c4a4 100644
--- a/sources/rb-source.c
+++ b/sources/rb-source.c
@@ -325,7 +325,7 @@ rb_source_class_init (RBSourceClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceClass, filter_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
/**
@@ -340,7 +340,7 @@ rb_source_class_init (RBSourceClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RBSourceClass, reset_filters),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
/**
@@ -355,7 +355,7 @@ rb_source_class_init (RBSourceClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/sources/sync/rb-sync-settings.c b/sources/sync/rb-sync-settings.c
index 86d6633..76841c9 100644
--- a/sources/sync/rb-sync-settings.c
+++ b/sources/sync/rb-sync-settings.c
@@ -436,7 +436,7 @@ rb_sync_settings_class_init (RBSyncSettingsClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSyncSettingsClass, updated),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
g_type_class_add_private (object_class, sizeof (RBSyncSettingsPrivate));
diff --git a/sources/sync/rb-sync-state.c b/sources/sync/rb-sync-state.c
index 6f48035..d072f6a 100644
--- a/sources/sync/rb-sync-state.c
+++ b/sources/sync/rb-sync-state.c
@@ -547,7 +547,7 @@ rb_sync_state_class_init (RBSyncStateClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSyncStateClass, updated),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/widgets/rb-cell-renderer-pixbuf.c b/widgets/rb-cell-renderer-pixbuf.c
index 874efa8..b25811d 100644
--- a/widgets/rb-cell-renderer-pixbuf.c
+++ b/widgets/rb-cell-renderer-pixbuf.c
@@ -87,7 +87,7 @@ rb_cell_renderer_pixbuf_class_init (RBCellRendererPixbufClass *class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (RBCellRendererPixbufClass, pixbuf_clicked),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
diff --git a/widgets/rb-cell-renderer-rating.c b/widgets/rb-cell-renderer-rating.c
index 2043a8a..b9c126e 100644
--- a/widgets/rb-cell-renderer-rating.c
+++ b/widgets/rb-cell-renderer-rating.c
@@ -30,7 +30,6 @@
#include <gtk/gtk.h>
#include "rb-cell-renderer-rating.h"
-#include "rb-marshal.h"
#include "rb-rating-helper.h"
static void rb_cell_renderer_rating_get_property (GObject *object,
@@ -158,7 +157,7 @@ rb_cell_renderer_rating_class_init (RBCellRendererRatingClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBCellRendererRatingClass, rated),
NULL, NULL,
- rb_marshal_VOID__STRING_DOUBLE,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
diff --git a/widgets/rb-entry-view.c b/widgets/rb-entry-view.c
index cb97de4..922aeb9 100644
--- a/widgets/rb-entry-view.c
+++ b/widgets/rb-entry-view.c
@@ -391,7 +391,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, entry_added),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -408,7 +408,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, entry_deleted),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -424,7 +424,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, entries_replaced),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
/**
@@ -441,7 +441,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, entry_activated),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -457,7 +457,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, selection_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
/**
@@ -478,7 +478,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, show_popup),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@@ -496,7 +496,7 @@ rb_entry_view_class_init (RBEntryViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBEntryViewClass, have_selection_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
diff --git a/widgets/rb-fading-image.c b/widgets/rb-fading-image.c
index ff4ad92..88190ed 100644
--- a/widgets/rb-fading-image.c
+++ b/widgets/rb-fading-image.c
@@ -532,7 +532,7 @@ rb_fading_image_class_init (RBFadingImageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1, G_TYPE_STRING);
@@ -549,7 +549,7 @@ rb_fading_image_class_init (RBFadingImageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1, GDK_TYPE_PIXBUF);
diff --git a/widgets/rb-import-dialog.c b/widgets/rb-import-dialog.c
index 5a1fc2b..4baa5b2 100644
--- a/widgets/rb-import-dialog.c
+++ b/widgets/rb-import-dialog.c
@@ -730,7 +730,7 @@ rb_import_dialog_class_init (RBImportDialogClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RBImportDialogClass, close),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
signals[CLOSED] = g_signal_new ("closed",
@@ -738,7 +738,7 @@ rb_import_dialog_class_init (RBImportDialogClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBImportDialogClass, closed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/widgets/rb-property-view.c b/widgets/rb-property-view.c
index 51255fe..7fd58eb 100644
--- a/widgets/rb-property-view.c
+++ b/widgets/rb-property-view.c
@@ -220,7 +220,7 @@ rb_property_view_class_init (RBPropertyViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPropertyViewClass, property_activated),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -240,7 +240,7 @@ rb_property_view_class_init (RBPropertyViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPropertyViewClass, property_selected),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -260,7 +260,7 @@ rb_property_view_class_init (RBPropertyViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPropertyViewClass, properties_selected),
NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
@@ -278,7 +278,7 @@ rb_property_view_class_init (RBPropertyViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPropertyViewClass, selection_reset),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
@@ -296,7 +296,7 @@ rb_property_view_class_init (RBPropertyViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBPropertyViewClass, show_popup),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/widgets/rb-rating.c b/widgets/rb-rating.c
index 5e3b596..1f7724a 100644
--- a/widgets/rb-rating.c
+++ b/widgets/rb-rating.c
@@ -141,7 +141,7 @@ rb_rating_class_init (RBRatingClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBRatingClass, rated),
NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_DOUBLE);
@@ -158,7 +158,7 @@ rb_rating_class_init (RBRatingClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RBRatingClass, set_rating),
NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_DOUBLE);
@@ -176,7 +176,7 @@ rb_rating_class_init (RBRatingClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RBRatingClass, adjust_rating),
NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_DOUBLE);
diff --git a/widgets/rb-search-entry.c b/widgets/rb-search-entry.c
index 99e2ea2..cc30971 100644
--- a/widgets/rb-search-entry.c
+++ b/widgets/rb-search-entry.c
@@ -132,7 +132,7 @@ rb_search_entry_class_init (RBSearchEntryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSearchEntryClass, search),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -150,7 +150,7 @@ rb_search_entry_class_init (RBSearchEntryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSearchEntryClass, activate),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -167,7 +167,7 @@ rb_search_entry_class_init (RBSearchEntryClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSearchEntryClass, show_popup),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE,
0);
diff --git a/widgets/rb-song-info.c b/widgets/rb-song-info.c
index 79f18cf..54810e0 100644
--- a/widgets/rb-song-info.c
+++ b/widgets/rb-song-info.c
@@ -295,7 +295,7 @@ rb_song_info_class_init (RBSongInfoClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSongInfoClass, pre_metadata_change),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
@@ -314,7 +314,7 @@ rb_song_info_class_init (RBSongInfoClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSongInfoClass, post_metadata_change),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
RHYTHMDB_TYPE_ENTRY);
diff --git a/widgets/rb-uri-dialog.c b/widgets/rb-uri-dialog.c
index 7c7a223..a9d1604 100644
--- a/widgets/rb-uri-dialog.c
+++ b/widgets/rb-uri-dialog.c
@@ -127,7 +127,7 @@ rb_uri_dialog_class_init (RBURIDialogClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBURIDialogClass, location_added),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_STRING);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
