changecase-plugin: Port to libpeas

Adapted from:
c475e25a50

plugins/changecase/xed-changecase-plugin.c

@@ -28,12 +28,36 @@
 
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
+#include <libpeas/peas-activatable.h>
 
+#include <xed/xed-window.h>
 #include <xed/xed-debug.h>
 
-#define WINDOW_DATA_KEY "XedChangecasePluginWindowData"
+#define XED_CHANGECASE_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
+                                                  XED_TYPE_CHANGECASE_PLUGIN, \
+                                                  XedChangecasePluginPrivate))
 
-XED_PLUGIN_REGISTER_TYPE(XedChangecasePlugin, xed_changecase_plugin)
+static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedChangecasePlugin,
+                                xed_changecase_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
+                                                               peas_activatable_iface_init))
+
+struct _XedChangecasePluginPrivate
+{
+    GtkWidget      *window;
+    GtkActionGroup *action_group;
+    guint           ui_id;
+};
+
+enum
+{
+    PROP_0,
+    PROP_OBJECT
+};
 
 typedef enum {
     TO_UPPER_CASE,
@@ -49,8 +73,7 @@ do_upper_case (GtkTextBuffer *buffer,
 {
     GString *s = g_string_new (NULL);
 
-	while (!gtk_text_iter_is_end (start) &&
+    while (!gtk_text_iter_is_end (start) && !gtk_text_iter_equal (start, end))
-	       !gtk_text_iter_equal (start, end))
     {
         gunichar c, nc;
 
@@ -74,8 +97,7 @@ do_lower_case (GtkTextBuffer *buffer,
 {
     GString *s = g_string_new (NULL);
 
-	while (!gtk_text_iter_is_end (start) &&
+    while (!gtk_text_iter_is_end (start) && !gtk_text_iter_equal (start, end))
-	       !gtk_text_iter_equal (start, end))
     {
         gunichar c, nc;
 
@@ -99,16 +121,19 @@ do_invert_case (GtkTextBuffer *buffer,
 {
     GString *s = g_string_new (NULL);
 
-	while (!gtk_text_iter_is_end (start) &&
+    while (!gtk_text_iter_is_end (start) && !gtk_text_iter_equal (start, end))
-	       !gtk_text_iter_equal (start, end))
     {
         gunichar c, nc;
 
         c = gtk_text_iter_get_char (start);
         if (g_unichar_islower (c))
+        {
             nc = g_unichar_toupper (c);
+        }
         else
+        {
             nc = g_unichar_tolower (c);
+        }
         g_string_append_unichar (s, nc);
 
         gtk_text_iter_forward_char (start);
@@ -127,16 +152,19 @@ do_title_case (GtkTextBuffer *buffer,
 {
     GString *s = g_string_new (NULL);
 
-	while (!gtk_text_iter_is_end (start) &&
+    while (!gtk_text_iter_is_end (start) && !gtk_text_iter_equal (start, end))
-	       !gtk_text_iter_equal (start, end))
     {
         gunichar c, nc;
 
         c = gtk_text_iter_get_char (start);
         if (gtk_text_iter_starts_word (start))
+        {
             nc = g_unichar_totitle (c);
+        }
         else
+        {
             nc = g_unichar_tolower (c);
+        }
         g_string_append_unichar (s, nc);
 
         gtk_text_iter_forward_char (start);
@@ -160,8 +188,7 @@ change_case (XedWindow      *window,
     doc = xed_window_get_active_document (window);
     g_return_if_fail (doc != NULL);
 
-	if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc),
+    if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start, &end))
-						   &start, &end))
     {
         return;
     }
@@ -254,40 +281,81 @@ static void
 xed_changecase_plugin_init (XedChangecasePlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedChangecasePlugin initializing");
+
+    plugin->priv = XED_CHANGECASE_PLUGIN_GET_PRIVATE (plugin);
 }
 
 static void
-xed_changecase_plugin_finalize (GObject *object)
+xed_changecase_plugin_dispose (GObject *object)
 {
-	G_OBJECT_CLASS (xed_changecase_plugin_parent_class)->finalize (object);
+    XedChangecasePlugin *plugin = XED_CHANGECASE_PLUGIN (object);
 
-	xed_debug_message (DEBUG_PLUGINS, "XedChangecasePlugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "XedChangecasePlugin disposing");
+
+    if (plugin->priv->window != NULL)
+    {
+        g_object_unref (plugin->priv->window);
+        plugin->priv->window = NULL;
     }
 
-typedef struct
+    if (plugin->priv->action_group != NULL)
     {
-	GtkActionGroup *action_group;
+        g_object_unref (plugin->priv->action_group);
-	guint           ui_id;
+        plugin->priv->action_group = NULL;
-} WindowData;
+    }
 
-static void
+    G_OBJECT_CLASS (xed_changecase_plugin_parent_class)->dispose (object);
-free_window_data (WindowData *data)
-{
-	g_return_if_fail (data != NULL);
-
-	g_slice_free (WindowData, data);
 }
 
 static void
-update_ui_real (XedWindow  *window,
+xed_changecase_plugin_set_property (GObject      *object,
-		WindowData   *data)
+                                    guint         prop_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
 {
+    XedChangecasePlugin *plugin = XED_CHANGECASE_PLUGIN (object);
+
+    switch (prop_id)
+    {
+        case PROP_OBJECT:
+            plugin->priv->window = GTK_WIDGET (g_value_dup_object (value));
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
+}
+
+static void
+xed_changecase_plugin_get_property (GObject    *object,
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+    XedChangecasePlugin *plugin = XED_CHANGECASE_PLUGIN (object);
+
+    switch (prop_id)
+    {
+        case PROP_OBJECT:
+            g_value_set_object (value, plugin->priv->window);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
+}
+
+static void
+update_ui (XedChangecasePluginPrivate *data)
+{
+    XedWindow *window;
     GtkTextView *view;
     GtkAction *action;
     gboolean sensitive = FALSE;
 
     xed_debug (DEBUG_PLUGINS);
 
+    window = XED_WINDOW (data->window);
     view = GTK_TEXT_VIEW (xed_window_get_active_view (window));
 
     if (view != NULL)
@@ -295,101 +363,104 @@ update_ui_real (XedWindow  *window,
         GtkTextBuffer *buffer;
 
         buffer = gtk_text_view_get_buffer (view);
-		sensitive = (gtk_text_view_get_editable (view) &&
+        sensitive = (gtk_text_view_get_editable (view) && gtk_text_buffer_get_has_selection (buffer));
-			     gtk_text_buffer_get_has_selection (buffer));
     }
 
-	action = gtk_action_group_get_action (data->action_group,
+    action = gtk_action_group_get_action (data->action_group, "ChangeCase");
-					      "ChangeCase");
     gtk_action_set_sensitive (action, sensitive);
 }
 
 static void
-impl_activate (XedPlugin *plugin,
+xed_changecase_plugin_activate (PeasActivatable *activatable)
-	       XedWindow *window)
 {
+    XedChangecasePluginPrivate *data;
+    XedWindow *window;
     GtkUIManager *manager;
-	WindowData *data;
     GError *error = NULL;
 
     xed_debug (DEBUG_PLUGINS);
 
-	data = g_slice_new (WindowData);
+    data = XED_CHANGECASE_PLUGIN (activatable)->priv;
+    window = XED_WINDOW (data->window);
 
     manager = xed_window_get_ui_manager (window);
 
     data->action_group = gtk_action_group_new ("XedChangecasePluginActions");
-	gtk_action_group_set_translation_domain (data->action_group, 
+    gtk_action_group_set_translation_domain (data->action_group, GETTEXT_PACKAGE);
-						 GETTEXT_PACKAGE);
+    gtk_action_group_add_actions (data->action_group, action_entries, G_N_ELEMENTS (action_entries), window);
-	gtk_action_group_add_actions (data->action_group,
-				      action_entries,
-				      G_N_ELEMENTS (action_entries), 
-				      window);
 
     gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
 
-	data->ui_id = gtk_ui_manager_add_ui_from_string (manager,
+    data->ui_id = gtk_ui_manager_add_ui_from_string (manager, submenu, -1, &error);
-							 submenu,
-							 -1,
-							 &error);
     if (data->ui_id == 0)
     {
         g_warning ("%s", error->message);
-		free_window_data (data);
         return;
     }
 
-	g_object_set_data_full (G_OBJECT (window), 
+    update_ui (data);
-				WINDOW_DATA_KEY, 
-				data,
-				(GDestroyNotify) free_window_data);
-
-	update_ui_real (window, data);
 }
 
 static void
-impl_deactivate	(XedPlugin *plugin,
+xed_changecase_plugin_deactivate (PeasActivatable *activatable)
-		 XedWindow *window)
 {
+    XedChangecasePluginPrivate *data;
+    XedWindow *window;
     GtkUIManager *manager;
-	WindowData *data;
 
     xed_debug (DEBUG_PLUGINS);
 
+    data = XED_CHANGECASE_PLUGIN (activatable)->priv;
+    window = XED_WINDOW (data->window);
+
     manager = xed_window_get_ui_manager (window);
 
-	data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-
     gtk_ui_manager_remove_ui (manager, data->ui_id);
     gtk_ui_manager_remove_action_group (manager, data->action_group);
-
-	g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);	
 }
 
 static void
-impl_update_ui (XedPlugin *plugin,
+xed_changecase_plugin_update_state (PeasActivatable *activatable)
-		XedWindow *window)
 {
-	WindowData *data;
-
     xed_debug (DEBUG_PLUGINS);
 
-	data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
+    update_ui (XED_CHANGECASE_PLUGIN (activatable)->priv);
-	g_return_if_fail (data != NULL);
-
-	update_ui_real (window, data);
 }
 
 static void
 xed_changecase_plugin_class_init (XedChangecasePluginClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
 
-	object_class->finalize = xed_changecase_plugin_finalize;
+    object_class->dispose = xed_changecase_plugin_dispose;
+    object_class->set_property = xed_changecase_plugin_set_property;
+    object_class->get_property = xed_changecase_plugin_get_property;
 
-	plugin_class->activate = impl_activate;
+    g_object_class_override_property (object_class, PROP_OBJECT, "object");
-	plugin_class->deactivate = impl_deactivate;
+
-	plugin_class->update_ui = impl_update_ui;
+    g_type_class_add_private (klass, sizeof (XedChangecasePluginPrivate));
+}
+
+static void
+xed_changecase_plugin_class_finalize (XedChangecasePluginClass *klass)
+{
+    /* dummy function - used by G_DEFINE_DYNAMIC_TYPE_EXTENDED */
+}
+
+static void
+peas_activatable_iface_init (PeasActivatableInterface *iface)
+{
+    iface->activate = xed_changecase_plugin_activate;
+    iface->deactivate = xed_changecase_plugin_deactivate;
+    iface->update_state = xed_changecase_plugin_update_state;
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+    xed_changecase_plugin_register_type (G_TYPE_MODULE (module));
+
+    peas_object_module_register_extension_type (module,
+                                                PEAS_TYPE_ACTIVATABLE,
+                                                XED_TYPE_CHANGECASE_PLUGIN);
 }

plugins/changecase/xed-changecase-plugin.h

@@ -25,7 +25,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <xed/xed-plugin.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
 
 G_BEGIN_DECLS
 
@@ -39,6 +40,8 @@ G_BEGIN_DECLS
 #define XED_IS_CHANGECASE_PLUGIN_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_CHANGECASE_PLUGIN))
 #define XED_CHANGECASE_PLUGIN_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_CHANGECASE_PLUGIN, XedChangecasePluginClass))
 
+typedef struct _XedChangecasePluginPrivate XedChangecasePluginPrivate;
+
 /*
  * Main object structure
  */
@@ -46,7 +49,10 @@ typedef struct _XedChangecasePlugin		XedChangecasePlugin;
 
 struct _XedChangecasePlugin
 {
-	XedPlugin parent_instance;
+    PeasExtensionBase parent_instance;
+
+    /*< private > */
+    XedChangecasePluginPrivate *priv;
 };
 
 /*
@@ -56,7 +62,7 @@ typedef struct _XedChangecasePluginClass	XedChangecasePluginClass;
 
 struct _XedChangecasePluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
 /*
@@ -65,7 +71,7 @@ struct _XedChangecasePluginClass
 GType   xed_changecase_plugin_get_type      (void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule *module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS