[grisbi-cvs] [git push]Grisbi branch grisbi-1.0.x updated. upstream_version_1_0_0-11-g8c1a8c6
Pierre Biava
noreply at sourceforge.net
Sat Jan 3 19:40:43 CET 2015
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 8c1a8c63688a0e71849c96078eb9fca78adbecda (commit)
via eaf0de0b2637e4882b5cd69945bd2bc0b0b18f33 (commit)
via 815cedd5609a411cbf574a6a457c5547640b7ca8 (commit)
via 2ae5fa11f0fccd43b3002367fec5366039b1aaa6 (commit)
from 10ef82373a9e8db71de961950d6ec0c539d48d74 (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 -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit 4ac024dcc489da3cae042a43fe43d8bc9cc63c77
Merge: 8a5bc31 ae9cca7
Author: Rémi Cardona <remi at gentoo.org>
Date: Mon Apr 21 19:08:12 2014 +0200
Merge branch 'grisbi-1.0.x'
Conflicts:
.gitignore
src/gsb_dirs.c
diff --cc src/gsb_dirs.c
index 1866db5,1cf7c42..f31d206
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@@ -41,71 -42,64 +42,75 @@@ static gchar *user_default_dir
static gchar *grisbirc_filename;
static gchar *accelerator_filename;
+static gchar *grisbi_dir;
-void gsb_dirs_init ( void )
+void gsb_dirs_init ( char* gsb_bin_path )
{
+ gchar *local_ui_dir;
+ GDir *local_ui_handle;
+
+ /* Get the grisbi executable directory as it may be useful when running dev instances */
+ grisbi_dir = g_path_get_dirname ( gsb_bin_path );
+ local_ui_dir = g_strconcat ( grisbi_dir, "/ui", NULL );
+
#ifdef G_OS_WIN32
- {
- gchar *dir;
+{
+ gchar *dir;
- dir = g_win32_get_package_installation_directory_of_module ( NULL );
+ dir = g_win32_get_package_installation_directory_of_module ( NULL );
- categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
- locale_dir = g_strconcat ( dir, "/share/locale", NULL );
- pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
- ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
+ categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
+ locale_dir = g_strconcat ( dir, "/share/locale", NULL );
+ pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
- g_free ( dir );
+ g_free ( dir );
- user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
- user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
- user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
- }
+ user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
+ user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
+ user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
+}
#else
-#ifdef OS_OSX
-
+{
+ #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 = gtkosx_application_get_resource_path ();
-
- categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( res_path, "share/doc/grisbi", 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 );
- }
- else {
- categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
- help_dir = g_strdup ( HELP_PATH );
- locale_dir = g_strdup ( LOCALEDIR );
- pixmaps_dir = g_strdup ( PIXMAPS_DIR );
- ui_dir = g_strdup ( UI_DIR );
+ #ifdef GTKOSXAPPLICATION
+ {
+ if ( gtkosx_application_get_bundle_id ( ) )
+ {
+ gchar *res_path = gtkosx_application_get_resource_path ();
+
+ categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( res_path, "share/doc/grisbi", NULL );
+ locale_dir = g_build_filename (res_path, "/share/locale", NULL );
+ pixmaps_dir = g_build_filename (res_path, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_build_filename (res_path, "/share/grisbi/ui", NULL );
+
+ g_free ( res_path );
+ }
+ else
+ {
+ categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
++ help_dir = g_strdup ( HELP_PATH );
+ locale_dir = g_strdup ( LOCALEDIR );
+ pixmaps_dir = g_strdup ( PIXMAPS_DIR );
+ ui_dir = g_strdup ( UI_DIR );
+ }
+ }
+ #endif /* GTKOSXAPPLICATION */
}
-
-#endif /* GTKOSXAPPLICATION */
-#else
+ #else
{
categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
+ help_dir = g_strdup ( HELP_PATH );
locale_dir = g_strdup ( LOCALEDIR );
pixmaps_dir = g_strdup ( PIXMAPS_DIR );
ui_dir = g_strdup ( UI_DIR );
diff --cc src/gsb_dirs.h
index 256f724,3665d16..d2832e2
--- a/src/gsb_dirs.h
+++ b/src/gsb_dirs.h
@@@ -3,9 -3,10 +3,10 @@@
#include <glib.h>
-void gsb_dirs_init ( void );
+void gsb_dirs_init ( char* gsb_bin_path );
void gsb_dirs_shutdown ( void );
const gchar *gsb_dirs_get_categories_dir ( void );
+ const gchar *gsb_dirs_get_help_dir ( void );
const gchar *gsb_dirs_get_default_dir ( void );
const gchar *gsb_dirs_get_locale_dir ( void );
const gchar *gsb_dirs_get_pixmaps_dir ( void );
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit 4ac024dcc489da3cae042a43fe43d8bc9cc63c77
Merge: 8a5bc31 ae9cca7
Author: Rémi Cardona <remi at gentoo.org>
Date: Mon Apr 21 19:08:12 2014 +0200
Merge branch 'grisbi-1.0.x'
Conflicts:
.gitignore
src/gsb_dirs.c
diff --cc src/gsb_dirs.c
index 1866db5,1cf7c42..f31d206
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@@ -41,71 -42,64 +42,75 @@@ static gchar *user_default_dir
static gchar *grisbirc_filename;
static gchar *accelerator_filename;
+static gchar *grisbi_dir;
-void gsb_dirs_init ( void )
+void gsb_dirs_init ( char* gsb_bin_path )
{
+ gchar *local_ui_dir;
+ GDir *local_ui_handle;
+
+ /* Get the grisbi executable directory as it may be useful when running dev instances */
+ grisbi_dir = g_path_get_dirname ( gsb_bin_path );
+ local_ui_dir = g_strconcat ( grisbi_dir, "/ui", NULL );
+
#ifdef G_OS_WIN32
- {
- gchar *dir;
+{
+ gchar *dir;
- dir = g_win32_get_package_installation_directory_of_module ( NULL );
+ dir = g_win32_get_package_installation_directory_of_module ( NULL );
- categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
- locale_dir = g_strconcat ( dir, "/share/locale", NULL );
- pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
- ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
+ categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
+ locale_dir = g_strconcat ( dir, "/share/locale", NULL );
+ pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
- g_free ( dir );
+ g_free ( dir );
- user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
- user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
- user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
- }
+ user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
+ user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
+ user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
+}
#else
-#ifdef OS_OSX
-
+{
+ #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 = gtkosx_application_get_resource_path ();
-
- categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( res_path, "share/doc/grisbi", 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 );
- }
- else {
- categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
- help_dir = g_strdup ( HELP_PATH );
- locale_dir = g_strdup ( LOCALEDIR );
- pixmaps_dir = g_strdup ( PIXMAPS_DIR );
- ui_dir = g_strdup ( UI_DIR );
+ #ifdef GTKOSXAPPLICATION
+ {
+ if ( gtkosx_application_get_bundle_id ( ) )
+ {
+ gchar *res_path = gtkosx_application_get_resource_path ();
+
+ categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( res_path, "share/doc/grisbi", NULL );
+ locale_dir = g_build_filename (res_path, "/share/locale", NULL );
+ pixmaps_dir = g_build_filename (res_path, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_build_filename (res_path, "/share/grisbi/ui", NULL );
+
+ g_free ( res_path );
+ }
+ else
+ {
+ categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
++ help_dir = g_strdup ( HELP_PATH );
+ locale_dir = g_strdup ( LOCALEDIR );
+ pixmaps_dir = g_strdup ( PIXMAPS_DIR );
+ ui_dir = g_strdup ( UI_DIR );
+ }
+ }
+ #endif /* GTKOSXAPPLICATION */
}
-
-#endif /* GTKOSXAPPLICATION */
-#else
+ #else
{
categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
+ help_dir = g_strdup ( HELP_PATH );
locale_dir = g_strdup ( LOCALEDIR );
pixmaps_dir = g_strdup ( PIXMAPS_DIR );
ui_dir = g_strdup ( UI_DIR );
diff --cc src/gsb_dirs.h
index 256f724,3665d16..d2832e2
--- a/src/gsb_dirs.h
+++ b/src/gsb_dirs.h
@@@ -3,9 -3,10 +3,10 @@@
#include <glib.h>
-void gsb_dirs_init ( void );
+void gsb_dirs_init ( char* gsb_bin_path );
void gsb_dirs_shutdown ( void );
const gchar *gsb_dirs_get_categories_dir ( void );
+ const gchar *gsb_dirs_get_help_dir ( void );
const gchar *gsb_dirs_get_default_dir ( void );
const gchar *gsb_dirs_get_locale_dir ( void );
const gchar *gsb_dirs_get_pixmaps_dir ( void );
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit 4ac024dcc489da3cae042a43fe43d8bc9cc63c77
Merge: 8a5bc31 ae9cca7
Author: Rémi Cardona <remi at gentoo.org>
Date: Mon Apr 21 19:08:12 2014 +0200
Merge branch 'grisbi-1.0.x'
Conflicts:
.gitignore
src/gsb_dirs.c
diff --cc src/gsb_dirs.c
index 1866db5,1cf7c42..f31d206
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@@ -41,71 -42,64 +42,75 @@@ static gchar *user_default_dir
static gchar *grisbirc_filename;
static gchar *accelerator_filename;
+static gchar *grisbi_dir;
-void gsb_dirs_init ( void )
+void gsb_dirs_init ( char* gsb_bin_path )
{
+ gchar *local_ui_dir;
+ GDir *local_ui_handle;
+
+ /* Get the grisbi executable directory as it may be useful when running dev instances */
+ grisbi_dir = g_path_get_dirname ( gsb_bin_path );
+ local_ui_dir = g_strconcat ( grisbi_dir, "/ui", NULL );
+
#ifdef G_OS_WIN32
- {
- gchar *dir;
+{
+ gchar *dir;
- dir = g_win32_get_package_installation_directory_of_module ( NULL );
+ dir = g_win32_get_package_installation_directory_of_module ( NULL );
- categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
- locale_dir = g_strconcat ( dir, "/share/locale", NULL );
- pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
- ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
+ categories_dir = g_build_filename ( dir, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( dir, "share/doc/grisbi", NULL );
+ locale_dir = g_strconcat ( dir, "/share/locale", NULL );
+ pixmaps_dir = g_strconcat ( dir, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_strconcat ( dir, "/share/grisbi/ui", NULL );
- g_free ( dir );
+ g_free ( dir );
- user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
- user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
- user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
- }
+ user_config_dir = g_build_filename ( g_get_user_config_dir (), "grisbi", NULL);
+ user_data_dir = g_build_filename ( g_get_user_data_dir (), "grisbi", NULL);
+ user_default_dir = g_strdup ( win32_get_my_documents_folder_path () );
+}
#else
-#ifdef OS_OSX
-
+{
+ #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 = gtkosx_application_get_resource_path ();
-
- categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
- help_dir = g_build_filename ( res_path, "share/doc/grisbi", 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 );
- }
- else {
- categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
- help_dir = g_strdup ( HELP_PATH );
- locale_dir = g_strdup ( LOCALEDIR );
- pixmaps_dir = g_strdup ( PIXMAPS_DIR );
- ui_dir = g_strdup ( UI_DIR );
+ #ifdef GTKOSXAPPLICATION
+ {
+ if ( gtkosx_application_get_bundle_id ( ) )
+ {
+ gchar *res_path = gtkosx_application_get_resource_path ();
+
+ categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
++ help_dir = g_build_filename ( res_path, "share/doc/grisbi", NULL );
+ locale_dir = g_build_filename (res_path, "/share/locale", NULL );
+ pixmaps_dir = g_build_filename (res_path, "/share/pixmaps/grisbi", NULL );
+ ui_dir = g_build_filename (res_path, "/share/grisbi/ui", NULL );
+
+ g_free ( res_path );
+ }
+ else
+ {
+ categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
++ help_dir = g_strdup ( HELP_PATH );
+ locale_dir = g_strdup ( LOCALEDIR );
+ pixmaps_dir = g_strdup ( PIXMAPS_DIR );
+ ui_dir = g_strdup ( UI_DIR );
+ }
+ }
+ #endif /* GTKOSXAPPLICATION */
}
-
-#endif /* GTKOSXAPPLICATION */
-#else
+ #else
{
categories_dir = g_build_filename ( DATA_PATH, "categories", NULL );
+ help_dir = g_strdup ( HELP_PATH );
locale_dir = g_strdup ( LOCALEDIR );
pixmaps_dir = g_strdup ( PIXMAPS_DIR );
ui_dir = g_strdup ( UI_DIR );
diff --cc src/gsb_dirs.h
index 256f724,3665d16..d2832e2
--- a/src/gsb_dirs.h
+++ b/src/gsb_dirs.h
@@@ -3,9 -3,10 +3,10 @@@
#include <glib.h>
-void gsb_dirs_init ( void );
+void gsb_dirs_init ( char* gsb_bin_path );
void gsb_dirs_shutdown ( void );
const gchar *gsb_dirs_get_categories_dir ( void );
+ const gchar *gsb_dirs_get_help_dir ( void );
const gchar *gsb_dirs_get_default_dir ( void );
const gchar *gsb_dirs_get_locale_dir ( void );
const gchar *gsb_dirs_get_pixmaps_dir ( void );
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit 4ac024dcc489da3cae042a43fe43d8bc9cc63c77
Merge: 8a5bc31 ae9cca7
Author: Rémi Cardona <remi at gentoo.org>
Date: Mon Apr 21 19:08:12 2014 +0200
Merge branch 'grisbi-1.0.x'
Conflicts:
.gitignore
src/gsb_dirs.c
diff --cc src/gsb_dirs.c
index 1866db5,1cf7c42..f31d206
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@@ -41,71 -42,64 +42,75 @@@ static gchar *user_default_dir
static gchar *grisbirc_filename;
static gchar *accelerator_filename;
+static gchar *grisbi_dir;
-void gsb_dirs_init ( void )
+void gsb_dirs_init ( char* gsb_bin_path )
{
+ gchar *local_ui_dir;
+ GDir *local_ui_handle;
+
+ /* Get the grisbi executable directory as it may be useful when running dev instances */
+ grisbi_dir = g_path_get_dirname ( gsb_bin_path );
+ local_ui_dir = g_strconcat ( grisbi_dir, "/ui", NULL );
+
#ifdef G_OS_WIN32
- {
- gchar *dir;
+{
+ gchar *dir;
- dir = g_win32_get_package_installation_directory_of_module ( NULL );
+ dir = g_win32_get_package_installation_directory_of_module ( NULL );
... 137 lines suppressed ...
hooks/post-receive
--
Grisbi
More information about the cvs
mailing list