[grisbi-cvs] [SCM] grisbi branch, pbiava_integration_mac_osx, updated. upstream_version_0_7_3-37-g886a261

[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, pbiava_integration_mac_osx has been updated
       via  886a261c4889af216ad8fc2a0d17a60b456b2094 (commit)
       via  55976d7dd9f1551f52625c86dbb93d663b07f1e2 (commit)
      from  c9627f9055d6dad4deeff9bd158536c34a17d055 (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 886a261c4889af216ad8fc2a0d17a60b456b2094
Author: pbiava <pierre.biava at nerim.net>
Date:   Fri Sep 17 21:18:20 2010 +0200

    Minor changes for Mac OSX integration

commit 55976d7dd9f1551f52625c86dbb93d663b07f1e2
Author: pbiava <pierre.biava at nerim.net>
Date:   Thu Sep 16 21:51:56 2010 +0200

    fix a bug for grisbi_logo

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

Changes:
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index 5440beb..095089b 100644
--- a/src/grisbi_osx.c
+++ b/src/grisbi_osx.c
@@ -304,7 +304,10 @@ gchar *grisbi_osx_get_locale_dir ( void )
 {
     gchar *dir;
 
-    dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/locale", NULL );
+    if ( gtk_osxapplication_get_bundle_id ( ) )
+        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/locale", NULL );
+    else
+        dir = g_strdup ( LOCALEDIR );
 
     return dir;
 }
@@ -320,7 +323,10 @@ gchar *grisbi_osx_get_pixmaps_dir ( void )
 {
     gchar *dir;
 
-    dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/pixmaps/grisbi", NULL );
+    if ( gtk_osxapplication_get_bundle_id ( ) )
+        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/pixmaps/grisbi", NULL );
+    else
+        dir = g_strdup ( PIXMAPS_DIR );
 
     return dir;
 }
@@ -336,11 +342,15 @@ gchar *grisbi_osx_get_plugins_dir ( void )
 {
     gchar *dir;
 
-    dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/lib/grisbi", NULL );
+    if ( gtk_osxapplication_get_bundle_id ( ) )
+        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/lib/grisbi", NULL );
+    else
+        dir = g_strdup ( PLUGINS_DIR );
 
     return dir;
 }
 
+
 #endif /* GTKOSXAPPLICATION */
 /**
  *
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index b9ea50c..1dc4050 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -648,7 +648,7 @@ GdkPixbuf *gsb_select_icon_get_default_logo_pixbuf ( void )
     GError *error = NULL;
 
     pixbuf = gdk_pixbuf_new_from_file ( g_build_filename 
-                        (PIXMAPS_DIR, "grisbi-logo.png", NULL), &error );
+                        (GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), &error );
 
     if ( ! pixbuf )
         devel_debug ( error -> message );
diff --git a/src/import.c b/src/import.c
index d8233ad..9728558 100644
--- a/src/import.c
+++ b/src/import.c
@@ -377,7 +377,7 @@ GtkWidget *import_create_file_selection_page ( GtkWidget * assistant )
     paddingbox = new_paddingbox_with_title ( vbox, TRUE, _("Choose file to import"));
 
     chooser = gtk_button_new_with_label ( _("Add file to import..." ));
-    tmpstr = g_build_filename ( PIXMAPS_DIR, "import.png", NULL );
+    tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, "import.png", NULL );
     gtk_button_set_image ( GTK_BUTTON(chooser),
                         gtk_image_new_from_file ( tmpstr ) );
     g_free ( tmpstr );
diff --git a/src/main.c b/src/main.c
index 36912b5..6c9f9bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -222,7 +222,7 @@ void main_mac_osx ( int argc, char **argv )
     GtkWidget *menubar;
     GdkPixbuf *pixbuf;
     cmdline_options  opt;
-    const gchar *locale_dir;
+    gchar *locale_dir;
     gboolean first_use = FALSE;
     gint status = CMDLINE_SYNTAX_OK;
     GtkOSXApplication *theApp;
@@ -410,6 +410,7 @@ gboolean gsb_grisbi_print_environment_var ( void )
             "\tC_PATH_CONFIG = %s\n"
             "\tC_PATH_CONFIG_ACCELS = %s\n"
             "\tC_PATH_DATA_FILES = %s\n"
+            "\tLOCALEDIR = %s\n"
             "\tGRISBI_LOCALEDIR = %s\n"
             "\tGRISBI_PLUGINS_DIR = %s\n"
             "\tGRISBI_PIXMAPS_DIR = %s\n\n",
@@ -417,6 +418,7 @@ gboolean gsb_grisbi_print_environment_var ( void )
             C_PATH_CONFIG,
             C_PATH_CONFIG_ACCELS,
             C_PATH_DATA_FILES,
+            LOCALEDIR,
 #ifdef GTKOSXAPPLICATION
             grisbi_osx_get_locale_dir ( ),
 #else


hooks/post-receive
-- 
grisbi