[anjuta/git-shell: 373/373] Merge branch 'master' into git-shell
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/git-shell: 373/373] Merge branch 'master' into git-shell
- Date: Tue, 11 May 2010 21:56:33 +0000 (UTC)
commit e9a2091dd08f7d578c29724ce010620dfa4f4af1
Merge: 8ab193e a138246
Author: James Liggett <jrliggett cox net>
Date: Tue May 11 14:54:11 2010 -0700
Merge branch 'master' into git-shell
Conflicts:
NEWS
configure.in
libanjuta/Makefile.am
libanjuta/anjuta-command-queue.c
po/bg.po
po/ca.po
po/da.po
po/el.po
po/fr.po
po/gl.po
.gitignore | 64 +-
AUTHORS | 1 +
Makefile.am | 2 +-
NEWS | 48 +-
TODO.tasks | 22 +-
configure.in | 96 +-
libanjuta/Makefile.am | 7 +-
libanjuta/anjuta-async-command.c | 16 +-
libanjuta/anjuta-async-command.h | 6 +-
libanjuta/anjuta-async-notify.c | 14 +-
libanjuta/anjuta-c-module.c | 9 +
libanjuta/anjuta-command-queue.c | 20 +-
libanjuta/anjuta-command.c | 4 +-
libanjuta/anjuta-convert.h | 6 +
libanjuta/anjuta-plugin-description.h | 8 +
libanjuta/anjuta-plugin-manager.h | 5 +
libanjuta/anjuta-preferences-dialog.c | 1 +
libanjuta/anjuta-preferences.c | 2 +-
libanjuta/anjuta-shell.c | 74 +
libanjuta/anjuta-shell.h | 33 +
libanjuta/anjuta-tabber.c | 500 ++
libanjuta/anjuta-tabber.h | 57 +
libanjuta/anjuta-ui.h | 27 +-
libanjuta/anjuta-utils.h | 33 +-
libanjuta/interfaces/libanjuta.idl | 41 +-
libfoocanvas/Makefile.am | 62 +
libfoocanvas/foo-canvas-i18n.h | 68 +
libfoocanvas/foo-canvas-line.c | 1376 ++++++
libfoocanvas/foo-canvas-line.h | 151 +
libfoocanvas/foo-canvas-marshal.c | 131 +
libfoocanvas/foo-canvas-marshal.h | 28 +
libfoocanvas/foo-canvas-marshal.list | 2 +
libfoocanvas/foo-canvas-pixbuf.c | 825 ++++
libfoocanvas/foo-canvas-pixbuf.h | 62 +
libfoocanvas/foo-canvas-polygon.c | 826 ++++
libfoocanvas/foo-canvas-polygon.h | 121 +
libfoocanvas/foo-canvas-rect-ellipse.c | 1489 ++++++
libfoocanvas/foo-canvas-rect-ellipse.h | 174 +
libfoocanvas/foo-canvas-text.c | 1587 +++++++
libfoocanvas/foo-canvas-text.h | 168 +
libfoocanvas/foo-canvas-util.c | 399 ++
libfoocanvas/foo-canvas-util.h | 105 +
libfoocanvas/foo-canvas-widget.c | 591 +++
libfoocanvas/foo-canvas-widget.h | 103 +
libfoocanvas/foo-canvas.c | 3999 ++++++++++++++++
libfoocanvas/foo-canvas.h | 530 +++
libfoocanvas/libfoocanvas.h | 45 +
libfoocanvas/libfoocanvastypes.c | 43 +
manuals/reference/libanjuta/Makefile.am | 2 +-
mime/Makefile.am | 10 +-
pixmaps/16x16/Makefile.am | 7 +
pixmaps/16x16/anjuta.png | Bin 0 -> 1006 bytes
pixmaps/16x16/gnome-mime-application-x-anjuta.png | Bin 0 -> 975 bytes
pixmaps/22x22/Makefile.am | 7 +
pixmaps/22x22/anjuta.png | Bin 0 -> 1656 bytes
pixmaps/22x22/gnome-mime-application-x-anjuta.png | Bin 0 -> 1601 bytes
pixmaps/24x24/Makefile.am | 7 +
pixmaps/24x24/anjuta.png | Bin 0 -> 1621 bytes
pixmaps/24x24/gnome-mime-application-x-anjuta.png | Bin 0 -> 1565 bytes
pixmaps/32x32/Makefile.am | 7 +
pixmaps/32x32/anjuta.png | Bin 0 -> 2569 bytes
pixmaps/32x32/gnome-mime-application-x-anjuta.png | Bin 0 -> 2355 bytes
pixmaps/48x48/Makefile.am | 7 +
pixmaps/{ => 48x48}/anjuta.png | Bin 3649 -> 3649 bytes
.../48x48}/gnome-mime-application-x-anjuta.png | Bin 3549 -> 3549 bytes
pixmaps/Makefile.am | 9 +-
pixmaps/scalable/Makefile.am | 8 +
pixmaps/{ => scalable}/anjuta.svg | 0
.../scalable}/gnome-mime-application-x-anjuta.svg | 0
plugins/Makefile.am | 1 +
plugins/class-gen/Makefile.am | 4 +-
plugins/class-gen/anjuta-class-gen-plugin-48.png | Bin 0 -> 2017 bytes
plugins/class-gen/anjuta-class-gen-plugin.svg | 836 ++++
plugins/class-gen/anjuta-class-gen.plugin.in | 2 +-
plugins/class-gen/class_logo.xpm | 1004 ----
plugins/class-gen/plugin.c | 2 +-
plugins/class-inheritance/Makefile.am | 63 +
.../anjuta-class-inheritance-plugin-48.png | Bin 0 -> 980 bytes
.../anjuta-class-inheritance-plugin.svg | 311 ++
.../anjuta-class-inheritance.plugin.in | 5 +
plugins/class-inheritance/class-callbacks.c | 448 ++
plugins/class-inheritance/class-callbacks.h | 47 +
plugins/class-inheritance/class-inherit.c | 1174 +++++
plugins/class-inheritance/class-inherit.h | 118 +
plugins/class-inheritance/plugin.c | 197 +
plugins/class-inheritance/plugin.h | 87 +
plugins/debug-manager/breakpoints.c | 71 +-
plugins/debug-manager/breakpoints.h | 3 +
plugins/debug-manager/plugin.c | 24 +-
plugins/devhelp/plugin.c | 85 +-
plugins/devhelp/plugin.h | 3 +-
plugins/dir-project/sources.list | 2 +
plugins/document-manager/action-callbacks.c | 37 +
plugins/document-manager/action-callbacks.h | 1 +
plugins/document-manager/anjuta-docman.c | 61 +-
plugins/document-manager/anjuta-docman.h | 1 +
.../anjuta-document-manager.plugin.in | 2 +-
.../document-manager/anjuta-document-manager.xml | 1 +
plugins/document-manager/plugin.c | 3 +
plugins/file-manager/Makefile.am | 1 +
.../file-manager/anjuta-file-manager-plugin-16.png | Bin 0 -> 617 bytes
plugins/file-manager/file-model.c | 2 +-
plugins/file-wizard/Makefile.am | 3 +-
.../file-wizard/anjuta-file-wizard-plugin-48.png | Bin 0 -> 3604 bytes
plugins/file-wizard/anjuta-file-wizard-plugin.png | Bin 3768 -> 0 bytes
plugins/file-wizard/anjuta-file-wizard-plugin.svg | 774 ++++
plugins/file-wizard/anjuta-file-wizard.plugin.in | 2 +-
plugins/file-wizard/plugin.c | 2 +-
plugins/glade/Makefile.am | 38 +-
plugins/glade/anjuta-design-document.c | 314 +--
plugins/glade/anjuta-design-document.h | 27 +-
plugins/glade/anjuta-glade.plugin.in | 2 +-
plugins/glade/designer-associations-item.c | 529 ---
plugins/glade/designer-associations-item.h | 159 -
plugins/glade/designer-associations.c | 353 --
plugins/glade/designer-associations.h | 131 -
plugins/glade/plugin.c | 4770 +------------------
plugins/glade/plugin.h | 31 +-
plugins/gtodo/Makefile.am | 1 +
plugins/gtodo/anjuta-gtodo-plugin-16.png | Bin 0 -> 787 bytes
plugins/gtodo/preferences.c | 31 +
plugins/js-debugger/Makefile.am | 4 +-
plugins/language-support-cpp-java/Makefile.am | 6 +-
.../language-support-cpp-java/cpp-java-assist.c | 14 +-
.../cxxparser/engine-parser.cpp | 7 +-
plugins/language-support-js/Makefile.am | 19 +-
plugins/language-support-js/js-context.c | 2 +-
plugins/language-support-js/js-context.h | 2 +-
plugins/language-support-js/js-node.c | 2 +-
plugins/language-support-js/js-node.h | 2 +-
plugins/language-support-js/js-parser-y-tab.c | 1 +
plugins/language-support-js/js-parser-y-tab.h | 1 +
.../js-support-plugin.plugin.in | 11 +
.../js_support_plugin.plugin.in | 7 -
plugins/language-support-js/jsparse.c | 2 +-
plugins/language-support-js/jsparse.h | 2 +-
plugins/language-support-js/jstypes.h | 2 +-
plugins/language-support-js/lex.l | 2 +-
plugins/language-support-js/lex.yy.c | 2 +-
plugins/language-support-js/lex.yy.h | 2 +-
plugins/language-support-js/y.tab.c | 1 -
plugins/language-support-js/y.tab.h | 1 -
plugins/message-view/anjuta-msgman.c | 119 +-
plugins/message-view/anjuta-msgman.h | 2 +-
plugins/message-view/message-view.c | 180 +-
plugins/message-view/message-view.h | 12 +
plugins/message-view/plugin.c | 137 +-
plugins/message-view/plugin.h | 6 +
plugins/patch/plugin.c | 14 +-
plugins/patch/plugin.h | 1 +
plugins/project-manager/Makefile.am | 1 +
.../anjuta-project-manager-plugin-16.png | Bin 0 -> 610 bytes
plugins/project-wizard/.cvsignore | 4 -
plugins/project-wizard/templates/.cvsignore | 4 -
.../templates/anjuta-plugin/.cvsignore | 4 -
.../templates/anjuta-plugin/po/.cvsignore | 4 -
.../templates/anjuta-plugin/src/.cvsignore | 4 -
plugins/project-wizard/templates/cpp/.cvsignore | 2 -
plugins/project-wizard/templates/gcj/.cvsignore | 4 -
.../project-wizard/templates/gcj/src/.cvsignore | 4 -
plugins/project-wizard/templates/gtk/.cvsignore | 4 -
plugins/project-wizard/templates/gtk/po/.cvsignore | 4 -
.../project-wizard/templates/gtk/src/.cvsignore | 4 -
plugins/project-wizard/templates/gtkmm/.cvsignore | 4 -
.../project-wizard/templates/gtkmm/po/.cvsignore | 4 -
.../project-wizard/templates/gtkmm/src/.cvsignore | 4 -
plugins/project-wizard/templates/java/.cvsignore | 4 -
.../project-wizard/templates/java/po/.cvsignore | 4 -
.../project-wizard/templates/java/src/.cvsignore | 4 -
.../project-wizard/templates/library/po/.cvsignore | 4 -
.../project-wizard/templates/minimal/.cvsignore | 4 -
plugins/project-wizard/templates/mkfile/.cvsignore | 4 -
.../project-wizard/templates/mkfile/po/.cvsignore | 4 -
.../project-wizard/templates/mkfile/src/.cvsignore | 4 -
plugins/project-wizard/templates/python/.cvsignore | 4 -
.../project-wizard/templates/python/po/.cvsignore | 4 -
.../project-wizard/templates/python/src/.cvsignore | 4 -
plugins/project-wizard/templates/sdl/.cvsignore | 4 -
plugins/project-wizard/templates/sdl/po/.cvsignore | 4 -
.../project-wizard/templates/sdl/src/.cvsignore | 4 -
.../project-wizard/templates/terminal/.cvsignore | 4 -
.../templates/terminal/po/.cvsignore | 4 -
.../templates/terminal/src/.cvsignore | 4 -
plugins/project-wizard/templates/wxwin/.cvsignore | 4 -
.../project-wizard/templates/wxwin/po/.cvsignore | 4 -
.../project-wizard/templates/wxwin/src/.cvsignore | 4 -
.../project-wizard/templates/xlib-dock/.cvsignore | 4 -
.../templates/xlib-dock/po/.cvsignore | 4 -
.../templates/xlib-dock/src/.cvsignore | 4 -
plugins/project-wizard/templates/xlib/.cvsignore | 4 -
.../project-wizard/templates/xlib/po/.cvsignore | 4 -
.../project-wizard/templates/xlib/src/.cvsignore | 4 -
plugins/sourceview/sourceview.c | 27 +
plugins/symbol-db/Makefile.am | 8 +-
plugins/symbol-db/anjuta-symbol-db-plugin-16.png | Bin 0 -> 663 bytes
plugins/symbol-db/anjuta-symbol-db-plugin-48.png | Bin 1475 -> 1495 bytes
plugins/symbol-db/anjuta-symbol-db-plugin.svg | 607 +++
plugins/symbol-db/anjuta-tags/Makefile.am | 39 +-
plugins/symbol-db/anjuta-tags/c.c | 29 +-
plugins/symbol-db/anjuta-tags/ctags-utils.c | 41 +
plugins/symbol-db/anjuta-tags/ctags-utils.h | 38 +
plugins/symbol-db/anjuta-tags/ctags-visitor.vala | 7 +-
plugins/symbol-db/anjuta-tags/gir.c | 23 +-
.../anjuta-tags/{js_parser => js-parser}/Grammar.y | 0
.../{js_parser => js-parser}/js-context.c | 0
.../{js_parser => js-parser}/js-context.h | 0
.../anjuta-tags/{js_parser => js-parser}/js-node.c | 2 +-
.../anjuta-tags/{js_parser => js-parser}/js-node.h | 2 +
.../y.tab.c => js-parser/js-parser-y-tab.c} | 528 ++--
.../y.tab.h => js-parser/js-parser-y-tab.h} | 4 +-
.../anjuta-tags/{js_parser => js-parser}/jsparse.c | 0
.../anjuta-tags/{js_parser => js-parser}/jsparse.h | 0
.../anjuta-tags/{js_parser => js-parser}/jstypes.h | 0
.../anjuta-tags/{js_parser => js-parser}/lex.l | 2 +-
.../anjuta-tags/{js_parser => js-parser}/lex.yy.c | 212 +-
.../anjuta-tags/{js_parser => js-parser}/lex.yy.h | 0
plugins/symbol-db/anjuta-tags/jscript.c | 21 +-
plugins/symbol-db/anjuta-tags/make.c | 4 +-
plugins/symbol-db/anjuta-tags/python.c | 6 +-
plugins/symbol-db/anjuta-tags/vala.c | 1 +
plugins/symbol-db/anjuta-tags/verilog.c | 3 +-
plugins/symbol-db/images/Makefile.am | 11 +-
.../images/element-interface-private-16.png | Bin 0 -> 791 bytes
.../images/element-interface-protected-16.png | Bin 0 -> 728 bytes
.../images/element-interface-public-16.png | Bin 0 -> 658 bytes
plugins/symbol-db/images/element-method-16.png | Bin 604 -> 650 bytes
.../symbol-db/images/element-method-private-16.png | Bin 0 -> 827 bytes
.../images/element-method-protected-16.png | Bin 0 -> 759 bytes
.../symbol-db/images/element-method-public-16.png | Bin 0 -> 650 bytes
.../images/element-property-private-16.png | Bin 0 -> 778 bytes
.../images/element-property-protected-16.png | Bin 0 -> 754 bytes
.../images/element-property-public-16.png | Bin 0 -> 691 bytes
plugins/symbol-db/images/private.png | Bin 0 -> 417 bytes
plugins/symbol-db/images/protected.png | Bin 0 -> 360 bytes
plugins/symbol-db/plugin.c | 78 +-
plugins/symbol-db/plugin.h | 4 +-
plugins/symbol-db/symbol-db-engine-core.c | 101 +-
plugins/symbol-db/symbol-db-engine-core.h | 12 +
plugins/symbol-db/symbol-db-engine-priv.h | 56 +-
plugins/symbol-db/symbol-db-engine-queries.c | 1047 +----
plugins/symbol-db/symbol-db-engine-queries.h | 113 +-
plugins/symbol-db/symbol-db-engine-utils.c | 74 +-
plugins/symbol-db/symbol-db-engine.h | 7 +
plugins/symbol-db/symbol-db-iface.c | 1 +
plugins/symbol-db/symbol-db-model-file.c | 270 +-
plugins/symbol-db/symbol-db-model-file.h | 9 +-
plugins/symbol-db/symbol-db-model-project.c | 268 +-
plugins/symbol-db/symbol-db-model-project.h | 9 +-
plugins/symbol-db/symbol-db-model.c | 834 +++--
plugins/symbol-db/symbol-db-model.h | 7 +-
plugins/symbol-db/symbol-db-system.c | 4 +-
plugins/symbol-db/symbol-db-views.c | 61 +
plugins/symbol-db/tables.sql | 63 +-
po/POTFILES.in | 20 +-
po/bg.po | 61 +-
po/ca.po | 21 +-
po/ca valencia po | 4837 ++++++++++----------
po/da.po | 71 +-
po/el.po | 1230 +++---
po/es.po | 390 +-
po/fr.po | 265 +-
po/gl.po | 389 +-
po/th.po | 783 ++--
po/uk.po | 4055 +++++++++--------
src/anjuta-app.c | 147 +-
src/anjuta-app.h | 1 +
src/shell.c | 49 +
267 files changed, 27502 insertions(+), 15980 deletions(-)
---
diff --cc libanjuta/Makefile.am
index e1252de,2a8742d..6a0d9d5
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -84,8 -84,8 +84,10 @@@ libanjuta_la_SOURCES=
anjuta-command-queue.h \
anjuta-project.c \
anjuta-project.h \
++ anjuta-drop-entry.c \
+ anjuta-drop-entry.h \
- anjuta-drop-entry.c
+ anjuta-tabber.c \
+ anjuta-tabber.h
if HAVE_PLUGIN_GLADE
@@@ -146,7 -146,7 +148,8 @@@ libanjuta_include =
gbf-project.h \
anjuta-project.h \
anjuta-command-queue.h \
- anjuta-drop-entry.h
++ anjuta-drop-entry.h \
+ anjuta-tabber.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
diff --cc libanjuta/anjuta-command-queue.c
index 22377fc,f6a46bc..74885fd
--- a/libanjuta/anjuta-command-queue.c
+++ b/libanjuta/anjuta-command-queue.c
@@@ -19,15 -19,15 +19,24 @@@
#include "anjuta-command-queue.h"
+enum
+{
+ FINISHED,
+
+ LAST_SIGNAL
+};
+
+static guint anjuta_command_queue_signals[LAST_SIGNAL] = { 0 };
+
+ /**
+ * SECTION: anjuta-command-queue
+ * @short_description: #AnjutaCommandQueue is used to queue commands
+ * @include: libanjuta/anjuta-async-command.h
+ *
+ * #AnjutaCommandQueue always starts the next command in the queue when
+ * the previous command finishes. That also works for asyncronous commands
+ */
+
struct _AnjutaCommandQueuePriv
{
GQueue *queue;
@@@ -121,17 -97,20 +130,26 @@@ on_command_finished (AnjutaCommand *com
}
AnjutaCommandQueue *
-anjuta_command_queue_new (void)
+anjuta_command_queue_new (AnjutaCommandQueueExecuteMode mode)
{
- return g_object_new (ANJUTA_TYPE_COMMAND_QUEUE, NULL);
+ AnjutaCommandQueue *self;
+
+ self = g_object_new (ANJUTA_TYPE_COMMAND_QUEUE, NULL);
+
+ self->priv->mode = mode;
+
+ return self;
}
+ /**
+ * anjuta_command_queue_push:
+ * @self: AnjutaCommandQueue object
+ * @command: The command to add
+ *
+ * Adds a command to the Queue and starts it if there are no other commands
+ * waiting
+ */
+
void
anjuta_command_queue_push (AnjutaCommandQueue *self, AnjutaCommand *command)
{
@@@ -155,33 -127,3 +173,33 @@@
else
g_queue_push_tail (self->priv->queue, g_object_ref (command));
}
+
+gboolean
+anjuta_command_queue_start (AnjutaCommandQueue *self)
+{
+ gboolean ret;
+ AnjutaCommand *first_command;
+
+ ret = FALSE;
+
+ if ((self->priv->mode == ANJUTA_COMMAND_QUEUE_EXECUTE_MANUAL) &&
+ (!self->priv->busy))
+ {
+ first_command = g_queue_pop_head (self->priv->queue);
+
+ if (first_command)
+ {
+ g_signal_connect (G_OBJECT (first_command), "command-finished",
+ G_CALLBACK (on_command_finished),
+ self);
+
+ self->priv->busy = TRUE;
+ ret = TRUE;
+
+ anjuta_command_start (first_command);
+ }
+ }
+
+ return ret;
+
- }
++}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
