[gedit-plugins] drawspaces: move register_types to app activatable
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-plugins] drawspaces: move register_types to app activatable
- Date: Mon, 31 Mar 2014 17:06:17 +0000 (UTC)
commit c935da6d64edd41b2a48c9ce3a3402441fc38a96
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Mon Mar 31 15:12:56 2014 +0200
drawspaces: move register_types to app activatable
.../drawspaces/gedit-drawspaces-app-activatable.c | 11 ++++++-----
.../drawspaces/gedit-drawspaces-app-activatable.h | 5 +++--
.../gedit-drawspaces-window-activatable.c | 11 +++++------
.../gedit-drawspaces-window-activatable.h | 5 ++---
4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/plugins/drawspaces/gedit-drawspaces-app-activatable.c
b/plugins/drawspaces/gedit-drawspaces-app-activatable.c
index b462c1f..837f7c3 100644
--- a/plugins/drawspaces/gedit-drawspaces-app-activatable.c
+++ b/plugins/drawspaces/gedit-drawspaces-app-activatable.c
@@ -21,11 +21,11 @@
#endif
#include "gedit-drawspaces-app-activatable.h"
+#include "gedit-drawspaces-window-activatable.h"
#include <gedit/gedit-app.h>
#include <gedit/gedit-app-activatable.h>
#include <gedit/gedit-debug.h>
-#include <libpeas/peas-object-module.h>
#include <gio/gio.h>
#include <glib/gi18n-lib.h>
@@ -157,12 +157,13 @@ gedit_app_activatable_iface_init (GeditAppActivatableInterface *iface)
iface->deactivate = gedit_drawspaces_app_activatable_deactivate;
}
-void
-gedit_drawspaces_app_activatable_register (GTypeModule *module)
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
{
- gedit_drawspaces_app_activatable_register_type (module);
+ gedit_drawspaces_app_activatable_register_type (G_TYPE_MODULE (module));
+ gedit_drawspaces_window_activatable_register (G_TYPE_MODULE (module));
- peas_object_module_register_extension_type (PEAS_OBJECT_MODULE (module),
+ peas_object_module_register_extension_type (module,
GEDIT_TYPE_APP_ACTIVATABLE,
GEDIT_TYPE_DRAWSPACES_APP_ACTIVATABLE);
}
diff --git a/plugins/drawspaces/gedit-drawspaces-app-activatable.h
b/plugins/drawspaces/gedit-drawspaces-app-activatable.h
index 435686e..5021d39 100644
--- a/plugins/drawspaces/gedit-drawspaces-app-activatable.h
+++ b/plugins/drawspaces/gedit-drawspaces-app-activatable.h
@@ -20,6 +20,7 @@
#define __GEDIT_DRAWSPACES_APP_ACTIVATABLE_H__
#include <glib-object.h>
+#include <libpeas/peas-object-module.h>
G_BEGIN_DECLS
@@ -47,9 +48,9 @@ struct _GeditDrawspacesAppActivatableClass
GObjectClass parent_class;
};
-GType gedit_drawspaces_app_activatable_get_type (void) G_GNUC_CONST;
+GType gedit_drawspaces_app_activatable_get_type (void) G_GNUC_CONST;
-void gedit_drawspaces_app_activatable_register (GTypeModule *module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
G_END_DECLS
diff --git a/plugins/drawspaces/gedit-drawspaces-window-activatable.c
b/plugins/drawspaces/gedit-drawspaces-window-activatable.c
index a034cdb..60a52a5 100644
--- a/plugins/drawspaces/gedit-drawspaces-window-activatable.c
+++ b/plugins/drawspaces/gedit-drawspaces-window-activatable.c
@@ -478,16 +478,15 @@ gedit_window_activatable_iface_init (GeditWindowActivatableInterface *iface)
iface->deactivate = gedit_drawspaces_window_activatable_window_deactivate;
}
-G_MODULE_EXPORT void
-peas_register_types (PeasObjectModule *module)
+void
+gedit_drawspaces_window_activatable_register (GTypeModule *module)
{
- gedit_drawspaces_window_activatable_register_type (G_TYPE_MODULE (module));
- gedit_drawspaces_app_activatable_register (G_TYPE_MODULE (module));
+ gedit_drawspaces_window_activatable_register_type (module);
- peas_object_module_register_extension_type (module,
+ peas_object_module_register_extension_type (PEAS_OBJECT_MODULE (module),
GEDIT_TYPE_WINDOW_ACTIVATABLE,
GEDIT_TYPE_DRAWSPACES_WINDOW_ACTIVATABLE);
- peas_object_module_register_extension_type (module,
+ peas_object_module_register_extension_type (PEAS_OBJECT_MODULE (module),
PEAS_GTK_TYPE_CONFIGURABLE,
GEDIT_TYPE_DRAWSPACES_WINDOW_ACTIVATABLE);
}
diff --git a/plugins/drawspaces/gedit-drawspaces-window-activatable.h
b/plugins/drawspaces/gedit-drawspaces-window-activatable.h
index 0398e7d..2979f1c 100644
--- a/plugins/drawspaces/gedit-drawspaces-window-activatable.h
+++ b/plugins/drawspaces/gedit-drawspaces-window-activatable.h
@@ -24,7 +24,6 @@
#include <glib.h>
#include <glib-object.h>
#include <libpeas/peas-extension-base.h>
-#include <libpeas/peas-object-module.h>
G_BEGIN_DECLS
@@ -52,9 +51,9 @@ struct _GeditDrawspacesWindowActivatableClass
PeasExtensionBaseClass parent_class;
};
-GType gedit_drawspaces_window_activatable_get_type (void) G_GNUC_CONST;
+GType gedit_drawspaces_window_activatable_get_type (void) G_GNUC_CONST;
-G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
+void gedit_drawspaces_window_activatable_register (GTypeModule *module);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]