[anjuta/system-db-refactor: 115/115] Merge branch 'master' into system-db-refactor
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/system-db-refactor: 115/115] Merge branch 'master' into system-db-refactor
- Date: Thu, 24 Feb 2011 12:54:59 +0000 (UTC)
commit 0fd6350ec4b8fe15073e5ee04e290e1f24320cdf
Merge: 9ee5132 8887393
Author: Johannes Schmid <jhs gnome org>
Date: Thu Feb 24 13:20:02 2011 +0100
Merge branch 'master' into system-db-refactor
Conflicts:
libanjuta/Makefile.am
plugins/am-project/Makefile.am
plugins/language-support-cpp-java/Makefile.am
plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
plugins/language-support-cpp-java/cpp-java-indentation.c
plugins/language-support-cpp-java/cpp-java-indentation.h
plugins/language-support-cpp-java/plugin.c
NEWS | 66 +
configure.ac | 20 +-
data/default.profile | 7 -
libanjuta/Makefile.am | 19 +-
libanjuta/anjuta-column-text-view.c | 8 +-
libanjuta/anjuta-column-text-view.h | 1 +
libanjuta/anjuta-file-drop-entry.c | 4 +-
libanjuta/anjuta-project.c | 175 +-
libanjuta/anjuta-project.h | 29 +-
libanjuta/anjuta-session.c | 7 +-
libanjuta/anjuta-tabber.c | 7 +-
libanjuta/anjuta-token-file.c | 58 +-
libanjuta/anjuta-token-file.h | 1 +
libanjuta/anjuta-token-list.c | 56 +-
libanjuta/anjuta-token-list.h | 2 +-
libanjuta/anjuta-token-stream.c | 31 +-
libanjuta/anjuta-token-stream.h | 1 +
libanjuta/anjuta-token.c | 80 +-
libanjuta/anjuta-token.h | 10 +-
libanjuta/e-splash.c | 33 +-
libanjuta/interfaces/Makefile.am | 65 +
libanjuta/interfaces/Makefile.am.iface | 57 -
libanjuta/interfaces/anjuta-idl-compiler.pl | 30 +-
libanjuta/interfaces/libanjuta.idl | 32 +
libanjuta/libanjuta-3.0.pc.in | 3 +-
manuals/anjuta-manual/es/es.po | 33 +-
pixmaps/anjuta-splash.svg | 231 +
pixmaps/anjuta_splash.png | Bin 64606 -> 30738 bytes
plugins/Makefile.am | 2 +-
plugins/am-project/Makefile.am | 1 +
plugins/am-project/ac-parser.y | 171 +-
plugins/am-project/ac-scanner.h | 54 +-
plugins/am-project/ac-scanner.l | 72 +-
plugins/am-project/ac-writer.c | 147 +-
plugins/am-project/am-parser.y | 4 +-
plugins/am-project/am-project.c | 28 +-
plugins/am-project/am-scanner.h | 24 +-
plugins/am-project/am-scanner.l | 2 +
plugins/am-project/am-writer.c | 593 +-
plugins/am-project/amp-group.c | 15 +
plugins/am-project/amp-group.h | 1 +
plugins/am-project/amp-target.c | 20 +
plugins/am-project/amp-target.h | 1 +
plugins/am-project/command-queue.c | 19 +-
plugins/am-project/projectparser.c | 16 +-
plugins/am-project/tests/acinit.at | 12 +-
plugins/am-project/tests/anjuta.at | 3 +-
plugins/am-project/tests/anjuta.lst | 4113 ++++----
plugins/am-project/tests/data_target.at | 44 +-
plugins/am-project/tests/empty.at | 2 +-
plugins/am-project/tests/group.at | 44 +-
plugins/am-project/tests/include.at | 4 +-
plugins/am-project/tests/local.at | 6 +-
plugins/am-project/tests/module.at | 26 +-
plugins/am-project/tests/package.at | 16 +-
plugins/am-project/tests/parser.at | 2 +-
plugins/am-project/tests/properties.at | 238 +-
plugins/am-project/tests/source.at | 44 +-
plugins/am-project/tests/target.at | 103 +-
plugins/am-project/tests/target_module.at | 8 +-
plugins/am-project/tests/variable.at | 4 +-
plugins/document-manager/action-callbacks.c | 94 +-
plugins/document-manager/action-callbacks.h | 6 +
.../document-manager/anjuta-document-manager.xml | 30 +
plugins/document-manager/plugin.c | 49 +-
plugins/document-manager/search-box.c | 594 +-
plugins/document-manager/search-box.h | 10 +-
plugins/git/anjuta-git.ui | 2258 ++--
plugins/git/git-commit-pane.c | 33 +-
plugins/git/git-commit-pane.h | 1 +
plugins/git/git-create-branch-pane.c | 51 +-
plugins/git/git-create-branch-pane.h | 1 +
plugins/git/git-create-tag-pane.c | 39 +-
plugins/git/git-create-tag-pane.h | 1 +
plugins/git/git-merge-pane.c | 20 +-
plugins/git/git-merge-pane.h | 1 +
plugins/git/plugin.c | 2 +-
plugins/glade/anjuta-glade.plugin.in | 2 +-
plugins/glade/plugin.c | 199 +-
.../cpp-java-indentation.c | 36 +-
.../cpp-java-indentation.h | 4 +-
plugins/language-support-cpp-java/plugin.c | 241 +-
plugins/language-support-python/Makefile.am | 2 +-
.../anjuta-python-autocomplete.py | 21 +-
plugins/language-support-python/plugin.c | 1117 +--
plugins/language-support-python/python-assist.c | 4 +-
.../language-support-python/python-indentation.c | 927 ++
.../language-support-python/python-indentation.h | 39 +
.../python-plugin-properties.ui | 182 +-
plugins/language-support-vala/libanjuta-3.0.vapi | 36 +-
plugins/message-view/anjuta-msgman.c | 50 +-
plugins/message-view/anjuta-msgman.h | 7 +-
plugins/message-view/message-view.c | 27 +-
plugins/message-view/plugin.c | 27 +-
plugins/mk-project/mk-project-private.h | 41 +-
plugins/mk-project/mk-project.c | 933 +--
plugins/mk-project/mk-project.h | 104 +-
plugins/mk-project/mk-rule.c | 34 +-
plugins/mk-project/mk-rule.h | 4 +-
plugins/mk-project/mk-scanner.l | 6 +-
plugins/mk-project/plugin.c | 5 +-
plugins/mk-project/plugin.h | 2 +-
plugins/project-import/plugin.c | 227 +-
plugins/project-import/plugin.h | 1 -
plugins/project-manager/anjuta-project-manager.xml | 2 +
plugins/project-manager/dialogs.c | 52 +-
plugins/project-manager/plugin.c | 46 +-
plugins/project-manager/project-model.c | 326 +-
plugins/project-manager/project-model.h | 28 +-
plugins/project-manager/project-view.c | 59 +-
plugins/project-manager/project-view.h | 2 +
plugins/project-manager/project.c | 18 +-
plugins/project-manager/project.h | 2 +
.../templates/gtkapplication/src/application.h | 4 +-
plugins/python-loader/plugin.c | 5 +-
plugins/run-program/parameters.c | 10 +-
plugins/search/Makefile.am | 50 -
plugins/search/anjuta-search-plugin-48.png | Bin 3999 -> 0 bytes
plugins/search/anjuta-search-plugin.svg | 314 -
plugins/search/anjuta-search.plugin.in | 7 -
plugins/search/anjuta-search.ui | 990 --
plugins/search/anjuta-search.xml | 19 -
plugins/search/plugin.c | 165 -
plugins/search/plugin.h | 46 -
plugins/search/search-replace.c | 2064 ----
plugins/search/search-replace.h | 107 -
plugins/search/search-replace_backend.c | 933 --
plugins/search/search-replace_backend.h | 222 -
plugins/sourceview/anjuta-view.c | 106 +-
plugins/sourceview/sourceview-io.c | 4 +-
plugins/sourceview/sourceview.c | 1 -
plugins/starter/Makefile.am | 11 +-
plugins/starter/plugin.c | 266 +-
plugins/starter/plugin.h | 1 +
plugins/starter/starter.c | 555 -
plugins/starter/starter.h | 51 -
plugins/starter/starter.ui | 280 +
po/POTFILES.in | 6 -
po/es.po | 7011 ++++++------
po/gl.po |10882 +++++++++---------
po/nb.po | 408 +-
po/th.po |11980 ++++++++------------
po/zh_CN.po | 6444 ++++++-----
po/zh_HK.po |11013 +++++++++---------
po/zh_TW.po | 5985 +++++-----
145 files changed, 35361 insertions(+), 39487 deletions(-)
---
diff --cc libanjuta/Makefile.am
index f278a9f,642b460..5824c3a
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -117,8 -118,6 +118,8 @@@ libanjuta_3_la_SOURCES=
anjuta-pkg-config-chooser.c \
anjuta-pkg-config.h \
anjuta-pkg-config.c \
+ anjuta-pkg-scanner.h \
- anjuta-pkg-scanner.c \
++ anjuta-pkg-scanner.c \
anjuta-column-text-view.h \
anjuta-column-text-view.c \
anjuta-file-drop-entry.h \
@@@ -190,11 -191,12 +193,13 @@@ libanjuta_include =
anjuta-file-list.h \
anjuta-pkg-config-chooser.h \
anjuta-pkg-config.h \
+ anjuta-pkg-scanner.h \
anjuta-column-text-view.h \
anjuta-file-drop-entry.h \
- anjuta-entry.h
- anjuta-token.h
+ anjuta-entry.h \
+ anjuta-token.h \
+ anjuta-pkg-config-chooser.h
+
libanjutainclude_HEADERS = \
$(libanjuta_include) \
anjuta-enum-types.h \
diff --cc plugins/language-support-cpp-java/plugin.c
index 02c39b7,34bfb58..8211c94
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@@ -43,8 -44,7 +45,9 @@@
#include "plugin.h"
#include "cpp-java-utils.h"
#include "cpp-java-indentation.h"
+#include "cpp-packages.h"
+
+
/* Pixmaps */
#define ANJUTA_PIXMAP_SWAP "anjuta-swap"
#define ANJUTA_PIXMAP_AUTOINDENT "anjuta-indent-auto"
@@@ -62,9 -64,17 +65,18 @@@
#define PREF_SCHEMA "org.gnome.anjuta.cpp"
#define PREF_INDENT_AUTOMATIC "cpp-indent-automatic"
#define PREF_INDENT_MODELINE "cpp-indent-modeline"
+#define PREF_USER_PACKAGES "cpp-user-packages"
#define PREF_PROJECT_PACKAGES "cpp-load-project-packages"
+ /* Callback generator defines */
+ #define C_SEPARATOR "\n"
+ #define C_BODY "\n{\n\n}\n"
+ #define C_OFFSET 4
+
+ #define CHDR_SEPARATOR " "
+ #define CHDR_BODY ";\n"
+ #define CHDR_OFFSET 1
+
static gpointer parent_class;
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
