Update plugins to use EogWindowActivatable interface

https://bugzilla.gnome.org/show_bug.cgi?id=626091

6 files changed, 73 insertions, 61 deletions

diff --git a/plugins/fullscreen/eog-fullscreen-plugin.c b/plugins/fullscreen/eog-fullscreen-plugin.c
index 0aee28c7..e801f889 100644
--- a/plugins/fullscreen/eog-fullscreen-plugin.c
+++ b/plugins/fullscreen/eog-fullscreen-plugin.c
@@ -10,19 +10,20 @@
 
 #include <eog-debug.h>
 #include <eog-scroll-view.h>
+#include <eog-window-activatable.h>
 
-static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+static void eog_window_activatable_iface_init (EogWindowActivatableInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (EogFullscreenPlugin,
-                                eog_fullscreen_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
-                                                               peas_activatable_iface_init))
+		eog_fullscreen_plugin,
+		PEAS_TYPE_EXTENSION_BASE,
+		0,
+		G_IMPLEMENT_INTERFACE_DYNAMIC (EOG_TYPE_WINDOW_ACTIVATABLE,
+					     eog_window_activatable_iface_init))
 
 enum {
-  PROP_0,
-  PROP_OBJECT
+	PROP_0,
+	PROP_WINDOW
 };
 
 static gboolean
@@ -53,8 +54,8 @@ eog_fullscreen_plugin_set_property (GObject      *object,
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
-		plugin->window = GTK_WIDGET (g_value_dup_object (value));
+	case PROP_WINDOW:
+		plugin->window = EOG_WINDOW (g_value_dup_object (value));
 		break;
 
 	default:
@@ -73,7 +74,7 @@ eog_fullscreen_plugin_get_property (GObject    *object,
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
+	case PROP_WINDOW:
 		g_value_set_object (value, plugin->window);
 		break;
 
@@ -105,10 +106,10 @@ eog_fullscreen_plugin_dispose (GObject *object)
 }
 
 static void
-eog_fullscreen_plugin_activate (PeasActivatable *activatable)
+eog_fullscreen_plugin_activate (EogWindowActivatable *activatable)
 {
 	EogFullscreenPlugin *plugin = EOG_FULLSCREEN_PLUGIN (activatable);
-	GtkWidget *view = eog_window_get_view (EOG_WINDOW (plugin->window));
+	GtkWidget *view = eog_window_get_view (plugin->window);
 
 	eog_debug (DEBUG_PLUGINS);
 
@@ -119,10 +120,10 @@ eog_fullscreen_plugin_activate (PeasActivatable *activatable)
 }
 
 static void
-eog_fullscreen_plugin_deactivate (PeasActivatable *activatable)
+eog_fullscreen_plugin_deactivate (EogWindowActivatable *activatable)
 {
 	EogFullscreenPlugin *plugin = EOG_FULLSCREEN_PLUGIN (activatable);
-	GtkWidget *view = eog_window_get_view (EOG_WINDOW (plugin->window));
+	GtkWidget *view = eog_window_get_view (plugin->window);
 
 	g_signal_handler_disconnect (view, plugin->signal_id);
 }
@@ -136,7 +137,7 @@ eog_fullscreen_plugin_class_init (EogFullscreenPluginClass *klass)
 	object_class->set_property = eog_fullscreen_plugin_set_property;
 	object_class->get_property = eog_fullscreen_plugin_get_property;
 
-	g_object_class_override_property (object_class, PROP_OBJECT, "object");
+	g_object_class_override_property (object_class, PROP_WINDOW, "window");
 }
 
 static void
@@ -145,7 +146,7 @@ eog_fullscreen_plugin_class_finalize (EogFullscreenPluginClass *klass)
 }
 
 static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
+eog_window_activatable_iface_init (EogWindowActivatableInterface *iface)
 {
 	iface->activate = eog_fullscreen_plugin_activate;
 	iface->deactivate = eog_fullscreen_plugin_deactivate;
@@ -156,6 +157,6 @@ peas_register_types (PeasObjectModule *module)
 {
 	eog_fullscreen_plugin_register_type (G_TYPE_MODULE (module));
 	peas_object_module_register_extension_type (module,
-						    PEAS_TYPE_ACTIVATABLE,
+						    EOG_TYPE_WINDOW_ACTIVATABLE,
 						    EOG_TYPE_FULLSCREEN_PLUGIN);
 }
diff --git a/plugins/fullscreen/eog-fullscreen-plugin.h b/plugins/fullscreen/eog-fullscreen-plugin.h
index aff07469..3111d0b7 100644
--- a/plugins/fullscreen/eog-fullscreen-plugin.h
+++ b/plugins/fullscreen/eog-fullscreen-plugin.h
@@ -7,6 +7,8 @@
 #include <libpeas/peas-extension-base.h>
 #include <libpeas/peas-object-module.h>
 
+#include <eog-window.h>
+
 G_BEGIN_DECLS
 
 /*
@@ -30,7 +32,8 @@ typedef struct _EogFullscreenPlugin		EogFullscreenPlugin;
 struct _EogFullscreenPlugin
 {
 	PeasExtensionBase parent_instance;
-	GtkWidget *window;
+
+	EogWindow *window;
 	gulong signal_id;
 };
 
diff --git a/plugins/reload/eog-reload-plugin.c b/plugins/reload/eog-reload-plugin.c
index bd9d4d24..d0ec5aa2 100644
--- a/plugins/reload/eog-reload-plugin.c
+++ b/plugins/reload/eog-reload-plugin.c
@@ -13,24 +13,26 @@
 #include <eog-scroll-view.h>
 #include <eog-thumb-view.h>
 #include <eog-image.h>
+#include <eog-window.h>
+#include <eog-window-activatable.h>
 
-static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+static void eog_window_activatable_iface_init (EogWindowActivatableInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (EogReloadPlugin,
                                 eog_reload_plugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
-                                                               peas_activatable_iface_init))
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (EOG_TYPE_WINDOW_ACTIVATABLE,
+                                                               eog_window_activatable_iface_init))
 
 enum {
   PROP_0,
-  PROP_OBJECT
+  PROP_WINDOW
 };
 
 static void
-reload_cb (GtkAction	*action,
-	  EogWindow *window)
+reload_cb (GtkAction	*action, 
+	   EogWindow *window)
 {
         eog_window_reload_image (window);
 }
@@ -64,8 +66,8 @@ eog_reload_plugin_set_property (GObject      *object,
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
-		plugin->window = GTK_WIDGET (g_value_dup_object (value));
+	case PROP_WINDOW:
+		plugin->window = EOG_WINDOW (g_value_dup_object (value));
 		break;
 
 	default:
@@ -84,7 +86,7 @@ eog_reload_plugin_get_property (GObject    *object,
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
+	case PROP_WINDOW:
 		g_value_set_object (value, plugin->window);
 		break;
 
@@ -116,14 +118,14 @@ eog_reload_plugin_dispose (GObject *object)
 }
 
 static void
-eog_reload_plugin_activate (PeasActivatable *activatable)
+eog_reload_plugin_activate (EogWindowActivatable *activatable)
 {
 	GtkUIManager *manager;
 	EogReloadPlugin *plugin = EOG_RELOAD_PLUGIN (activatable);
 
 	eog_debug (DEBUG_PLUGINS);
 
-	manager = eog_window_get_ui_manager (EOG_WINDOW (plugin->window));
+	manager = eog_window_get_ui_manager (plugin->window);
 
 	plugin->ui_action_group = gtk_action_group_new ("EogReloadPluginActions");
 
@@ -147,14 +149,14 @@ eog_reload_plugin_activate (PeasActivatable *activatable)
 }
 
 static void
-eog_reload_plugin_deactivate	(PeasActivatable *activatable)
+eog_reload_plugin_deactivate (EogWindowActivatable *activatable)
 {
 	GtkUIManager *manager;
 	EogReloadPlugin *plugin = EOG_RELOAD_PLUGIN (activatable);
 
 	eog_debug (DEBUG_PLUGINS);
 
-	manager = eog_window_get_ui_manager (EOG_WINDOW (plugin->window));
+	manager = eog_window_get_ui_manager (plugin->window);
 
 	gtk_ui_manager_remove_ui (manager,
 				  plugin->ui_id);
@@ -172,7 +174,7 @@ eog_reload_plugin_class_init (EogReloadPluginClass *klass)
 	object_class->set_property = eog_reload_plugin_set_property;
 	object_class->get_property = eog_reload_plugin_get_property;
 
-	g_object_class_override_property (object_class, PROP_OBJECT, "object");
+	g_object_class_override_property (object_class, PROP_WINDOW, "window");
 }
 
 static void
@@ -181,7 +183,7 @@ eog_reload_plugin_class_finalize (EogReloadPluginClass *klass)
 }
 
 static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
+eog_window_activatable_iface_init (EogWindowActivatableInterface *iface)
 {
 	iface->activate = eog_reload_plugin_activate;
 	iface->deactivate = eog_reload_plugin_deactivate;
@@ -192,6 +194,6 @@ peas_register_types (PeasObjectModule *module)
 {
 	eog_reload_plugin_register_type (G_TYPE_MODULE (module));
 	peas_object_module_register_extension_type (module,
-						    PEAS_TYPE_ACTIVATABLE,
+						    EOG_TYPE_WINDOW_ACTIVATABLE,
 						    EOG_TYPE_RELOAD_PLUGIN);
 }
diff --git a/plugins/reload/eog-reload-plugin.h b/plugins/reload/eog-reload-plugin.h
index ac3f17cc..99a8196e 100644
--- a/plugins/reload/eog-reload-plugin.h
+++ b/plugins/reload/eog-reload-plugin.h
@@ -31,7 +31,8 @@ typedef struct _EogReloadPlugin		EogReloadPlugin;
 struct _EogReloadPlugin
 {
 	PeasExtensionBase parent_instance;
-	GtkWidget *window;
+
+	EogWindow *window;
 	GtkActionGroup *ui_action_group;
 	guint ui_id;
 };
diff --git a/plugins/statusbar-date/eog-statusbar-date-plugin.c b/plugins/statusbar-date/eog-statusbar-date-plugin.c
index 2bfc04fb..60b72bb3 100644
--- a/plugins/statusbar-date/eog-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eog-statusbar-date-plugin.c
@@ -35,19 +35,21 @@
 #include <eog-image.h>
 #include <eog-thumb-view.h>
 #include <eog-exif-util.h>
+#include <eog-window.h>
+#include <eog-window-activatable.h>
 
-static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+static void eog_window_activatable_iface_init (EogWindowActivatableInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (EogStatusbarDatePlugin,
-                                eog_statusbar_date_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
-                                                               peas_activatable_iface_init))
+		eog_statusbar_date_plugin,
+		PEAS_TYPE_EXTENSION_BASE,
+		0,
+		G_IMPLEMENT_INTERFACE_DYNAMIC (EOG_TYPE_WINDOW_ACTIVATABLE,
+					       eog_window_activatable_iface_init))
 
 enum {
-  PROP_0,
-  PROP_OBJECT
+	PROP_0,
+	PROP_WINDOW
 };
 
 static void
@@ -95,16 +97,16 @@ selection_changed_cb (EogThumbView *view, EogStatusbarDatePlugin *plugin)
 
 static void
 eog_statusbar_date_plugin_set_property (GObject      *object,
-				guint         prop_id,
-				const GValue *value,
-				GParamSpec   *pspec)
+					guint         prop_id,
+					const GValue *value,
+					GParamSpec   *pspec)
 {
 	EogStatusbarDatePlugin *plugin = EOG_STATUSBAR_DATE_PLUGIN (object);
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
-		plugin->window = GTK_WIDGET (g_value_dup_object (value));
+	case PROP_WINDOW:
+		plugin->window = EOG_WINDOW (g_value_dup_object (value));
 		break;
 
 	default:
@@ -115,15 +117,15 @@ eog_statusbar_date_plugin_set_property (GObject      *object,
 
 static void
 eog_statusbar_date_plugin_get_property (GObject    *object,
-				guint       prop_id,
-				GValue     *value,
-				GParamSpec *pspec)
+					guint       prop_id,
+					GValue     *value,
+					GParamSpec *pspec)
 {
 	EogStatusbarDatePlugin *plugin = EOG_STATUSBAR_DATE_PLUGIN (object);
 
 	switch (prop_id)
 	{
-	case PROP_OBJECT:
+	case PROP_WINDOW:
 		g_value_set_object (value, plugin->window);
 		break;
 
@@ -155,10 +157,10 @@ eog_statusbar_date_plugin_dispose (GObject *object)
 }
 
 static void
-eog_statusbar_date_plugin_activate (PeasActivatable *activatable)
+eog_statusbar_date_plugin_activate (EogWindowActivatable *activatable)
 {
 	EogStatusbarDatePlugin *plugin = EOG_STATUSBAR_DATE_PLUGIN (activatable);
-	EogWindow *window = EOG_WINDOW (plugin->window);
+	EogWindow *window = plugin->window;
 	GtkWidget *statusbar = eog_window_get_statusbar (window);
 	GtkWidget *thumbview = eog_window_get_thumb_view (window);
 
@@ -179,10 +181,10 @@ eog_statusbar_date_plugin_activate (PeasActivatable *activatable)
 }
 
 static void
-eog_statusbar_date_plugin_deactivate (PeasActivatable *activatable)
+eog_statusbar_date_plugin_deactivate (EogWindowActivatable *activatable)
 {
 	EogStatusbarDatePlugin *plugin = EOG_STATUSBAR_DATE_PLUGIN (activatable);
-	EogWindow *window = EOG_WINDOW (plugin->window);
+	EogWindow *window = plugin->window;
 	GtkWidget *statusbar = eog_window_get_statusbar (window);
 	GtkWidget *view = eog_window_get_thumb_view (window);
 
@@ -201,7 +203,7 @@ eog_statusbar_date_plugin_class_init (EogStatusbarDatePluginClass *klass)
 	object_class->set_property = eog_statusbar_date_plugin_set_property;
 	object_class->get_property = eog_statusbar_date_plugin_get_property;
 	
-	g_object_class_override_property (object_class, PROP_OBJECT, "object");
+	g_object_class_override_property (object_class, PROP_WINDOW, "window");
  }
 
 static void
@@ -210,7 +212,7 @@ eog_statusbar_date_plugin_class_finalize (EogStatusbarDatePluginClass *klass)
 }
 
 static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
+eog_window_activatable_iface_init (EogWindowActivatableInterface *iface)
 {
 	iface->activate = eog_statusbar_date_plugin_activate;
 	iface->deactivate = eog_statusbar_date_plugin_deactivate;
@@ -221,6 +223,6 @@ peas_register_types (PeasObjectModule *module)
 {
 	eog_statusbar_date_plugin_register_type (G_TYPE_MODULE (module));
 	peas_object_module_register_extension_type (module,
-						    PEAS_TYPE_ACTIVATABLE,
+						    EOG_TYPE_WINDOW_ACTIVATABLE,
 						    EOG_TYPE_STATUSBAR_DATE_PLUGIN);
 }
diff --git a/plugins/statusbar-date/eog-statusbar-date-plugin.h b/plugins/statusbar-date/eog-statusbar-date-plugin.h
index 4f6ded6d..40523843 100644
--- a/plugins/statusbar-date/eog-statusbar-date-plugin.h
+++ b/plugins/statusbar-date/eog-statusbar-date-plugin.h
@@ -28,6 +28,8 @@
 #include <libpeas/peas-extension-base.h>
 #include <libpeas/peas-object-module.h>
 
+#include <eog-window.h>
+
 G_BEGIN_DECLS
 
 /*
@@ -51,7 +53,8 @@ typedef struct _EogStatusbarDatePlugin		EogStatusbarDatePlugin;
 struct _EogStatusbarDatePlugin
 {
 	PeasExtensionBase parent_instance;
-	GtkWidget *window;
+
+	EogWindow *window;
 	GtkWidget *statusbar_date;
 	gulong signal_id;
 };