[grisbi-cvs] [git push]Grisbi branch grisbi-1.0.x updated. upstream_version_0_9_90-89-g6cce921
Rémi Cardona
noreply at sourceforge.net
Tue Apr 2 08:56:27 CEST 2013
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 6cce9214831b16a6b809c2a8527971c9ab705be6 (commit)
via d306a6490bfb0634e491f8d1ff52754ed43a213d (commit)
from 3c7ddae3c98a27468e0316f907ada0ecd88308d9 (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 0359c243694e854903d1c033e1c8d06556ed1f8a
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Mar 17 20:46:58 2013 +0100
Fixes a compilation error when gofice is not installed
diff --git a/configure.ac b/configure.ac
index d7b47bd..9637ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ dnl ================================================================
LT_LIB_M
-PKG_CHECK_MODULES(GRISBI, [gtk+-3.0 >= 3.0.12 glib-2.0 >= 2.28 zlib])
+PKG_CHECK_MODULES(GRISBI, [gtk+-3.0 >= 3.0.12 glib-2.0 >= 2.28 libgsf-1 >= 1.14 zlib])
# Temporary hack until Mandriva ships zlib.pc
#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
GRISBI_LIBS="$LIBM $GRISBI_LIBS"
diff --git a/src/go-charmap-sel.c b/src/go-charmap-sel.c
index c4cad8d..0c30896 100644
--- a/src/go-charmap-sel.c
+++ b/src/go-charmap-sel.c
@@ -26,13 +26,12 @@
#include <config.h>
#endif
-/*#include <goffice/goffice-config.h>
-*/
+#ifndef HAVE_GOFFICE
#include "go-charmap-sel.h"
#include "go-optionmenu.h"
-/*#include <goffice/utils/go-glib-extras.h>
-*/#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
+
+#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdlib.h>
@@ -723,3 +722,5 @@ cs_get_property (GObject *object,
break;
}
}
+
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-charmap-sel.h b/src/go-charmap-sel.h
index 927919b..4a3b375 100644
--- a/src/go-charmap-sel.h
+++ b/src/go-charmap-sel.h
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#ifndef HAVE_GOFFICE
+
#ifndef _GO_CHARMAP_SEL_H_
#define _GO_CHARMAP_SEL_H_
@@ -50,3 +52,4 @@ const char *go_charmap_sel_get_encoding_name (GOCharmapSel *cs, const char *enc
G_END_DECLS
#endif /* _GO_CHARMAP_SEL_H_ */
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-optionmenu.c b/src/go-optionmenu.c
index 29e6630..29543b0 100644
--- a/src/go-optionmenu.c
+++ b/src/go-optionmenu.c
@@ -35,8 +35,7 @@
#include <config.h>
#endif
-/*#include <goffice/goffice-config.h>
-*/
+#ifndef HAVE_GOFFICE
#include "go-optionmenu.h"
#include <gdk/gdkkeysyms.h>
@@ -490,3 +489,5 @@ go_option_menu_get_type (void)
return option_menu_type;
}
+
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-optionmenu.h b/src/go-optionmenu.h
index 5dbf376..e0c3170 100644
--- a/src/go-optionmenu.h
+++ b/src/go-optionmenu.h
@@ -30,6 +30,8 @@
* USA
*/
+#ifndef HAVE_GOFFICE
+
#ifndef _GO_OPTIONMENU_H_
#define _GO_OPTIONMENU_H_
@@ -84,3 +86,4 @@ GtkWidget *go_option_menu_get_history (GOOptionMenu *option_menu);
G_END_DECLS
#endif /* _GO_OPTIONMENU_H_ */
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/import.c b/src/import.c
index 8c69886..66a71fc 100644
--- a/src/import.c
+++ b/src/import.c
@@ -36,7 +36,11 @@
#include "bet_data.h"
#include "import_csv.h"
#include "dialog.h"
+#ifdef HAVE_GOFFICE
+#include <goffice/goffice.h>
+#else
#include "go-charmap-sel.h"
+#endif /* HAVE_GOFFICE */
#include "utils_file_selection.h"
#include "gsb_account.h"
#include "gsb_account_property.h"
diff --git a/src/utils_files.c b/src/utils_files.c
index 2532b04..cca1daa 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -33,7 +33,11 @@
/*START_INCLUDE*/
#include "utils_files.h"
#include "dialog.h"
+#ifdef HAVE_GOFFICE
+#include <goffice/goffice.h>
+#else
#include "go-charmap-sel.h"
+#endif /* HAVE_GOFFICE */
#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_file_config.h"
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit 0359c243694e854903d1c033e1c8d06556ed1f8a
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Mar 17 20:46:58 2013 +0100
Fixes a compilation error when gofice is not installed
diff --git a/configure.ac b/configure.ac
index d7b47bd..9637ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ dnl ================================================================
LT_LIB_M
-PKG_CHECK_MODULES(GRISBI, [gtk+-3.0 >= 3.0.12 glib-2.0 >= 2.28 zlib])
+PKG_CHECK_MODULES(GRISBI, [gtk+-3.0 >= 3.0.12 glib-2.0 >= 2.28 libgsf-1 >= 1.14 zlib])
# Temporary hack until Mandriva ships zlib.pc
#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
GRISBI_LIBS="$LIBM $GRISBI_LIBS"
diff --git a/src/go-charmap-sel.c b/src/go-charmap-sel.c
index c4cad8d..0c30896 100644
--- a/src/go-charmap-sel.c
+++ b/src/go-charmap-sel.c
@@ -26,13 +26,12 @@
#include <config.h>
#endif
-/*#include <goffice/goffice-config.h>
-*/
+#ifndef HAVE_GOFFICE
#include "go-charmap-sel.h"
#include "go-optionmenu.h"
-/*#include <goffice/utils/go-glib-extras.h>
-*/#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
+
+#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdlib.h>
@@ -723,3 +722,5 @@ cs_get_property (GObject *object,
break;
}
}
+
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-charmap-sel.h b/src/go-charmap-sel.h
index 927919b..4a3b375 100644
--- a/src/go-charmap-sel.h
+++ b/src/go-charmap-sel.h
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#ifndef HAVE_GOFFICE
+
#ifndef _GO_CHARMAP_SEL_H_
#define _GO_CHARMAP_SEL_H_
@@ -50,3 +52,4 @@ const char *go_charmap_sel_get_encoding_name (GOCharmapSel *cs, const char *enc
G_END_DECLS
#endif /* _GO_CHARMAP_SEL_H_ */
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-optionmenu.c b/src/go-optionmenu.c
index 29e6630..29543b0 100644
--- a/src/go-optionmenu.c
+++ b/src/go-optionmenu.c
@@ -35,8 +35,7 @@
#include <config.h>
#endif
-/*#include <goffice/goffice-config.h>
-*/
+#ifndef HAVE_GOFFICE
#include "go-optionmenu.h"
#include <gdk/gdkkeysyms.h>
@@ -490,3 +489,5 @@ go_option_menu_get_type (void)
return option_menu_type;
}
+
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/go-optionmenu.h b/src/go-optionmenu.h
index 5dbf376..e0c3170 100644
--- a/src/go-optionmenu.h
+++ b/src/go-optionmenu.h
@@ -30,6 +30,8 @@
* USA
*/
+#ifndef HAVE_GOFFICE
+
#ifndef _GO_OPTIONMENU_H_
#define _GO_OPTIONMENU_H_
@@ -84,3 +86,4 @@ GtkWidget *go_option_menu_get_history (GOOptionMenu *option_menu);
G_END_DECLS
#endif /* _GO_OPTIONMENU_H_ */
+#endif /* NOT HAVE_GOFFICE */
diff --git a/src/import.c b/src/import.c
index 8c69886..66a71fc 100644
--- a/src/import.c
+++ b/src/import.c
@@ -36,7 +36,11 @@
#include "bet_data.h"
#include "import_csv.h"
#include "dialog.h"
+#ifdef HAVE_GOFFICE
+#include <goffice/goffice.h>
+#else
#include "go-charmap-sel.h"
+#endif /* HAVE_GOFFICE */
#include "utils_file_selection.h"
#include "gsb_account.h"
#include "gsb_account_property.h"
diff --git a/src/utils_files.c b/src/utils_files.c
index 2532b04..cca1daa 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -33,7 +33,11 @@
/*START_INCLUDE*/
#include "utils_files.h"
#include "dialog.h"
+#ifdef HAVE_GOFFICE
+#include <goffice/goffice.h>
+#else
#include "go-charmap-sel.h"
+#endif /* HAVE_GOFFICE */
#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_file_config.h"
-----------------------------------------------------------------------
Summary of changes:
src/fenetre_principale.c | 20 ++++++++++++++++++--
src/fenetre_principale.h | 1 +
src/gsb_file.c | 1 +
3 files changed, 20 insertions(+), 2 deletions(-)
hooks/post-receive
--
Grisbi
More information about the cvs
mailing list