GNOME.org
 

[gtranslator] Port fullscreen plugin to libpeas.

commit 2e8eee240b7e8e588dca453ebaec6b712962033f
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Nov 7 01:27:05 2010 +0100

    Port fullscreen plugin to libpeas.

 plugins/fullscreen/Makefile.am                     |   18 +--
 plugins/fullscreen/gtr-fullscreen-plugin.c         |  178 ++++++++++++++------
 plugins/fullscreen/gtr-fullscreen-plugin.h         |   45 ++----
 ...desktop.in => gtr-fullscreen.plugin.desktop.in} |    6 +-
 4 files changed, 151 insertions(+), 96 deletions(-)
---
diff --git a/plugins/fullscreen/Makefile.am b/plugins/fullscreen/Makefile.am
index 60aadd7..5bc357e 100644
--- a/plugins/fullscreen/Makefile.am
+++ b/plugins/fullscreen/Makefile.am
@@ -2,14 +2,11 @@
 plugindir = $(libdir)/gtranslator/plugins
 
 INCLUDES = \
-	-I$(top_srcdir) 				\
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/src				\
-	-I$(top_srcdir)/src/plugin-system		\
-	-I$(top_srcdir)/src/dialogs			\
-	$(GTRANSLATOR_CFLAGS) 				\
+	$(GTRANSLATOR_CFLAGS)				\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)				\
-	-DGTR_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	$(DISABLE_DEPRECATED)
 
 plugin_LTLIBRARIES = \
 	libfullscreen.la
@@ -18,23 +15,20 @@ libfullscreen_la_SOURCES = \
 	gtr-fullscreen-plugin.c \
 	gtr-fullscreen-plugin.h
 
-
 libfullscreen_la_LDFLAGS = \
 	$(PLUGIN_LIBTOOL_FLAGS)				\
 	$(GTRANSLATOR_LIBS)
 
 # Plugin Info
 
-plugin_in_files = gtr-fullscreen.gtranslator-plugin.desktop.in
+plugin_in_files = gtr-fullscreen.plugin.desktop.in
 
-%.gtranslator.plugin: %.gtranslator-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gtranslator-plugin.desktop.in=.gtranslator.plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
-
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.c b/plugins/fullscreen/gtr-fullscreen-plugin.c
index 7101487..bd05180 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.c
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.c
@@ -22,17 +22,40 @@
 
 #include "gtr-fullscreen-plugin.h"
 #include "gtr-window.h"
+#include "gtr-window-activatable.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <string.h>
 
-#define WINDOW_DATA_KEY "GtrFullscreenPluginWindowData"
 #define MENU_PATH "/MainMenu/ViewMenu/ViewOps_1"
 
-GTR_PLUGIN_REGISTER_TYPE (GtrFullscreenPlugin, gtr_fullscreen_plugin)
-     static void on_fullscreen_activated (GtkToggleAction * action,
-                                          GtrWindow * window)
+struct _GtrFullscreenPluginPrivate
+{
+  GtrWindow      *window;
+
+  GtkActionGroup *action_group;
+  guint           ui_id;
+};
+
+enum
+{
+  PROP_0,
+  PROP_WINDOW
+};
+
+static void gtr_window_activatable_iface_init (GtrWindowActivatableInterface *iface);
+
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (GtrFullscreenPlugin,
+                                gtr_fullscreen_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (GTR_TYPE_WINDOW_ACTIVATABLE,
+                                                               gtr_window_activatable_iface_init))
+
+static void
+on_fullscreen_activated (GtkToggleAction *action,
+                         GtrWindow       *window)
 {
   if (gtk_toggle_action_get_active (action))
     gtk_window_fullscreen (GTK_WINDOW (window));
@@ -46,99 +69,150 @@ static const GtkToggleActionEntry action_entries[] = {
    G_CALLBACK (on_fullscreen_activated)},
 };
 
-typedef struct
+static void
+gtr_fullscreen_plugin_init (GtrFullscreenPlugin *plugin)
 {
-  GtkActionGroup *action_group;
-  guint ui_id;
-} WindowData;
+  plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
+                                              GTR_TYPE_FULLSCREEN_PLUGIN,
+                                              GtrFullscreenPluginPrivate);
+}
 
 static void
-free_window_data (WindowData * data)
+gtr_fullscreen_plugin_dispose (GObject *object)
 {
-  g_return_if_fail (data != NULL);
+  GtrFullscreenPluginPrivate *priv = GTR_FULLSCREEN_PLUGIN (object)->priv;
+
+  if (priv->window != NULL)
+    {
+      g_object_unref (priv->window);
+      priv->window = NULL;
+    }
 
-  g_free (data);
+  if (priv->action_group != NULL)
+    {
+      g_object_unref (priv->action_group);
+      priv->action_group = NULL;
+    }
+
+  G_OBJECT_CLASS (gtr_fullscreen_plugin_parent_class)->dispose (object);
 }
 
 static void
-gtr_fullscreen_plugin_init (GtrFullscreenPlugin * message_table)
+gtr_fullscreen_plugin_set_property (GObject      *object,
+                                    guint         prop_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
 {
+  GtrFullscreenPluginPrivate *priv = GTR_FULLSCREEN_PLUGIN (object)->priv;
+
+  switch (prop_id)
+    {
+      case PROP_WINDOW:
+        priv->window = GTR_WINDOW (g_value_dup_object (value));
+        break;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
 }
 
 static void
-gtr_fullscreen_plugin_finalize (GObject * object)
+gtr_fullscreen_plugin_get_property (GObject    *object,
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
 {
-  G_OBJECT_CLASS (gtr_fullscreen_plugin_parent_class)->finalize (object);
+  GtrFullscreenPluginPrivate *priv = GTR_FULLSCREEN_PLUGIN (object)->priv;
+
+  switch (prop_id)
+    {
+      case PROP_WINDOW:
+        g_value_set_object (value, priv->window);
+        break;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
 }
 
 static void
-impl_activate (GtrPlugin * plugin, GtrWindow * window)
+gtr_fullscreen_plugin_activate (GtrWindowActivatable *activatable)
 {
+  GtrFullscreenPluginPrivate *priv = GTR_FULLSCREEN_PLUGIN (activatable)->priv;
   GtkUIManager *manager;
-  WindowData *data;
-  GError *error = NULL;
 
-  g_return_if_fail (GTR_IS_WINDOW (window));
+  manager = gtr_window_get_ui_manager (priv->window);
 
-  data = g_new (WindowData, 1);
-
-  manager = gtr_window_get_ui_manager (window);
-
-  data->action_group = gtk_action_group_new ("GtrFullscreenPluginActions");
-  gtk_action_group_set_translation_domain (data->action_group,
+  priv->action_group = gtk_action_group_new ("GtrFullscreenPluginActions");
+  gtk_action_group_set_translation_domain (priv->action_group,
                                            GETTEXT_PACKAGE);
-  gtk_action_group_add_toggle_actions (data->action_group, action_entries,
-                                       G_N_ELEMENTS (action_entries), window);
+  gtk_action_group_add_toggle_actions (priv->action_group, action_entries,
+                                       G_N_ELEMENTS (action_entries),
+                                       priv->window);
 
-  gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
+  gtk_ui_manager_insert_action_group (manager, priv->action_group, -1);
 
-  data->ui_id = gtk_ui_manager_new_merge_id (manager);
+  priv->ui_id = gtk_ui_manager_new_merge_id (manager);
 
-  if (data->ui_id == 0)
+  if (priv->ui_id == 0)
     {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      g_free (data);
+      g_warning ("Couldn not get a new merge id for fullscreen plugin");
       return;
     }
 
-  g_object_set_data_full (G_OBJECT (window),
-                          WINDOW_DATA_KEY,
-                          data, (GDestroyNotify) free_window_data);
-
   gtk_ui_manager_add_ui (manager,
-                         data->ui_id,
+                         priv->ui_id,
                          MENU_PATH,
                          "Fullscreen",
                          "Fullscreen", GTK_UI_MANAGER_MENUITEM, FALSE);
 }
 
 static void
-impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
+gtr_fullscreen_plugin_deactivate (GtrWindowActivatable *activatable)
 {
+  GtrFullscreenPluginPrivate *priv = GTR_FULLSCREEN_PLUGIN (activatable)->priv;
   GtkUIManager *manager;
-  WindowData *data;
 
-  manager = gtr_window_get_ui_manager (window);
+  manager = gtr_window_get_ui_manager (priv->window);
+
+  gtk_ui_manager_remove_ui (manager, priv->ui_id);
+  gtk_ui_manager_remove_action_group (manager, priv->action_group);
+}
+
+static void
+gtr_fullscreen_plugin_class_init (GtrFullscreenPluginClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  data =
-    (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-  g_return_if_fail (data != NULL);
+  object_class->dispose = gtr_fullscreen_plugin_dispose;
+  object_class->set_property = gtr_fullscreen_plugin_set_property;
+  object_class->get_property = gtr_fullscreen_plugin_get_property;
 
-  gtk_ui_manager_remove_ui (manager, data->ui_id);
-  gtk_ui_manager_remove_action_group (manager, data->action_group);
+  g_object_class_override_property (object_class, PROP_WINDOW, "window");
 
-  g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);
+  g_type_class_add_private (klass, sizeof (GtrFullscreenPluginPrivate));
 }
 
 static void
-gtr_fullscreen_plugin_class_init (GtrFullscreenPluginClass * klass)
+gtr_fullscreen_plugin_class_finalize (GtrFullscreenPluginClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+}
 
-  object_class->finalize = gtr_fullscreen_plugin_finalize;
+static void
+gtr_window_activatable_iface_init (GtrWindowActivatableInterface *iface)
+{
+  iface->activate = gtr_fullscreen_plugin_activate;
+  iface->deactivate = gtr_fullscreen_plugin_deactivate;
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+  gtr_fullscreen_plugin_register_type (G_TYPE_MODULE (module));
 
-  plugin_class->activate = impl_activate;
-  plugin_class->deactivate = impl_deactivate;
+  peas_object_module_register_extension_type (module,
+                                              GTR_TYPE_WINDOW_ACTIVATABLE,
+                                              GTR_TYPE_FULLSCREEN_PLUGIN);
 }
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.h b/plugins/fullscreen/gtr-fullscreen-plugin.h
index 8973f00..5850eb2 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.h
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.h
@@ -21,51 +21,38 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
-#include "gtr-plugin.h"
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
 
 G_BEGIN_DECLS
-/*
- * Type checking and casting macros
- */
-#define GTR_TYPE_FULLSCREEN_PLUGIN		(gtr_fullscreen_get_type ())
-#define GTR_FULLSCREEN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEFULLSCREEN_PLUGIN, GtrFullscreenPlugin))
+
+#define GTR_TYPE_FULLSCREEN_PLUGIN		(gtr_fullscreen_plugin_get_type ())
+#define GTR_FULLSCREEN_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_FULLSCREEN_PLUGIN, GtrFullscreenPlugin))
 #define GTR_FULLSCREEN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_FULLSCREEN_PLUGIN, GtrFullscreenPluginClass))
 #define GTR_IS_FULLSCREEN_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_FULLSCREEN_PLUGIN))
-#define GTR_IS_FULLSCREEN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_FULLSCREEN_PLUGIN))
+#define GTR_IS_FULLSCREEN_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_FULLSCREEN_PLUGIN))
 #define GTR_FULLSCREEN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_FULLSCREEN_PLUGIN_PLUGIN, GtrFullscreenPluginClass))
-/* Private structure type */
-typedef struct _GtrFullscreenPluginPrivate GtrFullscreenPluginPrivate;
 
-/*
- * Main object structure
- */
-typedef struct _GtrFullscreenPlugin GtrFullscreenPlugin;
+typedef struct _GtrFullscreenPlugin        GtrFullscreenPlugin;
+typedef struct _GtrFullscreenPluginPrivate GtrFullscreenPluginPrivate;
+typedef struct _GtrFullscreenPluginClass   GtrFullscreenPluginClass;
 
 struct _GtrFullscreenPlugin
 {
-  GtrPlugin parent_instance;
-};
+  PeasExtensionBase parent_instance;
 
-/*
- * Class definition
- */
-typedef struct _GtrFullscreenPluginClass GtrFullscreenPluginClass;
+  /*< private >*/
+  GtrFullscreenPluginPrivate *priv;
+};
 
 struct _GtrFullscreenPluginClass
 {
-  GtrPluginClass parent_class;
+  PeasExtensionBaseClass parent_class;
 };
 
-/*
- * Public methods
- */
-GType
-gtr_fullscreen_plugin_get_type (void)
-  G_GNUC_CONST;
+GType gtr_fullscreen_plugin_get_type (void) G_GNUC_CONST;
 
-/* All the plugins must implement this function */
-     G_MODULE_EXPORT GType register_gtr_plugin (GTypeModule * module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 #endif /* __GTR_FULLSCREEN_PLUGIN_H__ */
diff --git a/plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in b/plugins/fullscreen/gtr-fullscreen.plugin.desktop.in
similarity index 56%
rename from plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in
rename to plugins/fullscreen/gtr-fullscreen.plugin.desktop.in
index 16c92cb..37df5e2 100644
--- a/plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in
+++ b/plugins/fullscreen/gtr-fullscreen.plugin.desktop.in
@@ -1,8 +1,8 @@
-[Gtranslator Plugin]
+[Plugin]
 Module=fullscreen
 IAge=2
 _Name=Fullscreen
 _Description=Place window in the fullscreen state.
-Authors=Ignacio Casal Quinteiro  <nacho resa gmail com>
+Authors=Ignacio Casal Quinteiro <icq gnome org>
 Copyright=Copyright @ 2008 Ignacio Casal Quinteiro
-Website=http://gtranslator.sf.net
+Website=http://projects.gnome.org/gtranslator
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]