[grisbi-cvs] [SCM] grisbi branch, pbiava_integration_mac_osx, updated. upstream_version_0_7_3-33-g8227db2

[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  8227db285b1ce5f75810a4495c2ea3ed3cc53134 (commit)
       via  4e30f17e29b8f7979705f2c161f77cd8d93f7242 (commit)
       via  b4c6fbd46e0093a32894609c31a92e744ce5f0e5 (commit)
       via  0ed2bde845a0f30f5dc9218563a1a8def19ee8df (commit)
       via  50d50e0a5efd5e3621ef1276b7da44a06f027fa4 (commit)
      from  04023603e9d206b4f4920c6d7fdeb7e4666a66c7 (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 8227db285b1ce5f75810a4495c2ea3ed3cc53134
Merge: 4e30f17e29b8f7979705f2c161f77cd8d93f7242 04023603e9d206b4f4920c6d7fdeb7e4666a66c7
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 13 23:43:21 2010 +0200

    Merge remote branch 'remotes/origin/pbiava_integration_mac_osx' into pbiava_integration_mac_osx

commit 4e30f17e29b8f7979705f2c161f77cd8d93f7242
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 13 23:39:20 2010 +0200

    add dock_icon for Mac OSX

commit b4c6fbd46e0093a32894609c31a92e744ce5f0e5
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 13 22:21:08 2010 +0200

    Using libtoolize instead of glibtool for Mac OSX

commit 0ed2bde845a0f30f5dc9218563a1a8def19ee8df
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 13 22:19:15 2010 +0200

    update string

commit 50d50e0a5efd5e3621ef1276b7da44a06f027fa4
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 13 21:47:42 2010 +0200

    minor corrections

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

Changes:
diff --git a/autogen.sh b/autogen.sh
index 3cd5195..1a8b256 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,16 +48,16 @@ done
 # Check for "glibtool" first.
 # Borrowed from ethereal
 #
-LTVER=`glibtool --version 2>/dev/null | grep ' libtool)' | \
-    sed 's/.*libtool) \([0-9][0-9.]*\)[^ ]* .*/\1/'`
-if test -z "$LTVER"
-then
+#LTVER=`glibtool --version 2>/dev/null | grep ' libtool)' | \
+#    sed 's/.*libtool) \([0-9][0-9.]*\)[^ ]* .*/\1/'`
+#if test -z "$LTVER"
+#then
 	LTVER=`libtool --version | grep ' libtool)' | \
 	    sed 's/.*) \([0-9][0-9.]*\)[^ ]* .*/\1/' `
 	LIBTOOLIZE=libtoolize
-else
-	LIBTOOLIZE=glibtoolize
-fi
+#else
+#	LIBTOOLIZE=glibtoolize
+#fi
 case "$LTVER" in
 '' | 0.* | 1.[0-3]* )
 
diff --git a/po/fr.po b/po/fr.po
index 4c6058c..beb3067 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9108,7 +9108,7 @@ msgid ""
 "Warning : the cheque number %s is already used.\n"
 "We skip it"
 msgstr ""
-"Attention, le numéro du chèque %ld est déjà utilisé.\n"
+"Attention, le numéro du chèque %s est déjà utilisé.\n"
 "Nous le sautons"
 
 #: ../src/import.c:3152
diff --git a/src/bet_future.c b/src/bet_future.c
index cd663ce..ec8139a 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -428,7 +428,7 @@ gboolean bet_form_create_current_form ( GtkWidget *dialog,
     GtkWidget *credit;
     gint element_number;
     gint row = 2;
-    gint column = 0;;
+    gint column = 0;
     struct_element *element;
     GSList *tmp_list;
 
diff --git a/src/main.c b/src/main.c
index 3310cf3..ea6ccb7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -220,6 +220,7 @@ void main_mac_osx ( int argc, char **argv )
     cmdline_options  opt;
     gint status = CMDLINE_SYNTAX_OK;
     GtkOSXApplication *theApp;
+    GdkPixbuf *pixbuf;
 
     devel_debug ("main_mac_osx");
 
@@ -277,6 +278,18 @@ void main_mac_osx ( int argc, char **argv )
     else
         display_tip ( FALSE );
 
+    pixbuf = gsb_select_icon_get_default_logo_pixbuf ( );
+    if ( pixbuf )
+    {
+        gtk_osxapplication_set_dock_icon_pixbuf ( theApp, pixbuf );
+        printf ("pixbuf existe\n");
+    }
+    else
+        printf ("pixbuf n'existe pas\n");
+
+    if ( quartz_application_get_bundle_id ( ) )
+        gtk_osxapplication_set_dock_icon_resource  ( theApp, "grisbi_logo", "png", "share/pixmaps/grisbi" );
+
     gtk_osxapplication_set_use_quartz_accelerators ( theApp, TRUE );
 
     gtk_osxapplication_ready ( theApp );
@@ -329,10 +342,6 @@ void main_win_32 (  int argc, char **argv )
 
     gtk_init ( &argc, &argv );
 
-#if IS_DEVELOPMENT_VERSION == 1
-    gsb_grisbi_init_development_mode ( );
-#endif
-
     win32_parse_gtkrc ( "gtkrc" );
 
     /* parse command line parameter, exit with correct error code when needed */
@@ -566,6 +575,7 @@ void main_window_set_size_and_position ( void )
  * */
 void gsb_grisbi_trappe_signal_sigsegv ( void )
 {
+#ifndef _WIN32
     struct sigaction sig_sev;
 
     memset ( &sig_sev, 0, sizeof ( struct sigaction ) );
@@ -575,6 +585,7 @@ void gsb_grisbi_trappe_signal_sigsegv ( void )
 
     if ( sigaction ( SIGSEGV, &sig_sev, NULL ) )
         g_print ( _("Error on sigaction: SIGSEGV won't be trapped\n") );
+#endif /* not WIN_32 */
 }
 
 


hooks/post-receive
-- 
grisbi