aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-05-20 22:10:21 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-05-20 22:10:21 +0800
commitd7821c77a36d73a8f5352a41f8c68ac9961a6ad3 (patch)
tree3f6a8585392963a94f755fc8616b39371275a4b7
parentf71fd06f1e510c623689918412eb208f44dd6deb (diff)
downloadgsoc2013-evolution-d7821c77a36d73a8f5352a41f8c68ac9961a6ad3.tar.gz
gsoc2013-evolution-d7821c77a36d73a8f5352a41f8c68ac9961a6ad3.tar.zst
gsoc2013-evolution-d7821c77a36d73a8f5352a41f8c68ac9961a6ad3.zip
Move some EPlugin macros from e-plugin-ui.c to e-plugin.h where they belong.
svn path=/trunk/; revision=35520
-rw-r--r--e-util/e-plugin-ui.c20
-rw-r--r--e-util/e-plugin.h19
2 files changed, 19 insertions, 20 deletions
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 16d127a2ef..feb9952efd 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -21,26 +21,6 @@
#include <string.h>
-/* XXX These should moved to e-plugin.h */
-#define E_TYPE_PLUGIN_HOOK \
- (e_plugin_hook_get_type ())
-#define E_PLUGIN_HOOK(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST \
- ((obj), E_TYPE_PLUGIN_HOOK, EPluginHook))
-#define E_PLUGIN_HOOK_CLASS(cls) \
- (G_TYPE_CHECK_CLASS_CAST \
- ((cls), E_TYPE_PLUGIN_HOOK, EPluginHookClass))
-#define E_IS_PLUGIN_HOOK(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE \
- ((obj), E_TYPE_PLUGIN_HOOK))
-#define E_IS_PLUGIN_HOOK_CLASS(cls) \
- (G_TYPE_CHECK_CLASS_TYPE \
- ((cls), E_TYPE_PLUGIN_HOOK))
-#define E_PLUGIN_HOOK_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS \
- ((obj), E_TYPE_PLUGIN_HOOK, EPluginHookClass))
-
-
#define E_PLUGIN_UI_HOOK_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate))
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index c20ed81a7f..119a62156a 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -9,6 +9,25 @@
/* ********************************************************************** */
+/* Standard GObject macros */
+#define E_TYPE_PLUGIN_HOOK \
+ (e_plugin_hook_get_type ())
+#define E_PLUGIN_HOOK(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_PLUGIN_HOOK, EPluginHook))
+#define E_PLUGIN_HOOK_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_PLUGIN_HOOK, EPluginHookClass))
+#define E_IS_PLUGIN_HOOK(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_PLUGIN_HOOK))
+#define E_IS_PLUGIN_HOOK_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_PLUGIN_HOOK))
+#define E_PLUGIN_HOOK_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_PLUGIN_HOOK, EPluginHookClass))
+
typedef struct _EPlugin EPlugin;
typedef struct _EPluginClass EPluginClass;