[grisbi-cvs] [SCM] grisbi branch, grisbi-1.0.x, updated. upstream_version_0_9_90-27-gdfce9a6

[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, grisbi-1.0.x has been updated
       via  dfce9a6118a27b2d2e2ca8d386e33cc1a711b3e8 (commit)
      from  390645e54206204ac63a2055709ca99cd0d54f35 (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 dfce9a6118a27b2d2e2ca8d386e33cc1a711b3e8
Author: Gérald Niel <gerald at grisbi.org>
Date:   Mon Jan 7 23:10:37 2013 +0100

    Update dirs for Mac OS X

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

Changes:
diff --git a/src/gsb_dirs.c b/src/gsb_dirs.c
index 1e48a2c..769c5ce 100644
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@ -63,26 +63,35 @@ void gsb_dirs_init ( void )
         user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
     }
 #else
+#ifdef OS_OSX
+	
+        user_config_dir = g_build_filename ( g_get_home_dir (),
+                        "Library/Application Support/Grisbi/config", NULL );
+        user_data_dir = g_build_filename ( g_get_home_dir (),
+                        "Library/Application Support/Grisbi/data", NULL );
+        user_default_dir = g_strdup ( g_get_home_dir() );
+
 #ifdef GTKOSXAPPLICATION
+       	
     if ( gtkosx_application_get_bundle_id ( ) )
     {
-        gchar *res_path;
-
-        res_path = gtkosx_application_get_resource_path ();
+        gchar *res_path = gtkosx_application_get_resource_path ();
+        
         categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
         locale_dir = g_strconcat (res_path, "/share/locale", NULL );
         pixmaps_dir = g_strconcat (res_path, "/share/pixmaps/grisbi", NULL );
         ui_dir = g_strconcat (res_path, "/share/grisbi/ui", NULL );
 
         g_free ( res_path );
-
-        user_config_dir = g_build_filename ( g_get_home_dir (),
-                        "Library/Application Support/Grisbi/config", NULL );
-        user_data_dir = g_build_filename ( g_get_home_dir (),
-                        "Library/Application Support/Grisbi/data", NULL );
-        user_default_dir = g_strdup ( g_get_home_dir() );
-
     }
+    else {
+        categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
+        locale_dir = g_strdup ( LOCALEDIR );
+        pixmaps_dir = g_strdup ( PIXMAPS_DIR );
+        ui_dir = g_strdup ( UI_DIR );    
+    }
+
+#endif /* GTKOSXAPPLICATION */ 
 #else
     {
         categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
@@ -94,7 +103,7 @@ void gsb_dirs_init ( void )
         user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
         user_default_dir = g_strdup ( g_get_home_dir() );
     }
-#endif /* GTKOSXAPPLICATION */
+#endif /* OS_OSX */
 #endif
 
     accelerator_filename = g_build_filename ( user_config_dir, "grisbi-accels", NULL );


hooks/post-receive
-- 
grisbi