gnumeric r16880 - in trunk: . component po-functions src

[jody svn gnome org]

Author: jody
Date: Tue Oct 14 10:23:36 2008
New Revision: 16880
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16880&view=rev

Log:
* WIN32 : build fixes

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/component/gnumeric.c
   trunk/po-functions/POTFILES.in
   trunk/src/gnm-plugin.c
   trunk/src/gnm-plugin.h
   trunk/src/gutils.c
   trunk/src/main-application.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Oct 14 10:23:36 2008
@@ -41,6 +41,7 @@
 	* Restore the undocumented magic for solid fills in XLSX conditions.
 	* Work around gtk behavior change in IMContext initialization.
 	* XLS : support anachronistic objs in newer versions. [#546887]
+	* WIN32 : build fixes
 
 J.H.M. Dassen (Ray):
 	* Understand and ignore byte-order markers for CSV/stf probing and

Modified: trunk/component/gnumeric.c
==============================================================================
--- trunk/component/gnumeric.c	(original)
+++ trunk/component/gnumeric.c	Tue Oct 14 10:23:36 2008
@@ -280,7 +280,6 @@
 	GO_COMPONENT_TYPE)
 
 /*************************************************************************************/
-extern GType gnm_plugin_loader_module_get_type (void);
 
 G_MODULE_EXPORT void
 go_plugin_init (GOPlugin *plugin, GOCmdContext *cc)

Modified: trunk/po-functions/POTFILES.in
==============================================================================
--- trunk/po-functions/POTFILES.in	(original)
+++ trunk/po-functions/POTFILES.in	Tue Oct 14 10:23:36 2008
@@ -66,6 +66,7 @@
 src/dialogs/dao-gui-utils.c
 src/dialogs/dialog-about.c
 src/dialogs/dialog-advanced-filter.c
+src/dialogs/dialog-analysis-tool-frequency.c
 src/dialogs/dialog-analysis-tools.c
 src/dialogs/dialog-autocorrect.c
 src/dialogs/dialog-autofilter.c
@@ -175,6 +176,7 @@
 src/style.c
 src/test-pango.c
 src/tools/analysis-exp-smoothing.c
+src/tools/analysis-frequency.c
 src/tools/analysis-histogram.c
 src/tools/analysis-tools.c
 src/tools/dao.c

Modified: trunk/src/gnm-plugin.c
==============================================================================
--- trunk/src/gnm-plugin.c	(original)
+++ trunk/src/gnm-plugin.c	Tue Oct 14 10:23:36 2008
@@ -436,10 +436,6 @@
 typedef GOPluginLoaderModule	  GnmPluginLoaderModule;
 typedef GOPluginLoaderModuleClass GnmPluginLoaderModuleClass;
 
-#define GNM_PLUGIN_LOADER_MODULE_TYPE (gnm_plugin_loader_module_get_type ())
-#define GNM_PLUGIN_LOADER_MODULE(o)  (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_LOADER_MODULE_TYPE, GnmPluginLoaderModule))
-GType gnm_plugin_loader_module_get_type (void);
-
 /*
  * Service - function_group
  */

Modified: trunk/src/gnm-plugin.h
==============================================================================
--- trunk/src/gnm-plugin.h	(original)
+++ trunk/src/gnm-plugin.h	Tue Oct 14 10:23:36 2008
@@ -12,6 +12,10 @@
 
 G_BEGIN_DECLS
 
+#define GNM_PLUGIN_LOADER_MODULE_TYPE (gnm_plugin_loader_module_get_type ())
+#define GNM_PLUGIN_LOADER_MODULE(o)  (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_LOADER_MODULE_TYPE, GnmPluginLoaderModule))
+GType gnm_plugin_loader_module_get_type (void);
+
 #define GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE  (plugin_service_function_group_get_type ())
 #define GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE, PluginServiceFunctionGroup))
 #define IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE))

Modified: trunk/src/gutils.c
==============================================================================
--- trunk/src/gutils.c	(original)
+++ trunk/src/gutils.c	Tue Oct 14 10:23:36 2008
@@ -43,7 +43,7 @@
 {
 	char const *home_dir;
 #ifdef G_OS_WIN32
-	gchar *dir = g_win32_get_package_installation_directory (NULL, NULL);
+	gchar *dir = g_win32_get_package_installation_directory_of_module (NULL);
 	gnumeric_lib_dir = g_build_filename (dir, "lib",
 					     "gnumeric", GNM_VERSION_FULL,
 					     NULL);

Modified: trunk/src/main-application.c
==============================================================================
--- trunk/src/main-application.c	(original)
+++ trunk/src/main-application.c	Tue Oct 14 10:23:36 2008
@@ -328,6 +328,11 @@
 	IOContext *ioc;
 	WorkbookView *wbv;
 	GSList *wbcgs_to_kill = NULL;
+
+#ifdef G_OS_WIN32
+	gboolean has_console;
+#endif
+
 #ifdef GNM_USE_HILDON
 	osso_context_t * osso_context;
 #endif
@@ -336,7 +341,7 @@
 	argv = gnm_pre_parse_init (argc, argv);
 
 #ifdef G_OS_WIN32
-	gboolean has_console = FALSE;
+	has_console = FALSE;
 	{
 		typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD);
 		LPFNATTACHCONSOLE MyAttachConsole;