[eog-plugins/map-plugin-fixes: 4/7] Rename the map plugin in the code too



commit 7cd7dff52b4ce86bb6c7410c63b5447ac171b9cd
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Fri Feb 5 17:08:27 2010 -0500

    Rename the map plugin in the code too

 plugins/map/eog-map-plugin.c |   18 +++++++++---------
 plugins/map/eog-map-plugin.h |   30 +++++++++++++++---------------
 2 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/plugins/map/eog-map-plugin.c b/plugins/map/eog-map-plugin.c
index f66d70b..f2e6120 100644
--- a/plugins/map/eog-map-plugin.c
+++ b/plugins/map/eog-map-plugin.c
@@ -20,9 +20,9 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <libexif/exif-data.h>
 
-#define WINDOW_DATA_KEY "EogChamplainWindowData"
+#define WINDOW_DATA_KEY "EogMapWindowData"
 
-EOG_PLUGIN_REGISTER_TYPE (EogChamplainPlugin, eog_champlain_plugin)
+EOG_PLUGIN_REGISTER_TYPE (EogMapPlugin, eog_map_plugin)
 
 #define FACTOR 2.0
 
@@ -49,18 +49,18 @@ free_window_data (WindowData *data)
 }
 
 static void
-eog_champlain_plugin_init (EogChamplainPlugin *plugin)
+eog_map_plugin_init (EogMapPlugin *plugin)
 {
-	eog_debug_message (DEBUG_PLUGINS, "EogChamplainPlugin initializing");
+	eog_debug_message (DEBUG_PLUGINS, "EogMapPlugin initializing");
 	gtk_clutter_init (NULL, NULL);
 }
 
 static void
-eog_champlain_plugin_finalize (GObject *object)
+eog_map_plugin_finalize (GObject *object)
 {
-	eog_debug_message (DEBUG_PLUGINS, "EogChamplainPlugin finalizing");
+	eog_debug_message (DEBUG_PLUGINS, "EogMapPlugin finalizing");
 
-	G_OBJECT_CLASS (eog_champlain_plugin_parent_class)->finalize (object);
+	G_OBJECT_CLASS (eog_map_plugin_parent_class)->finalize (object);
 }
 
 static ChamplainMarker *
@@ -354,12 +354,12 @@ impl_deactivate (EogPlugin *plugin,
 }
 
 static void
-eog_champlain_plugin_class_init (EogChamplainPluginClass *klass)
+eog_map_plugin_class_init (EogMapPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	EogPluginClass *plugin_class = EOG_PLUGIN_CLASS (klass);
 
-	object_class->finalize = eog_champlain_plugin_finalize;
+	object_class->finalize = eog_map_plugin_finalize;
 
 	plugin_class->activate = impl_activate;
 	plugin_class->deactivate = impl_deactivate;
diff --git a/plugins/map/eog-map-plugin.h b/plugins/map/eog-map-plugin.h
index 808c202..e0c3d82 100644
--- a/plugins/map/eog-map-plugin.h
+++ b/plugins/map/eog-map-plugin.h
@@ -1,5 +1,5 @@
-#ifndef __EOG_CHAMPLAIN_PLUGIN_H__
-#define __EOG_CHAMPLAIN_PLUGIN_H__
+#ifndef __EOG_MAP_PLUGIN_H__
+#define __EOG_MAP_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -10,22 +10,22 @@ G_BEGIN_DECLS
 /*
  * Type checking and casting macros
  */
-#define EOG_TYPE_CHAMPLAIN_PLUGIN		(eog_champlain_plugin_get_type ())
-#define EOG_CHAMPLAIN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), EOG_TYPE_CHAMPLAIN_PLUGIN, EogChamplainPlugin))
-#define EOG_CHAMPLAIN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k),     EOG_TYPE_CHAMPLAIN_PLUGIN, EogChamplainPluginClass))
-#define EOG_IS_CHAMPLAIN_PLUGIN(o)	        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EOG_TYPE_CHAMPLAIN_PLUGIN))
-#define EOG_IS_CHAMPLAIN_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k),    EOG_TYPE_CHAMPLAIN_PLUGIN))
-#define EOG_CHAMPLAIN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o),  EOG_TYPE_CHAMPLAIN_PLUGIN, EogChamplainPluginClass))
+#define EOG_TYPE_MAP_PLUGIN		(eog_map_plugin_get_type ())
+#define EOG_MAP_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EOG_TYPE_MAP_PLUGIN, EogMapPlugin))
+#define EOG_MAP_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k),     EOG_TYPE_MAP_PLUGIN, EogMapPluginClass))
+#define EOG_IS_MAP_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EOG_TYPE_MAP_PLUGIN))
+#define EOG_IS_MAP_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k),    EOG_TYPE_MAP_PLUGIN))
+#define EOG_MAP_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o),  EOG_TYPE_MAP_PLUGIN, EogMapPluginClass))
 
 /* Private structure type */
-typedef struct _EogChamplainPluginPrivate	EogChamplainPluginPrivate;
+typedef struct _EogMapPluginPrivate	EogMapPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _EogChamplainPlugin		EogChamplainPlugin;
+typedef struct _EogMapPlugin		EogMapPlugin;
 
-struct _EogChamplainPlugin
+struct _EogMapPlugin
 {
 	EogPlugin parent_instance;
 };
@@ -33,9 +33,9 @@ struct _EogChamplainPlugin
 /*
  * Class definition
  */
-typedef struct _EogChamplainPluginClass	EogChamplainPluginClass;
+typedef struct _EogMapPluginClass	EogMapPluginClass;
 
-struct _EogChamplainPluginClass
+struct _EogMapPluginClass
 {
 	EogPluginClass parent_class;
 };
@@ -43,11 +43,11 @@ struct _EogChamplainPluginClass
 /*
  * Public methods
  */
-GType	eog_champlain_plugin_get_type		(void) G_GNUC_CONST;
+GType	eog_map_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
 G_MODULE_EXPORT GType register_eog_plugin (GTypeModule *module);
 
 G_END_DECLS
 
-#endif /* __EOG_CHAMPLAIN_PLUGIN_H__ */
+#endif /* __EOG_MAP_PLUGIN_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]