[anjuta/newproject: 159/160] Merge commit 'ANJUTA_BEFORE_GTK_3_0' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 159/160] Merge commit 'ANJUTA_BEFORE_GTK_3_0' into newproject
- Date: Wed, 3 Nov 2010 21:41:20 +0000 (UTC)
commit 18e0b49976559c1b97320c3c85592a05111e4237
Merge: 24affb2 7866152
Author: Sébastien Granjoux <seb sfo free fr>
Date: Wed Nov 3 21:57:22 2010 +0100
Merge commit 'ANJUTA_BEFORE_GTK_3_0' into newproject
Conflicts:
configure.ac
plugins/gbf-am/gbf-am-parse.in
plugins/gbf-am/gbf-am-project.c
plugins/gbf-mkfile/gbf-mkfile-project.c
.gitignore | 66 +-
ABOUT-NLS | 324 -
Makefile.am | 2 +
NEWS | 33 +
autogen.sh | 27 +-
configure.in => configure.ac | 111 +-
libanjuta/Makefile.am | 6 +-
libanjuta/anjuta-launcher.c | 3 +-
libanjuta/anjuta-plugin-manager.c | 58 +-
libanjuta/anjuta-plugin-manager.h | 9 +-
libanjuta/anjuta-preferences.c | 1505 +---
libanjuta/anjuta-preferences.h | 122 +-
libanjuta/anjuta-tabber.c | 2 +-
libanjuta/anjuta-utils.c | 13 +
libanjuta/anjuta-utils.h | 3 +
libanjuta/interfaces/libanjuta.idl | 2 +-
m4/.gitignore | 36 +
manuals/anjuta-manual/Makefile.am | 2 +-
manuals/anjuta-manual/de/de.po | 459 +-
manuals/anjuta-manual/es/es.po | 49 +-
manuals/anjuta-manual/fr/fr.po | 34 +-
manuals/anjuta-manual/ja/ja.po | 5248 +++++++++
manuals/anjuta-manual/sl/sl.po | 2390 ++++
plugins/Makefile.am | 5 +-
plugins/build-basic-autotools/Makefile.am | 1 +
.../anjuta-build-basic-autotools-plugin.ui | 50 +-
plugins/build-basic-autotools/executer.c | 6 +-
plugins/build-basic-autotools/plugin.c | 87 +-
plugins/build-basic-autotools/plugin.h | 3 +
plugins/class-gen/plugin.c | 9 +-
plugins/class-gen/window.c | 2 +-
plugins/cvs-plugin/Makefile.am | 3 +-
plugins/cvs-plugin/anjuta-cvs-plugin.ui | 6 +-
plugins/cvs-plugin/cvs-interface.c | 52 +-
plugins/cvs-plugin/plugin.c | 11 +-
plugins/cvs-plugin/plugin.h | 3 +
plugins/debug-manager/Makefile.am | 20 +-
.../debug-manager/anjuta-debug-manager.schemas.in | 18 -
plugins/debug-manager/anjuta-debug-manager.ui | 10 +-
.../org.gnome.anjuta.debug-manager.gschema.xml.in | 8 +
plugins/debug-manager/start.c | 13 +-
plugins/document-manager/Makefile.am | 4 +-
plugins/document-manager/action-callbacks.c | 42 +-
plugins/document-manager/anjuta-docman.c | 32 +-
plugins/document-manager/anjuta-docman.h | 3 +-
.../anjuta-document-manager.plugin.in | 2 +-
.../document-manager/anjuta-document-manager.ui | 14 +-
.../document-manager.gschema-part.xml | 24 +
plugins/document-manager/plugin.c | 370 +-
plugins/document-manager/plugin.h | 10 +-
plugins/file-loader/plugin.c | 2 +-
plugins/file-manager/Makefile.am | 1 +
plugins/file-manager/file-manager.ui | 10 +-
plugins/file-manager/plugin.c | 79 +-
plugins/file-manager/plugin.h | 2 +-
plugins/file-wizard/file.c | 3 +-
plugins/file-wizard/file.h | 3 +-
plugins/gdb/plugin.c | 15 +-
plugins/gdb/preferences.c | 2 +-
plugins/gdb/utilities.h | 3 -
plugins/gtodo/Makefile.am | 5 +
plugins/gtodo/anjuta-gtodo.gschema-part.xml | 3 +
plugins/gtodo/callback.c | 9 +-
plugins/gtodo/interface.c | 131 +-
plugins/gtodo/list_tooltip.c | 57 -
plugins/gtodo/main.h | 2 +-
plugins/gtodo/notification.c | 4 +-
plugins/gtodo/preferences.c | 195 +-
plugins/language-manager/languages.xml | 2 +-
plugins/language-support-cpp-java/Makefile.am | 1 +
.../anjuta-language-cpp-java.ui | 86 +-
.../language-support-cpp-java/cpp-java-assist.c | 86 +-
.../language-support-cpp-java/cpp-java-assist.h | 2 +-
plugins/language-support-cpp-java/plugin.c | 189 +-
plugins/language-support-cpp-java/plugin.h | 2 +-
.../anjuta-language-javascript.ui | 16 +-
plugins/language-support-js/util.c | 6 +-
plugins/language-support-python/Makefile.am | 6 +-
plugins/language-support-python/plugin.c | 54 +-
plugins/language-support-python/plugin.h | 1 +
plugins/language-support-python/python-assist.c | 45 +-
plugins/language-support-python/python-assist.h | 3 +-
.../python-plugin-properties.ui | 18 +-
.../python-plugin.plugin.in | 2 +-
.../python.gschema-part.xml | 3 +
plugins/language-support-vala/plugin.vala | 5 +-
plugins/language-support-vala/provider.vala | 16 +-
plugins/message-view/Makefile.am | 1 +
.../message-view/anjuta-message-manager-plugin.ui | 122 +-
plugins/message-view/anjuta-msgman.c | 14 +-
plugins/message-view/anjuta-msgman.h | 6 +-
plugins/message-view/message-view.c | 73 +-
plugins/message-view/plugin.c | 95 +-
plugins/message-view/plugin.h | 1 +
plugins/project-wizard/druid.c | 53 +-
plugins/project-wizard/templates/gtk.wiz.in | 4 +-
.../project-wizard/templates/gtk/src/project.ui | 2 +-
plugins/project-wizard/templates/gtkmm.wiz.in | 2 +-
.../python-loader/anjuta-python-loader.plugin.in | 2 +-
plugins/run-program/Makefile.am | 5 +
plugins/run-program/execute.c | 17 +-
.../org.gnome.anjuta.run.gschema.xml.in | 8 +
plugins/search/Makefile.am | 4 +-
plugins/search/anjuta-search.ui | 337 +-
plugins/search/search-replace.c | 30 +-
plugins/search/search-replace.h | 5 -
plugins/search/search_preferences.c | 587 -
plugins/search/search_preferences.h | 27 -
plugins/snippets-manager/Makefile.am | 6 +-
plugins/snippets-manager/plugin.c | 29 +-
plugins/snippets-manager/plugin.h | 2 +
plugins/snippets-manager/snippets-editor.c | 2 +-
plugins/snippets-manager/snippets-editor.ui | 6 +-
plugins/sourceview/Makefile.am | 2 +
plugins/sourceview/anjuta-editor-sourceview.ui | 182 +-
plugins/sourceview/plugin.c | 34 +-
plugins/sourceview/plugin.h | 1 +
plugins/sourceview/sourceview-io.c | 6 +-
plugins/sourceview/sourceview-prefs.c | 419 +-
plugins/sourceview/sourceview-print.c | 149 +-
plugins/sourceview/sourceview-private.h | 4 +-
plugins/sourceview/sourceview.c | 28 +-
plugins/sourceview/sourceview.gschema-part.xml | 18 +
plugins/starter/Makefile.am | 2 -
plugins/symbol-db/Makefile.am | 2 +
plugins/symbol-db/anjuta-symbol-db.ui | 6 +-
plugins/symbol-db/plugin.c | 22 +-
plugins/symbol-db/plugin.h | 2 +-
plugins/symbol-db/symbol-db-prefs.c | 20 +-
plugins/symbol-db/symbol-db-prefs.h | 12 +-
plugins/terminal/Makefile.am | 1 +
plugins/terminal/anjuta-terminal-plugin.ui | 2 +-
plugins/terminal/terminal.c | 116 +-
plugins/tools/Makefile.am | 4 +
plugins/tools/plugin.c | 19 +-
po/POTFILES.in | 1 +
po/ca.po | 3910 ++++---
po/ca valencia po | 3929 ++++---
po/cs.po | 3849 ++++---
po/da.po | 393 +-
po/de.po | 942 +-
po/el.po | 4585 +++++----
po/en_GB.po | 145 +-
po/es.po | 547 +-
po/fr.po | 323 +-
po/gl.po | 155 +-
po/hu.po | 134 +-
po/id.po | 532 +-
po/it.po | 3548 ++++---
po/ja.po |11975 ++++++++++++--------
po/pl.po |10611 ++++++++----------
po/pt.po | 4252 ++++---
po/pt_BR.po | 3829 ++++---
po/ru.po | 4463 ++++----
po/sl.po | 565 +-
po/th.po | 2909 +++---
po/zh_CN.po | 1211 ++-
po/zh_HK.po | 1897 ++--
po/zh_TW.po | 1961 ++--
scripts/build-schemas.mk | 32 +-
scripts/builder2schema.pl | 99 +-
src/Makefile.am | 2 +
src/action-callbacks.c | 8 +-
src/anjuta-app.c | 105 +-
src/anjuta-app.h | 1 +
src/anjuta.c | 22 +-
src/anjuta.gschema-part.xml | 6 +
src/preferences.ui | 221 +-
168 files changed, 48003 insertions(+), 34031 deletions(-)
---
diff --cc .gitignore
index 64ac0c3,a92530c..cf38454
--- a/.gitignore
+++ b/.gitignore
@@@ -24,103 -35,15 +24,39 @@@
/intltool-merge.in
/intltool-update
/intltool-update.in
+/_libs
+/.libs
/libtool
+ /po/*.gmo
/po/*.mo
/po/.intltool-merge-cache
+/po/it.gmo
+/po/ja.gmo
+/po/kn.gmo
+/po/ko.gmo
+/po/lt.gmo
+/po/lv.gmo
+/po/mai.gmo
/po/Makefile
/po/Makefile.in
/po/Makefile.in.in
+/po/mk.gmo
+/po/ml.gmo
+/po/*.mo
+/po/mr.gmo
+/po/ms.gmo
+/po/nb.gmo
+/po/ne.gmo
+/po/nl.gmo
+/po/oc.gmo
+/po/or.gmo
+/po/pa.gmo
+/po/pl.gmo
/po/POTFILES
- /po/ar.gmo
- /po/az.gmo
- /po/be.gmo
- /po/be latin gmo
- /po/bg.gmo
- /po/ca.gmo
- /po/ca valencia gmo
- /po/cs.gmo
- /po/da.gmo
- /po/de.gmo
- /po/dz.gmo
- /po/el.gmo
- /po/en shaw gmo
- /po/en_CA.gmo
- /po/en_GB.gmo
- /po/es.gmo
- /po/eu.gmo
- /po/fi.gmo
- /po/fr.gmo
- /po/ga.gmo
- /po/gl.gmo
- /po/gu.gmo
- /po/he.gmo
- /po/hi.gmo
- /po/hr.gmo
- /po/hu.gmo
- /po/id.gmo
- /po/it.gmo
- /po/ja.gmo
- /po/kn.gmo
- /po/ko.gmo
- /po/lt.gmo
- /po/lv.gmo
- /po/mai.gmo
- /po/mk.gmo
- /po/ml.gmo
- /po/mr.gmo
- /po/ms.gmo
- /po/nb.gmo
- /po/ne.gmo
- /po/nl.gmo
- /po/oc.gmo
- /po/or.gmo
- /po/pa.gmo
- /po/pl.gmo
- /po/pt.gmo
- /po/pt_BR.gmo
- /po/ro.gmo
- /po/ru.gmo
- /po/rw.gmo
- /po/si.gmo
- /po/sk.gmo
- /po/sl.gmo
- /po/sq.gmo
- /po/sr.gmo
- /po/sr latin gmo
/po/stamp-it
- /po/sv.gmo
- /po/te.gmo
- /po/th.gmo
- /po/tr.gmo
- /po/uk.gmo
- /po/vi.gmo
- /po/zh_CN.gmo
- /po/zh_HK.gmo
- /po/zh_TW.gmo
/so_locations
/stamp-h1
+/.*.swp
+/*.tab.c
/tags
+/TAGS
diff --cc configure.ac
index a3dcbb7,032815d..478b3b4
--- a/configure.ac
+++ b/configure.ac
@@@ -348,11 -377,7 +363,9 @@@ AM_GNU_GETTEXT_VERSION([0.17]
GETTEXT_PACKAGE=anjuta
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
- AM_GLIB_GNU_GETTEXT
- IT_PROG_INTLTOOL([0.40.1])
+BISON_I18N
+
dnl ***************************************************************************
dnl Check for gtk-doc.
dnl ***************************************************************************
@@@ -768,12 -804,7 +792,12 @@@ f
AM_CONDITIONAL(HAVE_GRAPHVIZ, [test x$libgraphviz_found = xyes])
+dnl Test using autotest
+dnl -----------------------------
+AC_CONFIG_TESTDIR(plugins/am-project/tests)
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
- AC_OUTPUT([
+ AC_CONFIG_FILES([
Makefile
po/Makefile.in
libfoocanvas/Makefile
@@@ -911,6 -944,9 +935,7 @@@ manuals/anjuta-faqs/Makefil
manuals/anjuta-build-tutorial/Makefile
mime/Makefile
])
+ AC_OUTPUT
-chmod +x ${ac_top_build_dir}plugins/gbf-am/gbf-am-parse
-chmod +x ${ac_top_build_dir}plugins/gbf-mkfile/gbf-mkfile-parse
echo " "
echo "-------------------------------------------------------------------"
echo "Conditionally built plugins:"
diff --cc plugins/Makefile.am
index 824a385,b17d8ef..443aa52
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@@ -30,13 -30,13 +30,12 @@@ SUBDIRS = .
git \
sourceview \
run-program \
- gbf-am \
- gbf-mkfile \
- dir-project \
starter \
+ am-project \
+ dir-project \
js-debugger \
- language-support-js \
language-support-vala \
- language-support-python \
python-loader
+ # language-support-js
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
