[rhythmbox] remove 'descriptions' arg from missing-plugins signals
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] remove 'descriptions' arg from missing-plugins signals
- Date: Fri, 18 Jun 2010 14:27:43 +0000 (UTC)
commit 245d5d40d5e4b9cdf5b229b7e2ab9c0a52960d3f
Author: Jonathan Matthew <jonathan d14n org>
Date: Fri Jun 18 22:14:57 2010 +1000
remove 'descriptions' arg from missing-plugins signals
We never used it for anything anyway.
lib/rb-marshal.list | 1 +
podcast/rb-podcast-manager.c | 6 +++---
shell/rb-missing-plugins.c | 1 -
shell/rb-shell-player.c | 9 ++++-----
4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/lib/rb-marshal.list b/lib/rb-marshal.list
index 316ca5b..2e1a9fe 100644
--- a/lib/rb-marshal.list
+++ b/lib/rb-marshal.list
@@ -3,6 +3,7 @@ BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
BOOLEAN:BOXED
BOOLEAN:OBJECT
BOOLEAN:POINTER
+BOOLEAN:POINTER,POINTER
BOOLEAN:POINTER,POINTER,POINTER
BOOLEAN:STRING,BOOLEAN
BOOLEAN:STRING,STRING,OBJECT
diff --git a/podcast/rb-podcast-manager.c b/podcast/rb-podcast-manager.c
index f2d8daa..c220bf2 100644
--- a/podcast/rb-podcast-manager.c
+++ b/podcast/rb-podcast-manager.c
@@ -271,10 +271,10 @@ rb_podcast_manager_class_init (RBPodcastManagerClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no internal handler */
NULL, NULL,
- rb_marshal_BOOLEAN__POINTER_POINTER_POINTER,
+ rb_marshal_BOOLEAN__POINTER_POINTER,
G_TYPE_BOOLEAN,
- 3,
- G_TYPE_STRV, G_TYPE_STRV, G_TYPE_CLOSURE);
+ 2,
+ G_TYPE_STRV, G_TYPE_CLOSURE);
g_type_class_add_private (klass, sizeof (RBPodcastManagerPrivate));
}
diff --git a/shell/rb-missing-plugins.c b/shell/rb-missing-plugins.c
index f279fa6..98c03b2 100644
--- a/shell/rb-missing-plugins.c
+++ b/shell/rb-missing-plugins.c
@@ -244,7 +244,6 @@ missing_plugins_event (RBShell *shell, RBPluginInstallContext *ctx)
static gboolean
missing_plugins_cb (gpointer instance,
const char **details,
- const char **descriptions,
GClosure *closure,
RBShell *shell)
{
diff --git a/shell/rb-shell-player.c b/shell/rb-shell-player.c
index 000e2cf..1157b78 100644
--- a/shell/rb-shell-player.c
+++ b/shell/rb-shell-player.c
@@ -638,7 +638,6 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
* RBShellPlayer::missing-plugins:
* @player: the #RBShellPlayer
* @details: the list of plugin detail strings describing the missing plugins
- * @descriptions: the list of descriptions for the missing plugins
* @closure: a #GClosure to be called when the plugin installation is complete
*
* Emitted when the player backend requires some plugins to be installed in
@@ -651,10 +650,10 @@ rb_shell_player_class_init (RBShellPlayerClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no need for an internal handler */
NULL, NULL,
- rb_marshal_BOOLEAN__POINTER_POINTER_POINTER,
+ rb_marshal_BOOLEAN__POINTER_POINTER,
G_TYPE_BOOLEAN,
- 3,
- G_TYPE_STRV, G_TYPE_STRV, G_TYPE_CLOSURE);
+ 2,
+ G_TYPE_STRV, G_TYPE_CLOSURE);
/**
* RBShellPlayer::elapsed-nano-changed:
@@ -3651,7 +3650,7 @@ missing_plugins_cb (RBPlayer *player,
g_closure_set_marshal (retry, g_cclosure_marshal_VOID__BOOLEAN);
g_signal_emit (sp,
rb_shell_player_signals[MISSING_PLUGINS], 0,
- details, descriptions, retry,
+ details, retry,
&processing);
if (processing) {
/* don't handle any further errors */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]