[anjuta/newproject: 29/31] Merge branch 'master' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 29/31] Merge branch 'master' into newproject
- Date: Mon, 6 Sep 2010 18:44:17 +0000 (UTC)
commit 162bc90be85172344e3f332ed719933df0bc2e16
Merge: 399b66c 315dbf2
Author: Sébastien Granjoux <seb sfo free fr>
Date: Sat Sep 4 11:17:51 2010 +0200
Merge branch 'master' into newproject
Conflicts:
libanjuta/interfaces/libanjuta.idl
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch newproject
# Changes to be committed:
#
# modified: NEWS
# modified: configure.in
# modified: libanjuta/Makefile.am
# modified: libanjuta/anjuta-save-prompt.c
# modified: libanjuta/interfaces/anjuta-idl-compiler.pl
# modified: libanjuta/interfaces/libanjuta.idl
# deleted: libfoocanvas/foo-canvas-marshal.c
# deleted: libfoocanvas/foo-canvas-marshal.h
# modified: plugins/gtodo/export.c
# modified: plugins/language-support-cpp-java/cxxparser/engine-parser.cpp
# modified: plugins/language-support-js/anjuta-language-javascript.ui
# modified: plugins/language-support-python/plugin.c
# modified: plugins/language-support-python/python-plugin-properties.ui
# modified: plugins/language-support-vala/plugin.vala
# modified: plugins/project-wizard/druid.c
# modified: plugins/snippets-manager/snippets-editor.ui
# modified: plugins/snippets-manager/snippets-manager-preferences.ui
# modified: po/en_GB.po
# modified: po/es.po
# modified: po/gl.po
# modified: po/hu.po
# modified: po/id.po
# modified: po/nb.po
# modified: po/sl.po
# modified: po/sv.po
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .anjuta/
# .anjuta_sym_db.db
# .anjuta_sym_db.db.ref
# Debug/
# INSTALL
# Makefile.in
# aclocal.m4
# anjuta_sym_db.old.db
# compile
# config.guess
# config.h.in
# config.sub
# depcomp
# gnome-doc-utils.make
# gtk-doc.make
# install-sh
# libanjuta/interfaces/Makefile.am
# libanjuta/interfaces/Makefile.in
# libanjuta/interfaces/hierarchy.txt
# libanjuta/interfaces/ianjuta-buildable.c
# libanjuta/interfaces/ianjuta-buildable.h
# libanjuta/interfaces/ianjuta-builder.c
# libanjuta/interfaces/ianjuta-builder.h
# libanjuta/interfaces/ianjuta-debug-manager.c
# libanjuta/interfaces/ianjuta-debug-manager.h
# libanjuta/interfaces/ianjuta-debugger-breakpoint.c
# libanjuta/interfaces/ianjuta-debugger-breakpoint.h
# libanjuta/interfaces/ianjuta-debugger-instruction.c
# libanjuta/interfaces/ianjuta-debugger-instruction.h
# libanjuta/interfaces/ianjuta-debugger-memory.c
# libanjuta/interfaces/ianjuta-debugger-memory.h
# libanjuta/interfaces/ianjuta-debugger-register.c
# libanjuta/interfaces/ianjuta-debugger-register.h
# libanjuta/interfaces/ianjuta-debugger-variable.c
# libanjuta/interfaces/ianjuta-debugger-variable.h
# libanjuta/interfaces/ianjuta-debugger.c
# libanjuta/interfaces/ianjuta-debugger.h
# libanjuta/interfaces/ianjuta-document-manager.c
# libanjuta/interfaces/ianjuta-document-manager.h
# libanjuta/interfaces/ianjuta-document.c
# libanjuta/interfaces/ianjuta-document.h
# libanjuta/interfaces/ianjuta-editor-assist.c
# libanjuta/interfaces/ianjuta-editor-assist.h
# libanjuta/interfaces/ianjuta-editor-cell-style.c
# libanjuta/interfaces/ianjuta-editor-cell-style.h
# libanjuta/interfaces/ianjuta-editor-cell.c
# libanjuta/interfaces/ianjuta-editor-cell.h
# libanjuta/interfaces/ianjuta-editor-comment.c
# libanjuta/interfaces/ianjuta-editor-comment.h
# libanjuta/interfaces/ianjuta-editor-convert.c
# libanjuta/interfaces/ianjuta-editor-convert.h
# libanjuta/interfaces/ianjuta-editor-factory.c
# libanjuta/interfaces/ianjuta-editor-factory.h
# libanjuta/interfaces/ianjuta-editor-folds.c
# libanjuta/interfaces/ianjuta-editor-folds.h
# libanjuta/interfaces/ianjuta-editor-goto.c
# libanjuta/interfaces/ianjuta-editor-goto.h
# libanjuta/interfaces/ianjuta-editor-hover.c
# libanjuta/interfaces/ianjuta-editor-hover.h
# libanjuta/interfaces/ianjuta-editor-language.c
# libanjuta/interfaces/ianjuta-editor-language.h
# libanjuta/interfaces/ianjuta-editor-line-mode.c
# libanjuta/interfaces/ianjuta-editor-line-mode.h
# libanjuta/interfaces/ianjuta-editor-search.c
# libanjuta/interfaces/ianjuta-editor-search.h
# libanjuta/interfaces/ianjuta-editor-selection.c
# libanjuta/interfaces/ianjuta-editor-selection.h
# libanjuta/interfaces/ianjuta-editor-tip.c
# libanjuta/interfaces/ianjuta-editor-tip.h
# libanjuta/interfaces/ianjuta-editor-view.c
# libanjuta/interfaces/ianjuta-editor-view.h
# libanjuta/interfaces/ianjuta-editor-zoom.c
# libanjuta/interfaces/ianjuta-editor-zoom.h
# libanjuta/interfaces/ianjuta-editor.c
# libanjuta/interfaces/ianjuta-editor.h
# libanjuta/interfaces/ianjuta-environment.c
# libanjuta/interfaces/ianjuta-environment.h
# libanjuta/interfaces/ianjuta-file-loader.c
# libanjuta/interfaces/ianjuta-file-loader.h
# libanjuta/interfaces/ianjuta-file-manager.c
# libanjuta/interfaces/ianjuta-file-manager.h
# libanjuta/interfaces/ianjuta-file-savable.c
# libanjuta/interfaces/ianjuta-file-savable.h
# libanjuta/interfaces/ianjuta-file.c
# libanjuta/interfaces/ianjuta-file.h
# libanjuta/interfaces/ianjuta-help.c
# libanjuta/interfaces/ianjuta-help.h
# libanjuta/interfaces/ianjuta-indicable.c
# libanjuta/interfaces/ianjuta-indicable.h
# libanjuta/interfaces/ianjuta-iterable-tree.c
# libanjuta/interfaces/ianjuta-iterable-tree.h
# libanjuta/interfaces/ianjuta-iterable.c
# libanjuta/interfaces/ianjuta-iterable.h
# libanjuta/interfaces/ianjuta-language-support.c
# libanjuta/interfaces/ianjuta-language-support.h
# libanjuta/interfaces/ianjuta-language.c
# libanjuta/interfaces/ianjuta-language.h
# libanjuta/interfaces/ianjuta-loader.c
# libanjuta/interfaces/ianjuta-loader.h
# libanjuta/interfaces/ianjuta-macro.c
# libanjuta/interfaces/ianjuta-macro.h
# libanjuta/interfaces/ianjuta-markable.c
# libanjuta/interfaces/ianjuta-markable.h
# libanjuta/interfaces/ianjuta-message-manager.c
# libanjuta/interfaces/ianjuta-message-manager.h
# libanjuta/interfaces/ianjuta-message-view.c
# libanjuta/interfaces/ianjuta-message-view.h
# libanjuta/interfaces/ianjuta-plugin-factory.c
# libanjuta/interfaces/ianjuta-plugin-factory.h
# libanjuta/interfaces/ianjuta-preferences.c
# libanjuta/interfaces/ianjuta-preferences.h
# libanjuta/interfaces/ianjuta-print.c
# libanjuta/interfaces/ianjuta-print.h
# libanjuta/interfaces/ianjuta-project-backend.c
# libanjuta/interfaces/ianjuta-project-backend.h
# libanjuta/interfaces/ianjuta-project-manager.c
# libanjuta/interfaces/ianjuta-project-manager.h
# libanjuta/interfaces/ianjuta-project.c
# libanjuta/interfaces/ianjuta-project.h
# libanjuta/interfaces/ianjuta-provider.c
# libanjuta/interfaces/ianjuta-provider.h
# libanjuta/interfaces/ianjuta-snippets-manager.c
# libanjuta/interfaces/ianjuta-snippets-manager.h
# libanjuta/interfaces/ianjuta-stream-loader.c
# libanjuta/interfaces/ianjuta-stream-loader.h
# libanjuta/interfaces/ianjuta-stream-savable.c
# libanjuta/interfaces/ianjuta-stream-savable.h
# libanjuta/interfaces/ianjuta-stream.c
# libanjuta/interfaces/ianjuta-stream.h
# libanjuta/interfaces/ianjuta-symbol-manager.c
# libanjuta/interfaces/ianjuta-symbol-manager.h
# libanjuta/interfaces/ianjuta-symbol-query.c
# libanjuta/interfaces/ianjuta-symbol-query.h
# libanjuta/interfaces/ianjuta-symbol.c
# libanjuta/interfaces/ianjuta-symbol.h
# libanjuta/interfaces/ianjuta-terminal.c
# libanjuta/interfaces/ianjuta-terminal.h
# libanjuta/interfaces/ianjuta-todo.c
# libanjuta/interfaces/ianjuta-todo.h
# libanjuta/interfaces/ianjuta-vcs.c
# libanjuta/interfaces/ianjuta-vcs.h
# libanjuta/interfaces/ianjuta-wizard.c
# libanjuta/interfaces/ianjuta-wizard.h
# libanjuta/interfaces/iface-built.stamp
# libanjuta/interfaces/libanjuta-iface-marshallers.c
# libanjuta/interfaces/libanjuta-iface-marshallers.h
# libanjuta/interfaces/libanjuta-iface-marshallers.list
# libanjuta/interfaces/libanjuta-interfaces.h
# libanjuta/interfaces/libanjuta.idl~
# libanjuta/interfaces/libanjuta2.idl
# libanjuta2.idl
# libfoocanvas/Makefile.in
# ltmain.sh
# manuals/anjuta-manual/C/.currentfile.tmp
# manuals/reference/libanjuta/tmpl/
# missing
# mkinstalldirs
# omf-install/Makefile.in
# omf.make
# pixmaps/16x16/Makefile.in
# pixmaps/22x22/Makefile.in
# pixmaps/24x24/Makefile.in
# pixmaps/32x32/Makefile.in
# pixmaps/48x48/Makefile.in
# pixmaps/scalable/Makefile.in
# plugins/.currentfile.tmp
# plugins/am-project/am-project2.C
# plugins/am-project/am-project2.h
# plugins/am-project/projectparser.new.c
# plugins/am-project/tests/Makefile
# plugins/am-project/tests/Makefile.am~
# plugins/am-project/tests/Makefile.in
# plugins/am-project/tests/anjuta.at~
# plugins/am-project/tests/anjuta.lst~
# plugins/am-project/tests/atconfig
# plugins/am-project/tests/atlocal
# plugins/am-project/tests/include.at~
# plugins/am-project/tests/package.m4
# plugins/am-project/tests/source.at~
# plugins/am-project/tests/target.at~
# plugins/am-project/tests/testsuite
# plugins/am-project/tests/testsuite.at~
# plugins/am-project/tests/variable.at~
# plugins/class-inheritance/Makefile.in
# plugins/dir-project/dir-project-plugin-48.png~master
# plugins/js-debugger/Makefile.in
# plugins/language-support-cpp-java/cxxparser/Makefile.in
# plugins/language-support-js/unit_test/Makefile.in
# plugins/language-support-python/Makefile.in
# plugins/project-manager/create_dialogs.old.ui
# plugins/project-manager/create_dialogs.old2.ui
# plugins/project-manager/server.c
# plugins/project-manager/server.h
# plugins/project-manager2/
# plugins/project-wizard/templates/js_minimal/Makefile.in
# plugins/project-wizard/templates/js_minimal/src/Makefile.in
# plugins/symbol-db/anjuta-tags/Makefile.in
# plugins/symbol-db/toto
# toto
# toto2
# xmldocs.make
# ylwrap
NEWS | 21 +
configure.in | 2 +-
libanjuta/Makefile.am | 14 +-
libanjuta/anjuta-save-prompt.c | 14 +-
libanjuta/interfaces/anjuta-idl-compiler.pl | 21 +-
libanjuta/interfaces/libanjuta.idl | 274 +-
libfoocanvas/foo-canvas-marshal.c | 133 -
libfoocanvas/foo-canvas-marshal.h | 28 -
plugins/gtodo/export.c | 5 +-
.../cxxparser/engine-parser.cpp | 2 +-
.../anjuta-language-javascript.ui | 6 +-
plugins/language-support-python/plugin.c | 5 +-
.../python-plugin-properties.ui | 30 +-
plugins/language-support-vala/plugin.vala | 14 +-
plugins/project-wizard/druid.c | 3 +-
plugins/snippets-manager/snippets-editor.ui | 18 +-
.../snippets-manager-preferences.ui | 6 +-
po/en_GB.po | 3797 ++++++++++++--------
po/es.po | 282 +-
po/gl.po | 263 +-
po/hu.po | 3477 ++++++++++--------
po/id.po | 272 +-
po/nb.po | 3024 +++++++++-------
po/sl.po | 279 +-
po/sv.po | 788 +++--
25 files changed, 7235 insertions(+), 5543 deletions(-)
---
diff --cc libanjuta/interfaces/libanjuta.idl
index 3c5633f,40ea06a..06bd3f1
--- a/libanjuta/interfaces/libanjuta.idl
+++ b/libanjuta/interfaces/libanjuta.idl
@@@ -3336,9 -3152,9 +3337,9 @@@ interface IAnjutaProjec
* @obj: Self
* @err: Error propagation and reporting.
*
- * Returns: the list of supported target types
+ * Returns: (element-type Anjuta.ProjectTargetInformation): the list of supported target types
*/
- List<AnjutaProjectTargetType> get_target_types();
+ List<AnjutaProjectNodeType> get_target_types();
/**
* ianjuta_project_configure:
@@@ -3360,10 -3176,10 +3361,10 @@@
*
* Returns: The new group or NULL on error.
*/
- AnjutaProjectGroup* get_root ();
+ AnjutaProjectNode* get_root ();
- /*
- * ianjuta_project_get_packages
+ /**
+ * ianjuta_project_get_packages:
* @obj: Self
* @err: Error propagation and reporting.
*
@@@ -3570,21 -3386,21 +3571,21 @@@ interface IAnjutaProjectManage
*
* Returns: Return the type of the target.
*/
- AnjutaProjectTargetClass get_target_type (GFile *target);
+ AnjutaProjectNodeType get_target_type (GFile *target);
/**
- * ianjuta_project_manager_get_targets:
- * @obj: Self
- * @target_type: type of the target
- * @err: Error propagation and reporting.
- *
- * Get a list of targets in the project with the corresponding type.
- *
- * Returns: A list of #GFile corresponding to each target of the requested
- * type or %NULL if none exists. Free the returned list with g_list_free()
- * and the files with g_object_unref().
- */
+ * ianjuta_project_manager_get_targets:
+ * @obj: Self
+ * @target_type: type of the target
+ * @err: Error propagation and reporting.
+ *
+ * Get a list of targets in the project with the corresponding type.
+ *
+ * Returns: (element-type GFile) (transfer full): A list of #GFile corresponding to
+ * each target of the requested type or %NULL if none exists. Free the returned list
+ * with g_list_free() and the files with g_object_unref().
+ */
- List<GFile *> get_targets (AnjutaProjectTargetClass target_type);
+ List<GFile *> get_targets (AnjutaProjectNodeType target_type);
/**
* ianjuta_project_manager_get_parent:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
