[gnumeric] Compilation: fix namespace issue with io contexts.

[Morten Welinder <mortenw src gnome org>]

commit 5aee0b37ef6b2c566498c02e9876732df4ebe16a
Author: Morten Welinder <terra gnome org>
Date:   Wed Feb 22 12:42:50 2012 -0500

    Compilation: fix namespace issue with io contexts.

 ChangeLog              |    4 ++++
 src/io-context-gtk.c   |   44 ++++++++++++++++++++++----------------------
 src/io-context-gtk.h   |   21 ++++++++++-----------
 src/main-application.c |    6 +++---
 4 files changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index eb2853f..1c76178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-22  Morten Welinder  <terra gnome org>
+
+	* src/io-context-gtk.h: Fix namespace issues.
+
 2012-02-22  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/commands.c (cmd_selection_clear): don't recalc on
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 0c8886a..fa0d04e 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -28,11 +28,11 @@
 #define ICG_POPUP_DELAY 3.0
 
 #define IO_CONTEXT_GTK_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_IO_CONTEXT_GTK, IOContextGtk))
-#define GO_IS_IO_CONTEXT_GTK_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), GO_TYPE_IO_CONTEXT_GTK))
+    (G_TYPE_CHECK_CLASS_CAST ((klass), GNM_TYPE_IO_CONTEXT_GTK, GnmIOContextGtk))
+#define GNM_IS_IO_CONTEXT_GTK_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), GNM_TYPE_IO_CONTEXT_GTK))
 
-struct _GOIOContextGtk {
+struct GnmIOContextGtk_ {
 	GOIOContext parent;
 	GtkWindow *window;
 	GtkWindow *parent_window;
@@ -52,7 +52,7 @@ struct _GOIOContextGtk {
 	gboolean show_warnings;
 };
 
-struct _GOIOContextGtkClass {
+struct GnmIOContextGtkClass_ {
 	GOIOContextClass parent_class;
 };
 
@@ -63,7 +63,7 @@ enum {
 };
 
 static void
-cb_icg_window_destroyed (GObject *window, IOContextGtk *icg)
+cb_icg_window_destroyed (GObject *window, GnmIOContextGtk *icg)
 {
 	icg->window   = NULL;
 	icg->parent_window   = NULL;
@@ -80,7 +80,7 @@ cb_icg_window_destroyed (GObject *window, IOContextGtk *icg)
 static gboolean
 cb_hide_splash (G_GNUC_UNUSED GtkWidget *widget,
 		G_GNUC_UNUSED GdkEventButton *event,
-		IOContextGtk *icg)
+		GnmIOContextGtk *icg)
 {
 	gtk_widget_hide (GTK_WIDGET (icg->window));
 	return TRUE;
@@ -120,7 +120,7 @@ cb_realize (GtkWindow *window, void *dummy)
 }
 
 static void
-icg_show_gui (IOContextGtk *icg)
+icg_show_gui (GnmIOContextGtk *icg)
 {
 	static gboolean init_splash = TRUE;
 	GtkBox *box;
@@ -189,7 +189,7 @@ icg_show_gui (IOContextGtk *icg)
 }
 
 static gboolean
-icg_user_is_impatient (IOContextGtk *icg)
+icg_user_is_impatient (GnmIOContextGtk *icg)
 {
 	gdouble t = g_timer_elapsed (icg->timer, NULL);
 	double progress = icg->progress;
@@ -220,7 +220,7 @@ icg_user_is_impatient (IOContextGtk *icg)
 static char *
 icg_get_password (GOCmdContext *cc, char const *filename)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
 	return icg->show_warnings ?
 		dialog_get_password (icg->window, filename) : NULL;
 }
@@ -228,7 +228,7 @@ icg_get_password (GOCmdContext *cc, char const *filename)
 static void
 icg_progress_set (GOCmdContext *cc, double val)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
 
 	if (!icg->show_splash)
 		return;
@@ -245,7 +245,7 @@ icg_progress_set (GOCmdContext *cc, double val)
 static void
 icg_progress_message_set (GOCmdContext *cc, gchar const *msg)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
 
 	if (!icg->show_splash)
 		return;
@@ -264,7 +264,7 @@ icg_progress_message_set (GOCmdContext *cc, gchar const *msg)
 static void
 icg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
 	if (icg->show_warnings) {
 		GtkWidget *dialog = gnumeric_go_error_info_dialog_new (error);
 		gtk_widget_show_all (GTK_WIDGET (dialog));
@@ -276,7 +276,7 @@ icg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
 static void
 icg_error_error_info_list (GOCmdContext *cc, GSList *error)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
 	if (icg->show_warnings && error != NULL && error->data != NULL) {
 		GtkWidget *dialog = gnumeric_go_error_info_dialog_new
 			(error->data);
@@ -289,13 +289,13 @@ icg_error_error_info_list (GOCmdContext *cc, GSList *error)
 static void
 icg_set_num_files (GOIOContext *icg, guint files_total)
 {
-	IO_CONTEXT_GTK (icg)->files_total = files_total;
+	GNM_IO_CONTEXT_GTK (icg)->files_total = files_total;
 }
 
 static void
 icg_processing_file (GOIOContext *ioc, char const *file)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (ioc);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (ioc);
 
 	g_return_if_fail (icg->files_done < icg->files_total);
 
@@ -339,7 +339,7 @@ icg_processing_file (GOIOContext *ioc, char const *file)
 static void
 icg_finalize (GObject *obj)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (obj);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (obj);
 
 	if (icg->window) {
 		g_signal_handlers_disconnect_by_func (
@@ -364,7 +364,7 @@ static void
 icg_set_property (GObject *obj, guint property_id,
 		  GValue const *value, GParamSpec *pspec)
 {
-	IOContextGtk *icg = IO_CONTEXT_GTK (obj);
+	GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (obj);
 
 	switch (property_id) {
 	case PROP_SHOW_SPLASH :
@@ -412,7 +412,7 @@ icg_class_init (GObjectClass *gobj_klass)
 }
 
 static void
-icg_init (IOContextGtk *icg)
+icg_init (GnmIOContextGtk *icg)
 {
 	icg->show_splash   = TRUE;
 	icg->show_warnings = TRUE;
@@ -430,13 +430,13 @@ icg_init (IOContextGtk *icg)
 	g_timer_start (icg->timer);
 }
 
-GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
+GSF_CLASS_FULL (GnmIOContextGtk, gnm_io_context_gtk,
 		NULL, NULL, icg_class_init, NULL,
 		icg_init, GO_TYPE_IO_CONTEXT, 0,
 		GSF_INTERFACE (icg_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
 
 void
-icg_set_transient_for (IOContextGtk *icg, GtkWindow *parent_window)
+gnm_io_context_gtk_set_transient_for (GnmIOContextGtk *icg, GtkWindow *parent_window)
 {
 	icg->parent_window = parent_window;
 	if (icg->window)
@@ -444,7 +444,7 @@ icg_set_transient_for (IOContextGtk *icg, GtkWindow *parent_window)
 }
 
 gboolean
-icg_get_interrupted (IOContextGtk *icg)
+gnm_io_context_gtk_get_interrupted (GnmIOContextGtk *icg)
 {
 	return icg->interrupted;
 }
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index f80e141..ae92098 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -1,4 +1,3 @@
-/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #ifndef _GNM_IO_CONTEXT_GTK_H_
 # define _GNM_IO_CONTEXT_GTK_H_
 
@@ -9,18 +8,18 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GOIOContextGtk IOContextGtk;
-typedef struct _GOIOContextGtkClass IOContextGtkClass;
+typedef struct GnmIOContextGtk_ GnmIOContextGtk;
+typedef struct GnmIOContextGtkClass_ GnmIOContextGtkClass;
 
-#define GO_TYPE_IO_CONTEXT_GTK    (io_context_gtk_get_type ())
-#define IO_CONTEXT_GTK(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_IO_CONTEXT_GTK, IOContextGtk))
-#define GO_IS_IO_CONTEXT_GTK(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_IO_CONTEXT_GTK))
+#define GNM_TYPE_IO_CONTEXT_GTK    (gnm_io_context_gtk_get_type ())
+#define GNM_IO_CONTEXT_GTK(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_TYPE_IO_CONTEXT_GTK, GnmIOContextGtk))
+#define GNM_IS_IO_CONTEXT_GTK(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNM_TYPE_IO_CONTEXT_GTK))
 
-GType io_context_gtk_get_type (void);
-void  icg_set_transient_for (IOContextGtk *icg, GtkWindow *parent_window);
-gboolean icg_get_interrupted (IOContextGtk *icg);
+GType gnm_io_context_gtk_get_type (void);
+void  gnm_io_context_gtk_set_transient_for (GnmIOContextGtk *icg, GtkWindow *parent_window);
+gboolean gnm_io_context_gtk_get_interrupted (GnmIOContextGtk *icg);
 
 G_END_DECLS
 
diff --git a/src/main-application.c b/src/main-application.c
index 850df90..2d99228 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -281,7 +281,7 @@ main (int argc, char const **argv)
 		return gnm_dump_func_defs (ext_refs_file, 4);
 
 	if (with_gui) {
-		cc = g_object_new (GO_TYPE_IO_CONTEXT_GTK,
+		cc = g_object_new (GNM_TYPE_IO_CONTEXT_GTK,
 				   "show-splash", !gnumeric_no_splash,
 				   "show-warnings", !gnumeric_no_warnings,
 				   NULL);
@@ -334,7 +334,7 @@ main (int argc, char const **argv)
 				geometry = NULL;
 				sheet_update (wb_view_cur_sheet	(wbv));
 				opened_workbook = TRUE;
-				icg_set_transient_for (IO_CONTEXT_GTK (ioc),
+				gnm_io_context_gtk_set_transient_for (GNM_IO_CONTEXT_GTK (ioc),
 						       wbcg_toplevel (wbcg));
 				if (immediate_exit_flag)
 					wbcgs_to_kill = g_slist_prepend (wbcgs_to_kill,
@@ -343,7 +343,7 @@ main (int argc, char const **argv)
 			/* cheesy attempt to keep the ui from freezing during
 			   load */
 			handle_paint_events ();
-			if (icg_get_interrupted (IO_CONTEXT_GTK (ioc)))
+			if (gnm_io_context_gtk_get_interrupted (GNM_IO_CONTEXT_GTK (ioc)))
 				break; /* Don't load any more workbooks */
 		}
 	}