[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-49-g33fbb0f

[NIEL Gérald]

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  33fbb0fa238e4996ed96705e4e5b7f431ab59c10 (commit)
      from  337e74805666fe8ec56c84ce54a9886e5efd8d4f (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 33fbb0fa238e4996ed96705e4e5b7f431ab59c10
Author: Gérald Niel <gerald at mbp15-gn.local>
Date:   Mon Sep 20 22:24:04 2010 +0200

    Fix the config and data path to accord Mac OS X.

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

Changes:
diff --git a/configure.in b/configure.in
index 74d0e49..f5d0322 100644
--- a/configure.in
+++ b/configure.in
@@ -259,8 +259,8 @@ case "$host" in
 esac
 AC_MSG_RESULT([$platform_osx])
 AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes")
-
 if test "x$platform_osx" = xyes; then
+  AC_DEFINE([OS_OSX],[1],[Defined if system is Mac OS X])
   dnl check for native osx
   gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
   AC_MSG_CHECKING([for GDK-Quartz])
@@ -268,7 +268,7 @@ if test "x$platform_osx" = xyes; then
   if test "x$gdk_windowing" = xquartz; then
         platform=darwin/quartz
         AC_MSG_RESULT(yes)
-        AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
+        AC_DEFINE(GDK_QUARTZ,[1],[Using GDK Quartz (not X11)])
         PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration, [os_osx=yes], [os_osx=no])
         AC_MSG_RESULT(${os_osx})
         if test "x$os_osx" = xyes; then
diff --git a/src/gsb_file_config.h b/src/gsb_file_config.h
index 882e1a8..cbf5932 100644
--- a/src/gsb_file_config.h
+++ b/src/gsb_file_config.h
@@ -9,6 +9,7 @@
 #define ETAT_WWW_BROWSER "xdg-open"
 
 /* mise en conformité avec les recommandations FreeDesktop. */
+
 #ifndef _WIN32
 #if IS_DEVELOPMENT_VERSION == 1
 #define C_GRISBIRC  (g_strconcat ( "/", PACKAGE, "dev.conf", NULL))
@@ -16,10 +17,18 @@
 #define C_GRISBIRC  (g_strconcat ( "/", PACKAGE, ".conf", NULL))
 #endif
 #define C_OLD_GRISBIRC  (g_strconcat ( "/.", PACKAGE, "rc", NULL))
+
+#ifdef OS_OSX
+#define C_PATH_CONFIG (g_strconcat (g_get_home_dir ( ), G_DIR_SEPARATOR_S,\
+                        "Library/Application Support/Grisbi/config", NULL))
+#define C_PATH_DATA_FILES (g_strconcat (g_get_home_dir ( ), G_DIR_SEPARATOR_S,\
+                        "Library/Application Support/Grisbi/data", NULL))
+#else
 #define C_PATH_CONFIG (g_strconcat (g_get_user_config_dir ( ), G_DIR_SEPARATOR_S,\
                         "grisbi", NULL))
 #define C_PATH_DATA_FILES (g_strconcat (g_get_user_data_dir ( ), G_DIR_SEPARATOR_S,\
                         "grisbi", NULL))
+#endif
 #else
 /* Some old Windows version have difficulties with dat starting file names */
 #define C_GRISBIRC  (g_strconcat ( "\\", PACKAGE, "rc", NULL))


hooks/post-receive
-- 
grisbi