Migliore relocation.

diff --git a/.cproject b/.cproject
index 8efd6bf1fee800238953d709d787d829004a2448..1fdb2eeea51cfef9bcc79403ae97d98c784a7fad 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
        <storageModule moduleId="org.eclipse.cdt.core.settings">
-               <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207">
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)">
+               <cconfiguration id="0.592916386">
+                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.592916386" moduleId="org.eclipse.cdt.core.settings" name="Default">
                                <externalSettings/>
                                <extensions>
+                                       <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-                                       <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-                                       <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-                                       <extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
-                                       <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg">
-                                       <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207.1057170607" name="/" resourcePath="">
-                                               <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1245881488" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
-                                                       <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.928517502" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
-                                                       <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.1015570675" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.1719630296" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
-                                                               <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1975512372" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207" valueType="string"/>
+                               <configuration buildProperties="" description="" id="0.592916386" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+                                       <folderInfo id="0.592916386." name="/" resourcePath="">
+                                               <toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.191931934" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+                                                       <targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.191931934.1039889473" name=""/>
+                                                       <builder id="org.eclipse.cdt.build.core.settings.default.builder.1848867928" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+                                                       <tool id="org.eclipse.cdt.build.core.settings.holder.libs.620886343" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+                                                       <tool id="org.eclipse.cdt.build.core.settings.holder.1473604265" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+                                                               <option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1589114181" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+                                                               <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.127941636" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
                                                        </tool>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.786662876" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1134244772" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
-                                                               <option id="gnu.c.compiler.option.include.paths.960712418" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-                                                                       <listOptionValue builtIn="false" value="&quot;H:\finestre_libere\sviluppo\development_environment_gtk3\mingw\include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;H:\finestre_libere\sviluppo\development_environment_gtk3\mingw\include\glib-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;H:\finestre_libere\sviluppo\development_environment_gtk3\mingw\include\libgda-5.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;H:\finestre_libere\sviluppo\development_environment_gtk3\mingw\include\evolution-data-server-2.32&quot;"/>
+                                                       <tool id="org.eclipse.cdt.build.core.settings.holder.724923490" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+                                                               <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1253257548" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+                                                       </tool>
+                                                       <tool id="org.eclipse.cdt.build.core.settings.holder.1735423204" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+                                                               <option id="org.eclipse.cdt.build.core.settings.holder.incpaths.40069304" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\i686-w64-mingw32\include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\include\glib-2.0&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\include\gtk-3.0&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\include\libgda-5.0&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\msys64\mingw32\include\evolution-data-server&quot;"/>
                                                                </option>
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1050136525" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                                               <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1810670508" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
                                                        </tool>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.890585668" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"/>
                                                </toolChain>
                                        </folderInfo>
                                </configuration>
@@ -41,19 +46,22 @@
                </cconfiguration>
        </storageModule>
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-               <project id="libsolipa (gtk3).null.1515999968" name="libsolipa (gtk3)"/>
+               <project id="libsolipa.null.442958965" name="libsolipa"/>
        </storageModule>
-       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
        <storageModule moduleId="scannerConfiguration">
                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477;org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477.912877605;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.2074081626;cdt.managedbuild.tool.gnu.c.compiler.input.1589342168">
                        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
                </scannerConfigBuildInfo>
-               <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207;org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207.1057170607;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1134244772;cdt.managedbuild.tool.gnu.c.compiler.input.1050136525">
+               <scannerConfigBuildInfo instanceId="0.592916386">
                        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                </scannerConfigBuildInfo>
                <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2086840760;org.eclipse.linuxtools.cdt.autotools.core.toolChain.2086840760.1254459493;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.806206756;cdt.managedbuild.tool.gnu.c.compiler.input.1147008075">
                        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
                </scannerConfigBuildInfo>
+               <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207;org.eclipse.linuxtools.cdt.autotools.core.toolChain.1618029207.1057170607;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1134244772;cdt.managedbuild.tool.gnu.c.compiler.input.1050136525">
+                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+               </scannerConfigBuildInfo>
        </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 </cproject>

diff --git a/src/solipa.c b/src/solipa.c
index 77d4183de5d43d012d31c347510ad1ed1797933a..cf82eb6854d946cfc8016f4b2099350a2d6ae480 100644 (file)
--- a/src/solipa.c
+++ b/src/solipa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2015 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,10 @@
 
 #include <gtk/gtk.h>
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
 #include "solipa.h"
 #include "camelsession.h"
 #include "utils.h"
@@ -79,6 +83,25 @@ solipa_init (Solipa *solipa)
        SolipaPrivate *priv = SOLIPA_GET_PRIVATE (solipa);
 }
 
+#ifdef G_OS_WIN32
+static HMODULE hmodule;
+
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+         DWORD     fdwReason,
+         LPVOID    lpvReserved)
+{
+       switch (fdwReason)
+               {
+                       case DLL_PROCESS_ATTACH:
+                               hmodule = hinstDLL;
+                               break;
+               }
+
+       return TRUE;
+}
+#endif
+
 /**
  * solipa_new:
  *
@@ -112,7 +135,7 @@ Solipa
        gchar *moddir;
        gchar *p;
 
-       moddir = g_win32_get_package_installation_directory_of_module (NULL);
+       moddir = g_win32_get_package_installation_directory_of_module (hmodule);
 
        p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR));
        if (p != NULL