[anjuta: 173/173] Merge branch 'master' into git-shell
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta: 173/173] Merge branch 'master' into git-shell
- Date: Fri, 26 Nov 2010 08:51:36 +0000 (UTC)
commit eae56d494c3e40813076a147deb5604ee4b4f4fd
Merge: 17c4c79 1bb6753
Author: James Liggett <jrliggett cox net>
Date: Fri Nov 26 00:46:16 2010 -0800
Merge branch 'master' into git-shell
Conflicts:
libanjuta/Makefile.am
libanjuta/libanjuta.h
.gitignore | 51 +-
configure.ac | 55 +-
libanjuta/Makefile.am | 11 +-
libanjuta/anjuta-encodings.c | 2 +
libanjuta/anjuta-marshal.list | 1 +
libanjuta/anjuta-project.c | 942 ++-
libanjuta/anjuta-project.h | 243 +-
libanjuta/anjuta-tabber.c | 266 +-
libanjuta/anjuta-token-file.c | 543 +
libanjuta/anjuta-token-file.h | 66 +
libanjuta/anjuta-token-list.c | 803 ++
libanjuta/anjuta-token-list.h | 63 +
libanjuta/anjuta-token-stream.c | 348 +
libanjuta/anjuta-token-stream.h | 45 +
libanjuta/anjuta-token-style.h | 47 +
libanjuta/anjuta-token.c | 1584 +++
libanjuta/anjuta-token.h | 147 +
libanjuta/anjuta-utils.c | 38 +-
libanjuta/anjuta-utils.h | 3 +-
libanjuta/interfaces/libanjuta.idl | 345 +-
libanjuta/libanjuta.h | 1 +
manuals/anjuta-manual/th/th.po | 79 +-
plugins/Makefile.am | 3 +-
plugins/am-project/Makefile.am | 101 +
plugins/am-project/ac-parser.y | 585 ++
plugins/am-project/ac-scanner.h | 69 +
plugins/am-project/ac-scanner.l | 294 +
plugins/am-project/ac-writer.c | 440 +
plugins/am-project/ac-writer.h | 42 +
plugins/am-project/am-node.c | 940 ++
plugins/am-project/am-node.h | 104 +
plugins/am-project/am-parser.y | 574 ++
.../am-project-plugin-48.png} | Bin 866 -> 866 bytes
plugins/am-project/am-project-private.h | 166 +
plugins/am-project/am-project.c | 3091 ++++++
plugins/am-project/am-project.h | 143 +
.../am-project.plugin.in} | 4 +-
plugins/am-project/am-properties.c | 399 +
plugins/am-project/am-properties.h | 48 +
plugins/am-project/am-scanner.h | 97 +
plugins/am-project/am-scanner.l | 391 +
plugins/am-project/am-writer.c | 981 ++
plugins/am-project/am-writer.h | 45 +
plugins/am-project/command-queue.c | 390 +
plugins/am-project/command-queue.h | 74 +
plugins/{gbf-mkfile => am-project}/plugin.c | 30 +-
plugins/{gbf-mkfile => am-project}/plugin.h | 26 +-
plugins/am-project/projectparser.c | 719 ++
plugins/am-project/tests/Makefile.am | 42 +
plugins/am-project/tests/acinit.at | 88 +
plugins/am-project/tests/anjuta.at | 5 +
plugins/am-project/tests/anjuta.lst | 2100 ++++
plugins/am-project/tests/empty.at | 15 +
plugins/am-project/tests/group.at | 147 +
plugins/am-project/tests/include.at | 22 +
plugins/am-project/tests/local.at | 19 +
plugins/am-project/tests/module.at | 101 +
plugins/am-project/tests/package.at | 105 +
plugins/am-project/tests/parser.at | 18 +
plugins/am-project/tests/properties.at | 109 +
plugins/am-project/tests/source.at | 135 +
plugins/am-project/tests/target.at | 122 +
plugins/am-project/tests/testsuite.at | 12 +
plugins/am-project/tests/variable.at | 18 +
.../anjuta-build-basic-autotools-plugin.ui | 4 +-
plugins/build-basic-autotools/executer.c | 2 +-
plugins/build-basic-autotools/plugin.c | 47 +-
plugins/class-gen/plugin.c | 5 +-
plugins/debug-manager/breakpoints.c | 2 +-
plugins/debug-manager/data_view.c | 4 +-
plugins/debug-manager/plugin.c | 2 +-
plugins/debug-manager/start.c | 4 +-
plugins/dir-project/Makefile.am | 4 +-
plugins/dir-project/dir-node.c | 221 +
plugins/dir-project/dir-node.h | 63 +
plugins/dir-project/dir-project.c | 755 +-
plugins/dir-project/dir-project.h | 68 +-
plugins/dir-project/plugin.c | 9 +-
plugins/document-manager/anjuta-bookmarks.c | 36 +-
plugins/document-manager/anjuta-docman.c | 2 +-
plugins/file-wizard/file.c | 5 +-
plugins/gbf-am/GBF/AmFiles.pm | 1647 ---
plugins/gbf-am/GBF/Makefile.am | 6 -
plugins/gbf-am/Makefile.am | 84 -
plugins/gbf-am/gbf-am-config.c | 385 -
plugins/gbf-am/gbf-am-config.h | 86 -
plugins/gbf-am/gbf-am-dialogs.ui | 423 -
plugins/gbf-am/gbf-am-parse.in | 2623 -----
plugins/gbf-am/gbf-am-project.c | 4207 --------
plugins/gbf-am/gbf-am-project.h | 140 -
plugins/gbf-am/gbf-am-properties.c | 1517 ---
plugins/gbf-am/gbf-am-properties.h | 38 -
plugins/gbf-am/output.dtd | 39 -
plugins/gbf-am/program.xpm | 56 -
plugins/gbf-am/run-test.sh | 82 -
plugins/gbf-am/shared.xpm | 70 -
plugins/gbf-am/static.xpm | 57 -
plugins/gbf-am/test.c | 218 -
plugins/gbf-am/unknown.xpm | 119 -
plugins/gbf-mkfile/GBF/General.pm | 119 -
plugins/gbf-mkfile/GBF/Make.pm | 1321 ---
plugins/gbf-mkfile/GBF/Makefile.am | 6 -
plugins/gbf-mkfile/gbf-mkfile-config.c | 351 -
plugins/gbf-mkfile/gbf-mkfile-config.h | 89 -
plugins/gbf-mkfile/gbf-mkfile-parse.in | 1797 ----
plugins/gbf-mkfile/gbf-mkfile-project.c | 3934 --------
plugins/gbf-mkfile/gbf-mkfile-project.h | 144 -
plugins/gbf-mkfile/gbf-mkfile-properties.c | 431 -
plugins/gbf-mkfile/gbf-mkfile-properties.h | 42 -
.../anjuta-language-cpp-java.ui | 64 +-
plugins/language-support-cpp-java/plugin.c | 61 +-
plugins/language-support-vala/Makefile.am | 2 +-
plugins/language-support-vala/plugin.vala | 68 +-
plugins/language-support-vala/provider.vala | 4 +-
plugins/{gbf-mkfile => mk-project}/Makefile.am | 51 +-
plugins/mk-project/mk-parser.y | 520 +
.../mk-project-plugin-48.png} | Bin 866 -> 866 bytes
plugins/mk-project/mk-project-private.h | 89 +
plugins/mk-project/mk-project.c | 1467 +++
plugins/mk-project/mk-project.h | 125 +
.../mk-project.plugin.in} | 6 +-
plugins/mk-project/mk-project.ui | 419 +
plugins/mk-project/mk-rule.c | 380 +
plugins/mk-project/mk-rule.h | 40 +
plugins/mk-project/mk-scanner.h | 85 +
plugins/mk-project/mk-scanner.l | 294 +
plugins/{gbf-am => mk-project}/plugin.c | 22 +-
plugins/{gbf-am => mk-project}/plugin.h | 26 +-
plugins/project-manager/Makefile.am | 42 +-
plugins/project-manager/anjuta-project-manager.xml | 4 +
plugins/project-manager/create_dialogs.ui | 468 -
plugins/project-manager/dialogs.c | 1652 +++
plugins/project-manager/dialogs.h | 43 +
plugins/project-manager/gbf-project-util.c | 827 --
plugins/project-manager/gbf-project-util.h | 63 -
plugins/project-manager/plugin.c | 980 +-
plugins/project-manager/plugin.h | 16 +-
plugins/project-manager/pm_dialogs.ui | 927 ++
plugins/project-manager/project-marshal.list | 1 +
.../{gbf-project-model.c => project-model.c} | 518 +-
.../{gbf-project-model.h => project-model.h} | 29 +-
plugins/project-manager/project-util.c | 107 +
plugins/project-manager/project-util.h | 43 +
.../{gbf-project-view.c => project-view.c} | 219 +-
.../{gbf-project-view.h => project-view.h} | 16 +-
plugins/project-manager/project.c | 629 ++
plugins/project-manager/project.h | 108 +
.../{gbf-tree-data.c => tree-data.c} | 286 +-
.../{gbf-tree-data.h => tree-data.h} | 54 +-
plugins/project-wizard/druid.c | 4 +-
plugins/project-wizard/property.c | 25 +-
.../project-wizard/templates/gtk/src/project.ui | 2 +-
plugins/run-program/anjuta-run-program.ui | 2 +
plugins/run-program/parameters.c | 2 +-
plugins/sourceview/Makefile.am | 3 +-
plugins/sourceview/anjuta-message-16.png | Bin 0 -> 515 bytes
plugins/sourceview/sourceview.c | 87 +-
plugins/symbol-db/Makefile.am | 2 -
plugins/symbol-db/anjuta-symbol-db.ui | 111 +-
plugins/symbol-db/benchmark/symbol-db/benchmark.c | 6 +-
plugins/symbol-db/plugin.c | 600 +-
plugins/symbol-db/plugin.h | 10 +-
plugins/symbol-db/symbol-db-engine-core.c | 468 +-
plugins/symbol-db/symbol-db-engine-core.h | 73 +-
plugins/symbol-db/symbol-db-engine-priv.h | 45 +-
plugins/symbol-db/symbol-db-engine-utils.c | 2 +-
plugins/symbol-db/symbol-db-engine-utils.h | 4 +-
plugins/symbol-db/symbol-db-prefs.c | 618 --
plugins/symbol-db/symbol-db-prefs.h | 77 -
plugins/symbol-db/symbol-db-system.c | 23 +-
plugins/symbol-db/symbol-db-system.h | 4 +-
plugins/symbol-db/symbol-db-views.c | 2 +-
plugins/symbol-db/tables.sql | 6 +-
po/LINGUAS | 1 +
po/POTFILES.in | 27 +-
po/ug.po |10459 ++++++++++++++++++++
176 files changed, 38294 insertions(+), 24885 deletions(-)
---
diff --cc libanjuta/Makefile.am
index 5c50ed9,41b4097..bdb5d40
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -93,31 -91,21 +93,38 @@@ libanjuta_3_la_SOURCES=
gbf-project.h \
anjuta-command-queue.c \
anjuta-command-queue.h \
+ anjuta-token.c \
+ anjuta-token.h \
+ anjuta-token-list.h \
+ anjuta-token-list.c \
+ anjuta-token-file.h \
+ anjuta-token-file.c \
+ anjuta-token-stream.c \
+ anjuta-token-stream.h \
anjuta-project.c \
anjuta-project.h \
+ anjuta-drop-entry.c \
+ anjuta-drop-entry.h \
anjuta-tabber.c \
anjuta-tabber.h \
+ anjuta-command-bar.c \
+ anjuta-command-bar.h \
+ anjuta-dock.c \
+ anjuta-dock.h \
+ anjuta-dock-pane.c \
+ anjuta-dock-pane.h \
+ anjuta-file-list.c \
+ anjuta-file-list.h \
anjuta-pkg-config-chooser.h \
- anjuta-pkg-config-chooser.c
+ anjuta-pkg-config-chooser.c \
+ anjuta-column-text-view.h \
+ anjuta-column-text-view.c \
+ anjuta-file-drop-entry.h \
+ anjuta-file-drop-entry.c \
+ anjuta-entry.h \
+ anjuta-entry.c
+
-
if HAVE_PLUGIN_GLADE
# For now install in our own prefix
@@@ -174,16 -162,9 +181,18 @@@ libanjuta_include =
gbf-project.h \
anjuta-project.h \
anjuta-command-queue.h \
+ anjuta-drop-entry.h \
anjuta-tabber.h \
+ anjuta-command-bar.h \
+ anjuta-dock.h \
+ anjuta-dock-pane.h \
+ anjuta-file-list.h \
+ anjuta-pkg-config-chooser.h \
+ anjuta-column-text-view.h \
+ anjuta-file-drop-entry.h \
+ anjuta-entry.h
+ anjuta-token.h \
+ anjuta-pkg-config-chooser.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
diff --cc libanjuta/libanjuta.h
index af6a5ab,2939869..72b2ec3
--- a/libanjuta/libanjuta.h
+++ b/libanjuta/libanjuta.h
@@@ -51,9 -51,6 +51,10 @@@
#include <libanjuta/anjuta-sync-command.h>
#include <libanjuta/gbf-project.h>
#include <libanjuta/anjuta-project.h>
+#include <libanjuta/anjuta-command-queue.h>
+#include <libanjuta/anjuta-command-bar.h>
+#include <libanjuta/anjuta-dock.h>
+#include <libanjuta/anjuta-dock-pane.h>
+ #include <libanjuta/anjuta-token.h>
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
