evolution r35520 - trunk/e-util

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue May 20 14:10:21 2008
New Revision: 35520
URL: http://svn.gnome.org/viewvc/evolution?rev=35520&view=rev

Log:
Move some EPlugin macros from e-plugin-ui.c to e-plugin.h where they belong.


Modified:
   trunk/e-util/e-plugin-ui.c
   trunk/e-util/e-plugin.h

Modified: trunk/e-util/e-plugin-ui.c
==============================================================================
--- trunk/e-util/e-plugin-ui.c	(original)
+++ trunk/e-util/e-plugin-ui.c	Tue May 20 14:10:21 2008
@@ -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))

Modified: trunk/e-util/e-plugin.h
==============================================================================
--- trunk/e-util/e-plugin.h	(original)
+++ trunk/e-util/e-plugin.h	Tue May 20 14:10:21 2008
@@ -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;