[anjuta/cxxparser: 213/213] Merge branch 'master' into cxxparser
- From: Massimo Cora' <mcora src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [anjuta/cxxparser: 213/213] Merge branch 'master' into cxxparser
- Date: Sat, 21 Nov 2009 17:06:47 +0000 (UTC)
commit e29c06b92e09918451ad5ce08371e0f64da9bd73
Merge: 65d832f... 02357a9...
Author: Massimo Corà <mcora src gnome org>
Date: Fri Nov 20 00:01:04 2009 +0100
Merge branch 'master' into cxxparser
Conflicts:
configure.in
libanjuta/interfaces/libanjuta.idl
plugins/language-support-cpp-java/cpp-java-assist.c
plugins/symbol-db/Makefile.am
plugins/symbol-db/anjuta-symbol-db.ui
plugins/symbol-db/symbol-db-engine-queries.h
plugins/symbol-db/test-queries/main.c
Makefile.am | 2 +-
NEWS | 101 +
anjuta.desktop.in.in | 1 -
configure.in | 28 +-
doc/Makefile.am | 4 +-
doc/{anjuta_launcher.1.in => anjuta-launcher.1.in} | 8 +-
launcher/Makefile.am | 4 +-
launcher/{anjuta_launcher.c => anjuta-launcher.c} | 4 +-
libanjuta/Makefile.am | 12 +-
libanjuta/anjuta-command-queue.c | 111 +
libanjuta/anjuta-command-queue.h | 58 +
libanjuta/anjuta-convert.c | 4 +-
libanjuta/anjuta-launcher.c | 10 +-
libanjuta/anjuta-plugin-manager.c | 6 +-
libanjuta/anjuta-plugin.c | 1 -
libanjuta/anjuta-preferences.c | 4 +-
libanjuta/anjuta-profile.c | 4 +-
libanjuta/anjuta-utils-priv.h | 4 +-
libanjuta/anjuta-utils.c | 64 +-
libanjuta/anjuta-utils.h | 3 +
libanjuta/anjuta-vcs-status-tree-view.c | 2 +-
libanjuta/interfaces/anjuta-idl-compiler.pl | 14 +-
libanjuta/interfaces/libanjuta.idl | 17 +-
manuals/anjuta-manual/Makefile.am | 2 +-
manuals/anjuta-manual/el/el.po | 10 +-
manuals/anjuta-manual/th/th.po | 5247 +++++++++
manuals/anjuta-manual/zh_CN/zh_CN.po | 3896 +++++++
manuals/reference/libanjuta/README.inline-doc | 4 +-
.../anjuta-build-basic-autotools-plugin.ui | 145 +-
plugins/build-basic-autotools/configuration-list.c | 6 +
plugins/build-basic-autotools/executer.c | 8 +-
plugins/build-basic-autotools/plugin.c | 25 +-
plugins/class-gen/Makefile.am | 7 +-
plugins/class-gen/anjuta-class-gen-plugin.ui | 245 +-
plugins/class-gen/plugin.c | 4 +-
plugins/class-gen/window.c | 48 +-
plugins/cvs-plugin/anjuta-cvs-plugin.ui | 430 +-
plugins/cvs-plugin/cvs-execute.c | 8 +-
plugins/cvs-plugin/plugin.c | 4 +-
plugins/debug-manager/Makefile.am | 10 +-
plugins/debug-manager/anjuta-debug-manager.ui | 27 +-
plugins/debug-manager/breakpoints.c | 2 +-
plugins/debug-manager/data_view.c | 3 +-
plugins/debug-manager/plugin.c | 22 +-
plugins/debug-manager/queue.c | 21 +-
plugins/debug-manager/sparse_view.c | 3 +-
plugins/debug-manager/start.c | 6 +-
plugins/debug-manager/threads.c | 2 +-
plugins/debug-manager/watch.c | 4 +-
plugins/devhelp/plugin.c | 2 +-
plugins/document-manager/anjuta-bookmarks.c | 118 +-
.../document-manager/anjuta-document-manager.ui | 61 +-
plugins/document-manager/plugin.c | 22 +-
plugins/document-manager/search-box.c | 4 +-
plugins/file-loader/anjuta-recent-chooser-menu.c | 12 +-
plugins/file-loader/dnd.c | 229 +-
plugins/file-loader/dnd.h | 22 +-
plugins/file-loader/plugin.c | 27 +-
plugins/file-manager/Makefile.am | 26 +-
plugins/file-manager/file-model.c | 20 +-
plugins/file-manager/file-model.h | 5 +
plugins/file-manager/file-view.c | 4 +-
plugins/file-manager/plugin.c | 14 +-
plugins/file-manager/plugin.h | 1 +
plugins/file-wizard/anjuta-file-wizard.ui | 121 +-
plugins/file-wizard/file.c | 25 +-
plugins/gbf-am/Makefile.am | 14 +-
plugins/gbf-am/gbf-am-dialogs.ui | 438 +-
plugins/gbf-am/gbf-am-properties.c | 4 +-
plugins/gbf-mkfile/gbf-mkfile-project.c | 2 +-
plugins/gdb/Makefile.am | 10 +-
plugins/gdb/anjuta-gdb.glade | 2136 ----
plugins/gdb/debugger.c | 10 +-
plugins/gdb/plugin.c | 6 +-
plugins/git/Makefile.am | 6 +-
plugins/git/anjuta-git.ui | 640 +-
plugins/git/anjuta-git.xml | 73 +-
plugins/git/git-add-remote-dialog.c | 2 +-
plugins/git/git-branch-delete-command.c | 8 +-
plugins/git/git-branch-delete-command.h | 1 +
plugins/git/git-clone-command.c | 63 +-
plugins/git/git-clone-command.h | 8 +-
plugins/git/git-commit-dialog.c | 25 +-
plugins/git/git-delete-branch-dialog.c | 114 +-
plugins/git/git-delete-remote-dialog.c | 28 +-
plugins/git/git-delete-tag-dialog.c | 12 +-
plugins/git/git-fetch-dialog.c | 2 +-
plugins/git/git-init-command.c | 78 +
plugins/git/git-init-command.h | 58 +
plugins/git/git-init-dialog.c | 54 +
plugins/git/git-init-dialog.h | 33 +
plugins/git/git-log-dialog.c | 12 +-
plugins/git/git-merge-dialog.c | 29 +-
plugins/git/git-pull-dialog.c | 121 +-
plugins/git/git-pull-dialog.h | 1 +
plugins/git/git-push-dialog.c | 101 +-
plugins/git/git-push-dialog.h | 1 +
plugins/git/git-stash-widget.c | 2 +-
plugins/git/git-switch-dialog.c | 5 +-
plugins/git/git-ui-utils.c | 175 +-
plugins/git/git-ui-utils.h | 10 +-
plugins/git/git-vcs-interface.c | 9 +-
plugins/git/plugin.c | 303 +-
plugins/git/plugin.h | 8 +
plugins/glade/anjuta-design-document.c | 4 +-
plugins/glade/anjuta-glade.glade | 6 +-
plugins/glade/plugin.c | 102 +-
plugins/gtodo/add_edit_item.c | 12 +-
plugins/gtodo/callback.c | 8 +-
plugins/gtodo/libgtodo.c | 4 +-
plugins/gtodo/plugin.c | 14 +-
plugins/gtodo/preferences.c | 14 +-
.../anjuta-language-cpp-java.plugin.in | 2 +-
.../anjuta-language-cpp-java.ui | 38 +-
.../language-support-cpp-java/cpp-java-assist.c | 132 +-
plugins/language-support-cpp-java/plugin.c | 29 +-
plugins/language-support-cpp-java/plugin.h | 1 +
plugins/macro/anjuta-macro.ui | 104 +-
plugins/macro/macro-actions.c | 2 +-
plugins/macro/plugin.c | 10 +-
.../message-view/anjuta-message-manager-plugin.ui | 108 +-
plugins/message-view/plugin.c | 2 +-
plugins/patch/patch-plugin.c | 6 +-
plugins/patch/plugin.c | 6 +-
.../project-import/anjuta-project-import.plugin.in | 4 +-
plugins/project-import/plugin.c | 14 +-
plugins/project-import/project-import-dialog.c | 1 -
plugins/project-import/project-import.ui | 14 +-
plugins/project-manager/create_dialogs.ui | 2 +-
plugins/project-manager/gbf-project-util.c | 14 +-
plugins/project-manager/plugin.c | 30 +-
plugins/project-wizard/anjuta-project-wizard.ui | 41 +-
plugins/project-wizard/druid.c | 15 +-
plugins/project-wizard/install.c | 6 +-
plugins/project-wizard/templates/Makefile.am | 8 +-
.../templates/anjuta-plugin-vala/po/Makefile.am | 5 -
.../templates/anjuta-plugin-vala/src/Makefile.am | 9 -
.../anjuta-plugin-vala/src/Makefile.am.tpl | 74 -
.../templates/anjuta-plugin-vala/src/config.vapi | 24 -
.../templates/anjuta-plugin-vala/src/plugin.vala | 104 -
.../{anjuta-plugin-vala.wiz => library.wiz} | 70 +-
.../{anjuta-plugin-vala => library}/Makefile.am | 3 +-
.../configure.ac.tpl | 44 +-
.../project-wizard/templates/library/po/.cvsignore | 4 +
.../templates/library/po/Makefile.am | 5 +
.../{anjuta-plugin-vala => library}/po/POTFILES.in | 3 +-
.../templates/library/src/Makefile.am | 5 +
.../templates/library/src/Makefile.am.tpl | 32 +
plugins/project-wizard/templates/library/src/lib.c | 19 +
plugins/project-wizard/templates/library/src/lib.h | 13 +
.../templates/library/src/library.pc.in | 14 +
plugins/project-wizard/templates/mkfile.wiz | 10 +-
.../templates/translatable-strings.h | 34 +-
plugins/run-program/anjuta-run-program.ui | 2 +-
plugins/run-program/execute.c | 6 +-
plugins/run-program/plugin.c | 8 +-
plugins/search/Makefile.am | 1 -
plugins/search/anjuta-search.ui | 366 +-
plugins/search/plugin.c | 23 +-
plugins/search/plugin.h | 4 +-
plugins/search/search-replace.c | 45 +-
plugins/sourceview/anjuta-editor-sourceview.ui | 2 +-
plugins/sourceview/anjuta-view.c | 163 +-
plugins/sourceview/sourceview-cell.c | 1 -
plugins/sourceview/sourceview-io.c | 1 -
plugins/sourceview/sourceview.c | 25 +-
plugins/sourceview/sourceview.plugin.in | 4 +-
plugins/starter/starter.c | 2 +-
plugins/subversion/anjuta-subversion.ui | 34 +-
plugins/subversion/plugin.c | 44 +-
plugins/subversion/subversion-commit-dialog.c | 2 +-
plugins/subversion/subversion-diff-dialog.c | 2 +-
plugins/subversion/subversion-log-dialog.c | 8 +-
plugins/subversion/subversion-vcs-interface.c | 4 +
plugins/symbol-db/anjuta-symbol-db.ui | 22 +-
plugins/symbol-db/plugin.c | 25 +-
plugins/symbol-db/symbol-db-view.c | 2 +-
plugins/terminal/anjuta-terminal-plugin.ui | 23 +-
plugins/terminal/terminal.c | 58 +-
plugins/tools/anjuta-tools.ui | 16 +-
plugins/tools/editor.c | 2 +-
plugins/tools/execute.c | 6 +-
plugins/tools/tool.c | 2 +-
plugins/tools/variable.c | 2 +-
po/LINGUAS | 3 +
po/POTFILES.in | 4 +-
po/POTFILES.skip | 8 +-
po/bg.po | 9102 ++++++++--------
po/ca.po | 8522 ++++++++-------
po/ca valencia po |10209 +++++++++++++++++
po/cs.po | 1539 ++--
po/da.po | 3746 ++++---
po/de.po | 5381 ++++++----
po/el.po | 16 +-
po/en shaw po | 8102 ++++++++++++++
po/en_GB.po | 8601 +++++++++-------
po/es.po | 3255 ++++---
po/fi.po | 6982 +++++++------
po/fr.po | 4450 +++++----
po/gl.po | 3475 ++++---
po/he.po | 8615 ++++++++-------
po/hu.po | 6057 +++++------
po/id.po | 8902 +++++++++-------
po/it.po | 6397 +++++------
po/mai.po | 9712 +++++++++++++++++
po/nb.po | 7409 +++++++-------
po/pl.po | 9333 +++++++++-------
po/pt.po | 7060 +++++++------
po/pt_BR.po | 5583 +++++-----
po/ru.po | 8767 +++++++++-------
po/sl.po | 8095 ++++++++-------
po/sv.po | 2416 +++--
po/th.po | 1912 ++--
po/tr.po | 6564 +++++------
po/uk.po | 1998 ++--
po/zh_CN.po | 4439 +++++---
po/zh_HK.po |11414 ++++++++++----------
po/zh_TW.po |11425 ++++++++++----------
src/Makefile.am | 8 +-
src/anjuta-actions.h | 2 +-
src/anjuta.c | 26 +-
src/main.c | 28 +-
src/preferences.ui | 4 +-
223 files changed, 133242 insertions(+), 84419 deletions(-)
---
diff --cc configure.in
index f420b28,255880c..620ed0b
--- a/configure.in
+++ b/configure.in
@@@ -72,7 -72,7 +72,8 @@@ GNOME_DOC_INI
AC_PROG_CC
AC_PROG_CPP
AC_LANG_C
+AC_PROG_CXX
+ AM_PROG_CC_C_O
GNOME_COMPILE_WARNINGS(maximum)
AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
