[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_1_1-162-g0359c24
Pierre Biava
noreply at sourceforge.net
Tue Mar 19 22:22:29 CET 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, master has been updated
via 0359c243694e854903d1c033e1c8d06556ed1f8a (commit)
via 4d6ec23ebcf4623b7d5037f2357a7b54ca24aeea (commit)
via 5f40d7ac1df8a86cf68654a5a3bb4cad4bb86ba5 (commit)
via 4e4ac534378109fc053aa92801b9b43d380f32ad (commit)
via d3d2429e0d7d2fb9da71fb3843f1e23bdf84f76b (commit)
via e06bcd3d3154502e6a4ec1276ce358ac571780a3 (commit)
via f593d69a13beac6645b3f10b70f5399827f58342 (commit)
via 5c8151ea2d42eabf4007c1159e7f0a7912142c45 (commit)
via 0ad0ff610ee27e929389a3c312bb56391b2ffac1 (commit)
via 9fba59ff39a164599aafbe7d413a88cdcf6815fc (commit)
via fe70680618a9e0c240789be97e947f412f942c4f (commit)
via 095075f5db2d46c0695d75d98647d5606b4ba2bd (commit)
via 60843482a083558a9a2f512d51f70996e92e9394 (commit)
via cbbdd5a71550a92020384e4dc49df605a539495d (commit)
via dccbcb379eaf6a52e67869548dfeae53e2d9aab9 (commit)
via e8feeee5a37711316b6b29feb250f77d9927f75b (commit)
via 331a019382dc4cf2d967e4d507b3c1baf8c7295f (commit)
via f716d526bc544cecfb32c8749f74a038793a9bef (commit)
via deb107023484292d70209b4c694aa2632d3dfccf (commit)
via 4699da4c504f4b2757232a34e47e6a043ca21a21 (commit)
via c855120c1bf2141485c29750e464ecae5fec4bd6 (commit)
via 7f1d2a725c4705ddc4d53c1dd667b724c89454cc (commit)
via 2a0b8a1ea6f161cc24379537838ee71c35a16c08 (commit)
via 3ebb638e6ac5e24ccfa9e57e1a77ec9534e8857b (commit)
via a6b8acf078d8a766ff52bcff3aa04b26d3ffb0d9 (commit)
via a04e6d770e3860622a9a69759d7f3636f250e5a0 (commit)
from db5ece08cb6d36a14504b87ef9d9fbe6c4576722 (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"
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.
*/
... 3123 lines suppressed ...
hooks/post-receive
--
Grisbi
More information about the cvs
mailing list