port plugins to use the window-construct property.

pluma-file-browser-plugin.c: rename "data" to "priv".

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/sort/pluma-sort-plugin.c b/plugins/sort/pluma-sort-plugin.c
index 385f81e9..2713cab2 100644
--- a/plugins/sort/pluma-sort-plugin.c
+++ b/plugins/sort/pluma-sort-plugin.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
-#include <libpeas/peas-activatable.h>
 
+#include <pluma/pluma-window-activatable.h>
 #include <pluma/pluma-window.h>
 #include <pluma/pluma-debug.h>
 #include <pluma/pluma-utils.h>
@@ -39,11 +39,11 @@
 
 #define MENU_PATH "/MenuBar/EditMenu/EditOps_6"
 
-static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+static void peas_activatable_iface_init (PlumaWindowActivatableInterface *iface);
 
 enum {
 	PROP_0,
-	PROP_OBJECT
+	PROP_WINDOW
 };
 
 typedef struct
@@ -61,7 +61,7 @@ typedef struct
 
 struct _PlumaSortPluginPrivate
 {
-	GtkWidget *window;
+	PlumaWindow *window;
 
 	GtkActionGroup *ui_action_group;
 	guint ui_id;
@@ -80,7 +80,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (PlumaSortPlugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
                                 G_ADD_PRIVATE_DYNAMIC (PlumaSortPlugin)
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (PLUMA_TYPE_WINDOW_ACTIVATABLE,
                                                                peas_activatable_iface_init))
 
 static void sort_cb (GtkAction *action, PlumaSortPlugin *plugin);
@@ -461,8 +461,8 @@ pluma_sort_plugin_set_property (GObject      *object,
 
 	switch (prop_id)
 	{
-		case PROP_OBJECT:
-			plugin->priv->window = GTK_WIDGET (g_value_dup_object (value));
+		case PROP_WINDOW:
+			plugin->priv->window = PLUMA_WINDOW (g_value_dup_object (value));
 			break;
 
 		default:
@@ -481,7 +481,7 @@ pluma_sort_plugin_get_property (GObject    *object,
 
 	switch (prop_id)
 	{
-		case PROP_OBJECT:
+		case PROP_WINDOW:
 			g_value_set_object (value, plugin->priv->window);
 			break;
 
@@ -508,7 +508,7 @@ update_ui (PlumaSortPluginPrivate *data)
 }
 
 static void
-pluma_sort_plugin_activate (PeasActivatable *activatable)
+pluma_sort_plugin_activate (PlumaWindowActivatable *activatable)
 {
 	PlumaSortPlugin *plugin;
 	PlumaSortPluginPrivate *data;
@@ -549,7 +549,7 @@ pluma_sort_plugin_activate (PeasActivatable *activatable)
 }
 
 static void
-pluma_sort_plugin_deactivate (PeasActivatable *activatable)
+pluma_sort_plugin_deactivate (PlumaWindowActivatable *activatable)
 {
 	PlumaSortPluginPrivate *data;
 	PlumaWindow *window;
@@ -569,7 +569,7 @@ pluma_sort_plugin_deactivate (PeasActivatable *activatable)
 }
 
 static void
-pluma_sort_plugin_update_state (PeasActivatable *activatable)
+pluma_sort_plugin_update_state (PlumaWindowActivatable *activatable)
 {
 	pluma_debug (DEBUG_PLUGINS);
 
@@ -615,7 +615,7 @@ pluma_sort_plugin_class_init (PlumaSortPluginClass *klass)
 	object_class->set_property = pluma_sort_plugin_set_property;
 	object_class->get_property = pluma_sort_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
@@ -625,7 +625,7 @@ pluma_sort_plugin_class_finalize (PlumaSortPluginClass *klass)
 }
 
 static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
+peas_activatable_iface_init (PlumaWindowActivatableInterface *iface)
 {
 	iface->activate = pluma_sort_plugin_activate;
 	iface->deactivate = pluma_sort_plugin_deactivate;
@@ -638,6 +638,6 @@ peas_register_types (PeasObjectModule *module)
 	pluma_sort_plugin_register_type (G_TYPE_MODULE (module));
 
 	peas_object_module_register_extension_type (module,
-	                                            PEAS_TYPE_ACTIVATABLE,
+	                                            PLUMA_TYPE_WINDOW_ACTIVATABLE,
 	                                            PLUMA_TYPE_SORT_PLUGIN);
 }