[grisbi-cvs] [SCM] grisbi branch, master, updated. be2e5e2ce62a0602761c9b6d7d22afe8a9e7cf41

[Gunee]

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  be2e5e2ce62a0602761c9b6d7d22afe8a9e7cf41 (commit)
       via  8201d6fb482f8efe288fe11116aba60c5daa650b (commit)
       via  301dc5b0ebdf9fc7b3a58bd137162effd84e4762 (commit)
      from  9eef65198af152d661929aa816781578c7028d0d (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 be2e5e2ce62a0602761c9b6d7d22afe8a9e7cf41
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date:   Fri Jun 18 16:42:46 2010 +0200

    Path fix + Version number increase

commit 8201d6fb482f8efe288fe11116aba60c5daa650b
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date:   Fri Jun 18 16:27:55 2010 +0200

    Changed calls to deprecated POSIX names (MSVC)

commit 301dc5b0ebdf9fc7b3a58bd137162effd84e4762
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date:   Fri Jun 18 15:57:59 2010 +0200

    Replacing calls to deprecated function g_date_set_time()
    
    See http://library.gnome.org/devel/glib/stable/glib-Date-and-Time-Functions.html#g-date-set-time for details

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

Changes:
diff --git a/src/plugins/gnucash/gnucash.c b/src/plugins/gnucash/gnucash.c
index 6666601..db79723 100644
--- a/src/plugins/gnucash/gnucash.c
+++ b/src/plugins/gnucash/gnucash.c
@@ -665,7 +665,11 @@ xmlDocPtr parse_gnucash_file ( gchar * filename )
   doc = xmlParseFile( g_filename_from_utf8 ( tempname, -1, NULL, NULL, NULL ) );
 
   /** Once parsed, the temporary file is removed as it is useless.  */
+#ifndef _MSC_VER
   unlink ( tempname );
+#else
+  _unlink ( tempname );
+#endif
   
   return doc;
 }
diff --git a/src/plugins/ofx/ofx.c b/src/plugins/ofx/ofx.c
index de565f1..7c248cb 100644
--- a/src/plugins/ofx/ofx.c
+++ b/src/plugins/ofx/ofx.c
@@ -384,7 +384,7 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data)
     date = g_date_new ();
     if ( data.date_posted_valid )
     {
-	g_date_set_time ( date,
+	g_date_set_time_t ( date,
 			  data.date_posted );
 	if ( g_date_valid ( date ))
 	    ope_import -> date_de_valeur = date;
@@ -394,7 +394,7 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data)
 
     if ( data.date_initiated_valid )
     {
-	g_date_set_time ( date,
+	g_date_set_time_t ( date,
 			  data.date_initiated );
 	if ( g_date_valid ( date ))
 	    ope_import -> date = date;
@@ -535,7 +535,7 @@ int ofx_proc_statement_cb(struct OfxStatementData data)
     {
 	date = g_date_new ();
 
-	g_date_set_time ( date,
+	g_date_set_time_t ( date,
 			  data.date_start );
 	if ( g_date_valid ( date ))
 	    compte_ofx_importation_en_cours -> date_depart = date;
@@ -545,7 +545,7 @@ int ofx_proc_statement_cb(struct OfxStatementData data)
     {
 	date = g_date_new ();
 
-	g_date_set_time ( date,
+	g_date_set_time_t ( date,
 			  data.date_end );
 	if ( g_date_valid ( date ))
 	    compte_ofx_importation_en_cours -> date_fin = date;
diff --git a/src/plugins/openssl/openssl.c b/src/plugins/openssl/openssl.c
index 57ae376..c2cd7f3 100644
--- a/src/plugins/openssl/openssl.c
+++ b/src/plugins/openssl/openssl.c
@@ -281,7 +281,11 @@ gchar *gsb_file_util_ask_for_crypt_key ( gchar * file_name, gchar * additional_m
     {
 	case GTK_RESPONSE_OK:
 
+#ifndef _MSC_VER
 	    key = strdup (gtk_entry_get_text ( GTK_ENTRY ( entry )));
+#else
+	    key = _strdup (gtk_entry_get_text ( GTK_ENTRY ( entry )));
+#endif /* _MSC_VER */
 
 	    if (!strlen (key))
 		key = NULL;
diff --git a/win32-msvc/windows_installer.nsi b/win32-msvc/windows_installer.nsi
index a207b6f..b10699b 100644
--- a/win32-msvc/windows_installer.nsi
+++ b/win32-msvc/windows_installer.nsi
@@ -20,13 +20,13 @@
 !define PRODUCT "Grisbi" ;Name of the project
 !define MAJOR "0"        ;Major version number
 !define MINOR "6"        ;Minor version number
-!define PATCH "0"        ;Patch version number
-!define STAGE "release"     ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "rel" ;Small dev stage id without spaces
+!define PATCH "1"        ;Patch version number
+!define STAGE "testing pre release"     ;Developement stage id (RC, beta, alpha)
+!define SMALL_STAGE "test_pre_rel" ;Small dev stage id without spaces
 !define EXE_PATH "target\Win32\Release" ;Path to the exe file you want to pack
 !define PLUGINS_DEV_PATH "target\Win32\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
 !define GTK_DEV_PATH "target\Win32\gtk-dev" ;Path to the gtk-dev generated by prepare.cmd
-!define GNUWIN32_PATH "C:\Program Files (x86)\GnuWin32\bin" ;Path to the GnuWin32 root (must have libxml and openssl)
+;!define GNUWIN32_PATH "C:\Program Files (x86)\GnuWin32\bin" ;Path to the GnuWin32 root (must have libxml and openssl)
 ;!define GTK_INSTALL_PATH "." ; Path to the GTK installer file to pack
 ;!define GTK_INSTALL_FILE "gtk2-runtime-2.16.5-2009-08-06-ash.exe" ;Filename of the GTK installer
 
@@ -74,7 +74,7 @@
 ;--------------------------------
 ;Pages
 
-  !insertmacro MUI_PAGE_LICENSE "COPYING"
+  !insertmacro MUI_PAGE_LICENSE "..\COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES


hooks/post-receive
-- 
grisbi