[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-63-g0b63c37

[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  0b63c37761ceaa94f584433c9a2507635438f3fd (commit)
      from  5ad977d5ec9542d9fbbb69aed7d51dbbb75980d2 (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 0b63c37761ceaa94f584433c9a2507635438f3fd
Author: Gérald Niel <gerald at mbp15-gn.local>
Date:   Mon Sep 27 22:52:50 2010 +0200

    Change Dock icon only if not in a bundle.

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

Changes:
diff --git a/src/main.c b/src/main.c
index 29e0030..1b390dd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -289,10 +289,13 @@ void main_mac_osx ( int argc, char **argv )
     else
         display_tip ( FALSE );
 
-    pixbuf = gdk_pixbuf_new_from_file ( g_build_filename 
+    if ( quartz_application_get_bundle_id ( ) == NULL )
+    {
+        pixbuf = gdk_pixbuf_new_from_file ( g_build_filename 
                         (GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), NULL );
-    if ( pixbuf )
-        gtk_osxapplication_set_dock_icon_pixbuf ( theApp, pixbuf );
+        if ( pixbuf )
+            gtk_osxapplication_set_dock_icon_pixbuf ( theApp, pixbuf );
+    }
 
     gtk_osxapplication_set_use_quartz_accelerators ( theApp, TRUE );
 


hooks/post-receive
-- 
grisbi