[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_100-1-g21cddcb

[chtibzh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  21cddcb4d4bda30655e2504905d8f99eb4724dd8 (commit)
      from  4ba406e0ab66d3811e3a8fb52d45b84a68c4ef4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21cddcb4d4bda30655e2504905d8f99eb4724dd8
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date:   Sat Feb 19 11:58:16 2011 +0100

    Windows 0.7.100 version without OFX plugin (-DNOOFX=1)

-----------------------------------------------------------------------

Changes:
diff --git a/src/gsb_plugins.c b/src/gsb_plugins.c
index 5cf6727..17fa2dc 100644
--- a/src/gsb_plugins.c
+++ b/src/gsb_plugins.c
@@ -61,12 +61,14 @@ void gsb_plugins_scan_dir ( const char *dirname )
     plugin -> plugin_register ();
     plugins = g_slist_append ( plugins, plugin );
 
+#ifndef NOOFX
     plugin = g_malloc0 ( sizeof ( gsb_plugin ) );
     plugin -> name = "ofx";
     plugin -> plugin_register = &ofx_plugin_register;
     plugin -> plugin_run =      &ofx_plugin_run;
     plugin -> plugin_register ();
     plugins = g_slist_append ( plugins, plugin );
+#endif /* NOODX */
 
     plugin = g_malloc0 ( sizeof ( gsb_plugin ) );
     plugin -> name = "openssl";
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 8cd6b5f..077c464 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -115,7 +115,7 @@ ADD_DEFINITIONS(-DHAVE_SETLOCALE=1)
 ADD_DEFINITIONS(-DHAVE_STRING_H=1)
 
 # Define to 1 to have OFX support disabled
-#ADD_DEFINITIONS(-DNOOFX=1)
+ADD_DEFINITIONS(-DNOOFX=1)
 # Define to 1 if you want to have OFX support using libofx 0.7.0
 ADD_DEFINITIONS(-DOFX_0_7=1)
 
@@ -151,7 +151,7 @@ TARGET_LINK_LIBRARIES( grisbi
 	pango-1.0
 	pangocairo-1.0
 	zdll
-	ofx
+	# ofx
 	gnucash
 	openssl
 )
@@ -160,11 +160,11 @@ TARGET_LINK_LIBRARIES( grisbi
 	# PROPERTIES ENABLE_EXPORTS 1
 # )
 
-ADD_LIBRARY ( ofx
-	STATIC
-	../src/plugins/ofx/ofx.c
-	../src/plugins/ofx/ofx.h
-)
+# ADD_LIBRARY ( ofx
+	# STATIC
+	# ../src/plugins/ofx/ofx.c
+	# ../src/plugins/ofx/ofx.h
+# )
 
 ADD_CUSTOM_COMMAND ( TARGET ofxplg
 	POST_BUILD
@@ -200,12 +200,12 @@ ADD_CUSTOM_COMMAND ( TARGET openssl
 
 # ADD_DEPENDENCIES (ofx grisbi)
 #SET_TARGET_PROPERTIES(ofx PROPERTIES LINK_FLAGS "-no-undefined --enable-runtime-pseudo-reloc")
-TARGET_LINK_LIBRARIES (ofx
-	glib-2.0
-	intl
-	libofx
+# TARGET_LINK_LIBRARIES (ofx
+	# glib-2.0
+	# intl
+	# libofx
 #    grisbi
-)
+# )
 
 # ADD_DEPENDENCIES (gnucash grisbi)
 TARGET_LINK_LIBRARIES (gnucash
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index c47af56..e71a780 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -199,10 +199,10 @@ Section $(OFXplug)
 ;  SetOutPath "$INSTDIR\plugins"
 ;  File "${EXE_PATH}\plugins\libofxplg.dll"
 
-  SetOutPath "$INSTDIR"
-  File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
-  File "${PLUGINS_DEV_PATH}\libofx\bin\osp152.dll"
-  File "${PLUGINS_DEV_PATH}\libofx\bin\libofx.dll"
+  ; SetOutPath "$INSTDIR"
+  ; File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
+  ; File "${PLUGINS_DEV_PATH}\libofx\bin\osp152.dll"
+  ; File "${PLUGINS_DEV_PATH}\libofx\bin\libofx.dll"
 
 SectionEnd
 


hooks/post-receive
-- 
grisbi