[totem] Remove totem-skipto-plugin.h

[Philip Withnall <pwithnall src gnome org>]

commit 61c4764ccb0c7103c0bae2653a7ce0323c542610
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 01:32:01 2010 +0100

    Remove totem-skipto-plugin.h
    
    It was unnecessary, since it wasn't properly used by any of the skipto code.

 src/plugins/skipto/Makefile.am           |    1 -
 src/plugins/skipto/totem-skipto-plugin.c |   28 ++++++++++--
 src/plugins/skipto/totem-skipto-plugin.h |   67 ------------------------------
 src/plugins/skipto/totem-skipto.c        |    7 +--
 src/plugins/skipto/totem-skipto.h        |    3 +-
 5 files changed, 27 insertions(+), 79 deletions(-)
---
diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am
index 6d3f8e6..63a31c3 100644
--- a/src/plugins/skipto/Makefile.am
+++ b/src/plugins/skipto/Makefile.am
@@ -24,7 +24,6 @@ common_defines = \
 
 libskipto_la_SOURCES = \
 	totem-skipto-plugin.c	\
-	totem-skipto-plugin.h	\
 	totem-time-entry.c	\
 	totem-time-entry.h	\
 	totem-skipto.c		\
diff --git a/src/plugins/skipto/totem-skipto-plugin.c b/src/plugins/skipto/totem-skipto-plugin.c
index c2f9aaf..d66b7e6 100644
--- a/src/plugins/skipto/totem-skipto-plugin.c
+++ b/src/plugins/skipto/totem-skipto-plugin.c
@@ -36,18 +36,36 @@
 #include <libpeas/peas-activatable.h>
 
 #include "totem-plugin.h"
-#include "totem-skipto-plugin.h"
 #include "totem-skipto.h"
 
-struct TotemSkiptoPluginPrivate
-{
+#define TOTEM_TYPE_SKIPTO_PLUGIN		(totem_skipto_plugin_get_type ())
+#define TOTEM_SKIPTO_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_SKIPTO_PLUGIN, TotemSkiptoPlugin))
+#define TOTEM_SKIPTO_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), TOTEM_TYPE_SKIPTO_PLUGIN, TotemSkiptoPluginClass))
+#define TOTEM_IS_SKIPTO_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), TOTEM_TYPE_SKIPTO_PLUGIN))
+#define TOTEM_IS_SKIPTO_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), TOTEM_TYPE_SKIPTO_PLUGIN))
+#define TOTEM_SKIPTO_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), TOTEM_TYPE_SKIPTO_PLUGIN, TotemSkiptoPluginClass))
+
+typedef struct {
 	TotemSkipto	*st;
 	guint		handler_id_stream_length;
 	guint		handler_id_seekable;
 	guint		handler_id_key_press;
 	guint		ui_merge_id;
 	GtkActionGroup	*action_group;
-};
+} TotemSkiptoPluginPrivate;
+
+typedef struct {
+	PeasExtensionBase parent;
+
+	TotemObject *totem;
+	TotemSkiptoPluginPrivate *priv;
+} TotemSkiptoPlugin;
+
+typedef struct {
+	PeasExtensionBaseClass parent_class;
+} TotemSkiptoPluginClass;
+
+GType totem_skipto_plugin_get_type (void) G_GNUC_CONST;
 
 TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_SKIPTO_PLUGIN, TotemSkiptoPlugin, totem_skipto_plugin)
 
@@ -146,7 +164,7 @@ run_skip_to_dialog (TotemSkiptoPlugin *plugin)
 		return;
 	}
 
-	priv->st = TOTEM_SKIPTO (totem_skipto_new (plugin));
+	priv->st = TOTEM_SKIPTO (totem_skipto_new (plugin->totem));
 	g_signal_connect (G_OBJECT (priv->st), "delete-event",
 			  G_CALLBACK (gtk_widget_destroy), NULL);
 	g_signal_connect (G_OBJECT (priv->st), "response",
diff --git a/src/plugins/skipto/totem-skipto.c b/src/plugins/skipto/totem-skipto.c
index 9a01f16..4f2f03d 100644
--- a/src/plugins/skipto/totem-skipto.c
+++ b/src/plugins/skipto/totem-skipto.c
@@ -38,7 +38,6 @@
 
 #include "totem-dirs.h"
 #include "totem-skipto.h"
-#include "totem-skipto-plugin.h"
 #include "totem-uri.h"
 #include "video-utils.h"
 #include "bacon-video-widget.h"
@@ -161,14 +160,14 @@ tstw_adjustment_value_changed_cb (GtkAdjustment *adjustment, TotemSkipto *skipto
 }
 
 GtkWidget *
-totem_skipto_new (TotemSkiptoPlugin *plugin)
+totem_skipto_new (TotemObject *totem)
 {
 	TotemSkipto *skipto;
 	GtkWidget *container;
 
 	skipto = TOTEM_SKIPTO (g_object_new (TOTEM_TYPE_SKIPTO, NULL));
 
-	skipto->priv->totem = plugin->totem;
+	skipto->priv->totem = totem;
 	skipto->priv->xml = totem_plugin_load_interface ("skipto",
 							 "skipto.ui", TRUE,
 							 NULL, skipto);
@@ -210,7 +209,7 @@ totem_skipto_new (TotemSkiptoPlugin *plugin)
 			    0);         /* padding */
 
 	gtk_window_set_transient_for (GTK_WINDOW (skipto),
-				      totem_get_main_window (plugin->totem));
+				      totem_get_main_window (totem));
 
 	gtk_widget_show_all (GTK_WIDGET (skipto));
 
diff --git a/src/plugins/skipto/totem-skipto.h b/src/plugins/skipto/totem-skipto.h
index 0e12d50..d306ab5 100644
--- a/src/plugins/skipto/totem-skipto.h
+++ b/src/plugins/skipto/totem-skipto.h
@@ -33,7 +33,6 @@
 #include <gtk/gtk.h>
 
 #include "totem.h"
-#include "totem-skipto-plugin.h"
 
 G_BEGIN_DECLS
 
@@ -59,7 +58,7 @@ struct TotemSkiptoClass {
 };
 
 GType totem_skipto_get_type	(void);
-GtkWidget *totem_skipto_new	(TotemSkiptoPlugin *plugin);
+GtkWidget *totem_skipto_new	(TotemObject *totem);
 gint64 totem_skipto_get_range	(TotemSkipto *skipto);
 void totem_skipto_update_range	(TotemSkipto *skipto, gint64 _time);
 void totem_skipto_set_seekable	(TotemSkipto *skipto, gboolean seekable);