[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-102-gaba31b0

[Pierre Biava]

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  aba31b08cf328f08cbf72291b14690e4715f285c (commit)
      from  1df9884f227cd35a1bb579d93e3ae7428857bfad (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 aba31b08cf328f08cbf72291b14690e4715f285c
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Mar 22 22:41:28 2011 +0100

    corrects a bad merge from a cherry pick

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

Changes:
diff --git a/src/main.c b/src/main.c
index 0e0e279..77b5022 100644
--- a/src/main.c
+++ b/src/main.c
@@ -832,21 +832,19 @@ gchar *gsb_main_get_print_dir_var ( void )
                         "\tC_PATH_CONFIG_ACCELS = %s\n"
                         "\tC_PATH_DATA_FILES = %s\n\n"
                         "\tDATA_PATH = %s\n\n"
-                        "\tGRISBI_LOCALEDIR = %s\n"
-                        "\tGRISBI_PLUGINS_DIR = %s\n"
-                        "\tGRISBI_PIXMAPS_DIR = %s\n\n",
+                        "\tgsb_dirs_get_locale_dir ( ) = %s\n"
+                        "\tgsb_dirs_get_plugins_dir ( ) = %s\n"
+                        "\tgsb_dirs_get_pixmaps_dir ( ) = %s\n\n",
                         g_get_user_data_dir ( ),
                         g_get_user_config_dir ( ),
-                        C_GRISBIRC,
-                        C_PATH_CONFIG,
-                        C_PATH_CONFIG_ACCELS,
-                        C_PATH_DATA_FILES,
+                        C_GRISBIRC ( ),
+                        C_PATH_CONFIG ( ),
+                        C_PATH_CONFIG_ACCELS ( ),
+                        C_PATH_DATA_FILES ( ),
                         DATA_PATH,
-                        tmp_str,
-                        GRISBI_PLUGINS_DIR,
-                        GRISBI_PIXMAPS_DIR );
-
-    g_free ( tmp_str );
+                        gsb_dirs_get_locale_dir ( ),
+                        gsb_dirs_get_plugins_dir ( ),
+                        gsb_dirs_get_pixmaps_dir ( ) );
 
     return path_str;
 }


hooks/post-receive
-- 
grisbi