Commit ca075c88 authored by James Liggett's avatar James Liggett

Merge branch 'master' into git-shell

parents 94412248 743deea2
Anjuta 2.91.2 "Remember the days when we ported from Gtk+ 1.2 to 2.0?" -- Johannes Schmid
WARNING: This is an unstable release! It's the first released based on the
GNOME 3.x library set and a such it may kill your kitten though it's unlikely.
New:
- Everything works with gtk+-3.0 now. gconf replaced with GSettings, etc.
- Switch to enable/disable modeline detection
- Automatic completion of comments with "*"
Regressions:
- Glade hasn't been ported to gtk+-3.0 yet and isn't available
- class-inheritance isn't build because of missing foocanvas for gtk+-3.0
- gtodo is disabled and will probably be removed soon
- terminal plugin hasn't been ported to GSettings, yet
Bugs fixed:
bgo#600407 - Missing LIBXML_CFLAGS and LIBXML_LIBS
bgo#627105 - Mark default diff filenames for translation
bgo#577595 - Prepend comment with *
bgo#625903 - Port to GSettings
bgo#625978 - configure failure in gtk+-3.0 environment
bgo#631952 - better GObject-Introspection support for new-project branch
bgo#633661 - vala support is automagic
Thanks to: Abderrahim Kitouni, Andika Triwidada, Carles Ferrando,
Eugenia Gabrielova, Evgeny Grablyk, Florian Ludwig, Gabor Kelemen,
Giannis Katsampirhs, Javier Jardón, Jens Georg, Joan Duran, Jorge González,
Josseline Mouette, knight2000, Mario Blättermann, Matej Urbančič,
Nanci de Brito Bonfim, Pacho Ramos, Sébastien Granjoux, Takayuki KUSANO
Anjuta 2.32.0 "Goodbye Berlin" (27 Sep 2010) -- Johannes Schmid
This is our new stable release. Older releases won't see any bug-fixing, support,
......
# -*- mode: python -*-
# edit this file to match your settings and copy it to ~/.jhbuildrc
# if you have a GNOME git account, uncomment this line
# repos['git.gnome.org'] = 'ssh://user@git.gnome.org/git/'
moduleset = 'gnome-3.0'
# A list of the modules to build. Defaults to the Gnome Desktop and
# developer platform.
# modules = [ 'anjuta' ]
# what directory should the source be checked out to?
checkoutroot = os.path.expanduser('~/gnome-git')
# the prefix to configure/install modules to (must have write access)
prefix = '/home/user/gnome-unstable'
# extra arguments to pass to all autogen.sh scripts
# to speed up builds of gnome2, try '--disable-static --disable-gtk-doc'
# it is also possible to set CFLAGS this way, 'CFLAGS="-g -O2"' for example
autogenargs='--disable-gtk-doc'
alwaysautogen=True
module_autogenargs['fontconfig'] = autogenargs + ' --disable-docs'
module_autogenargs['libgda'] = autogenargs + ' --enable-introspection=no'
# Use offscreen branch of glade3
branches['glade3'] = (None, 'offscreen')
# On SMP systems you may use something like this to improve compilation time:
# be aware that not all modules compile correctly with make -j2
makeargs = '-j2'
......@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
m4_define(anjuta_major_version, 2)
m4_define(anjuta_minor_version, 32)
m4_define(anjuta_micro_version, 0)
m4_define(anjuta_minor_version, 91)
m4_define(anjuta_micro_version, 2)
m4_define(anjuta_nano_version, 0)
m4_define(anjuta_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version.anjuta_nano_version)
......@@ -285,7 +285,7 @@ else
AC_MSG_RESULT(no)
enable_vala="yes"
PKG_CHECK_MODULES(VALA,
[vala-0.10 >= $VALA_REQUIRED])
[libvala-0.12 >= $VALA_REQUIRED])
fi
if test x$enable_vala = xyes; then
......@@ -809,7 +809,6 @@ AM_CONDITIONAL(HAVE_GRAPHVIZ, [test x$libgraphviz_found = xyes])
AC_CONFIG_FILES([
Makefile
po/Makefile.in
libfoocanvas/Makefile
libanjuta/Makefile
libanjuta/libanjuta-3.0.pc
libanjuta/anjuta-version.h
......@@ -830,10 +829,8 @@ doc/Makefile
scripts/Makefile
launcher/Makefile
plugins/Makefile
plugins/gtodo/Makefile
plugins/class-gen/Makefile
plugins/class-gen/templates/Makefile
plugins/class-inheritance/Makefile
plugins/patch/Makefile
plugins/document-manager/Makefile
plugins/document-manager/images/Makefile
......@@ -849,7 +846,6 @@ plugins/js-debugger/Makefile
plugins/file-manager/Makefile
plugins/file-loader/Makefile
plugins/file-wizard/Makefile
plugins/terminal/Makefile
plugins/build-basic-autotools/Makefile
plugins/project-manager/Makefile
plugins/gbf-am/Makefile
......@@ -871,6 +867,7 @@ plugins/cvs-plugin/Makefile
plugins/subversion/Makefile
plugins/git/Makefile
plugins/sourceview/Makefile
plugins/terminal/Makefile
plugins/tools/Makefile
plugins/tools/scripts/Makefile
plugins/language-manager/Makefile
......
......@@ -139,7 +139,7 @@ anjuta_cell_renderer_captioned_image_render (GtkCellRenderer *gtk_cell,
GtkWidget *widget,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
guint flags)
GtkCellRendererState flags)
{
AnjutaCellRendererCaptionedImage *cell = ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE (gtk_cell);
......
......@@ -75,7 +75,7 @@ INCLUDES = \
$(LIBANJUTA_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/libanjuta/libanjuta.la \
$(top_builddir)/libanjuta/libanjuta-3.la \
$(top_builddir)/libanjuta/interfaces/libanjuta-interfaces.la \
$(LIBANJUTA_LIBS)
......
......@@ -6,6 +6,7 @@ SUBDIRS = . \
class-gen \
cvs-plugin \
devhelp \
debug-manager \
dir-project \
document-manager \
file-loader \
......@@ -35,6 +36,7 @@ SUBDIRS = . \
starter \
subversion \
symbol-db \
terminal \
tools
-include $(top_srcdir)/git.mk
......@@ -98,6 +98,7 @@ EXTRA_DIST = \
$(schema_DATA) \
$(anjuta_ui_DATA) \
$(anjuta_glade_DATA) \
$(schema_in_files) \
anjuta-marshal.list
DISTCLEANFILES = \
......
......@@ -37,6 +37,8 @@
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
/* Constants
*---------------------------------------------------------------------------*/
......@@ -91,8 +93,10 @@ struct _DmaSparseViewPrivate
GdkPixbuf *marker_pixbuf[MAX_MARKER];
};
/* Used in dispose and finalize */
static GtkTextViewClass *parent_class = NULL;
static void dma_sparse_view_init (DmaSparseView *view);
G_DEFINE_TYPE (DmaSparseView, dma_sparse_view, GTK_TYPE_TEXT_VIEW)
/* Helper functions
*---------------------------------------------------------------------------*/
......@@ -535,40 +539,11 @@ dma_sparse_view_move_cursor (GtkTextView *text_view,
break;
}
GTK_TEXT_VIEW_CLASS (parent_class)->move_cursor (text_view,
GTK_TEXT_VIEW_CLASS (dma_sparse_view_parent_class)->move_cursor (text_view,
step, count,
extend_selection);
}
static void
dma_sparse_view_synchronize_iter (DmaSparseView *view, DmaSparseIter *iter)
{
gdouble dist;
gdouble pos;
/* Need to change iterator according to adjustment */
pos = gtk_adjustment_get_value (view->priv->vadjustment);
dist = pos - (gdouble)dma_sparse_iter_get_address (iter);
if (dist != 0)
{
gdouble page_size = gtk_adjustment_get_page_size (view->priv->vadjustment);
if ((dist < 4.0 * page_size) && (dist > -4.0 * page_size))
{
gint count = (gint) (dist / gtk_adjustment_get_step_increment (view->priv->vadjustment));
dma_sparse_iter_forward_lines (iter, count);
}
else
{
dma_sparse_iter_move_at (iter, pos);
dma_sparse_iter_round (iter, FALSE);
}
gtk_adjustment_set_value (view->priv->vadjustment, (gdouble)dma_sparse_iter_get_address (iter));
}
}
static void
draw_line_markers (DmaSparseView *view,
gint current_marker,
......@@ -629,15 +604,18 @@ draw_line_markers (DmaSparseView *view,
if (composite)
{
GdkWindow *window;
cairo_t *cr;
window = gtk_text_view_get_window (GTK_TEXT_VIEW (view),
GTK_TEXT_WINDOW_LEFT);
gdk_draw_pixbuf (GDK_DRAWABLE (window), NULL, composite,
0, 0, x, y,
width, height,
GDK_RGB_DITHER_NORMAL, 0, 0);
cr = gdk_cairo_create (window);
gdk_cairo_set_source_pixbuf (cr, composite, x, y);
cairo_paint (cr);
g_object_unref (composite);
cairo_destroy (cr);
}
}
......@@ -671,12 +649,12 @@ dma_sparse_view_paint_margin (DmaSparseView *view,
}
win = gtk_text_view_get_window (text_view,
GTK_TEXT_WINDOW_LEFT);
GTK_TEXT_WINDOW_LEFT);
y1 = event->area.y;
y2 = y1 + event->area.height;
/* FIXME */
y1 = 0;
y2 = gtk_widget_get_allocated_height (GTK_WIDGET (view)) + y1;
/* get the extents of the line printing */
gtk_text_view_window_to_buffer_coords (text_view,
......@@ -826,54 +804,6 @@ dma_sparse_view_update_adjustement (DmaSparseView *view)
}
}
static void
dma_sparse_view_value_changed (GtkAdjustment *adj,
DmaSparseView *view)
{
dma_sparse_view_synchronize_iter (view, &view->priv->start);
dma_sparse_view_refresh (view);
}
static void
dma_sparse_view_set_vadjustments (GtkTextView *text_view,
GtkAdjustment *vadj)
{
DmaSparseView *view = DMA_SPARSE_VIEW (text_view);
if (vadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
if (view->priv->vadjustment && (view->priv->vadjustment != vadj))
{
g_signal_handlers_disconnect_by_func (view->priv->vadjustment,
dma_sparse_view_value_changed,
view);
g_object_unref (view->priv->vadjustment);
}
if (view->priv->vadjustment != vadj)
{
GTK_SCROLLABLE_CLASS (parent_class)->set_vadjustments (GTK_TEXT_VIEW (view), vadj);
if (vadj != NULL)
{
g_object_ref_sink (vadj);
g_signal_connect (vadj, "value_changed",
G_CALLBACK (dma_sparse_view_value_changed),
view);
gtk_adjustment_set_upper (vadj, dma_sparse_buffer_get_upper (view->priv->buffer));
gtk_adjustment_set_lower (vadj, dma_sparse_buffer_get_lower (view->priv->buffer));
gtk_adjustment_set_value (vadj, 0);
}
view->priv->vadjustment = vadj;
dma_sparse_view_update_adjustement (view);
}
}
/* Public functions
*---------------------------------------------------------------------------*/
......@@ -993,15 +923,15 @@ dma_sparse_view_draw (GtkWidget *widget,
event_handled = FALSE;
/* now check for the left window, which contains the margin */
if (gdk_cairo_should_draw_window (cr, gtk_text_view_get_window (text_view,
if (gtk_cairo_should_draw_window (cr, gtk_text_view_get_window (text_view,
GTK_TEXT_WINDOW_LEFT)))
{
dma_sparse_view_paint_margin (view, event);
dma_sparse_view_paint_margin (view, cr);
event_handled = TRUE;
}
else
{
event_handled = GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
event_handled = GTK_WIDGET_CLASS (dma_sparse_view_parent_class)->draw (widget, cr);
}
return event_handled;
......@@ -1015,7 +945,7 @@ dma_sparse_view_size_allocate (GtkWidget *widget,
view = DMA_SPARSE_VIEW (widget);
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
GTK_WIDGET_CLASS (dma_sparse_view_parent_class)->size_allocate (widget, allocation);
dma_sparse_view_update_adjustement (view);
dma_sparse_view_refresh (view);
......@@ -1040,7 +970,7 @@ dma_sparse_view_destroy (GtkWidget *object)
view->priv->goto_entry = NULL;
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
GTK_WIDGET_CLASS (dma_sparse_view_parent_class)->destroy (object);
}
/* GObject functions
......@@ -1107,7 +1037,7 @@ dma_sparse_view_dispose (GObject *object)
view = DMA_SPARSE_VIEW (object);
G_OBJECT_CLASS (parent_class)->dispose (object);
G_OBJECT_CLASS (dma_sparse_view_parent_class)->dispose (object);
}
/* finalize is the last destruction step. It must free all memory allocated
......@@ -1128,14 +1058,14 @@ dma_sparse_view_finalize (GObject *object)
g_free (view->priv);
G_OBJECT_CLASS (parent_class)->finalize (object);
G_OBJECT_CLASS (dma_sparse_view_parent_class)->finalize (object);
}
/* instance_init is the constructor. All functions should work after this
* call. */
static void
dma_sparse_view_instance_init (DmaSparseView *view)
dma_sparse_view_init (DmaSparseView *view)
{
PangoFontDescription *font_desc;
......@@ -1178,15 +1108,11 @@ dma_sparse_view_class_init (DmaSparseViewClass * klass)
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkTextViewClass *text_view_class;
GtkScrollableClass *scrollable_class;
g_return_if_fail (klass != NULL);
gobject_class = (GObjectClass *) klass;
widget_class = GTK_WIDGET_CLASS (klass);
text_view_class = GTK_TEXT_VIEW_CLASS (klass);
scrollable_class = GTK_SCROLLABLE_CLASS (klass);
parent_class = (GtkTextViewClass*) g_type_class_peek_parent (klass);
gobject_class->dispose = dma_sparse_view_dispose;
gobject_class->finalize = dma_sparse_view_finalize;
......@@ -1199,7 +1125,6 @@ dma_sparse_view_class_init (DmaSparseViewClass * klass)
widget_class->draw = dma_sparse_view_draw;
text_view_class->move_cursor = dma_sparse_view_move_cursor;
scrollable_class->set_vadjustment = dma_sparse_view_set_vadjustment;
g_object_class_install_property (gobject_class,
PROP_SHOW_LINE_NUMBERS,
......@@ -1218,34 +1143,6 @@ dma_sparse_view_class_init (DmaSparseViewClass * klass)
G_PARAM_READWRITE));
}
GType
dma_sparse_view_get_type (void)
{
static GType type = 0;
if (!type)
{
static const GTypeInfo type_info =
{
sizeof (DmaSparseViewClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) dma_sparse_view_class_init,
(GClassFinalizeFunc) NULL,
NULL, /* class_data */
sizeof (DmaSparseView),
0, /* n_preallocs */
(GInstanceInitFunc) dma_sparse_view_instance_init,
NULL /* value_table */
};
type = g_type_register_static (GTK_TYPE_TEXT_VIEW,
"DmaSparseView", &type_info, 0);
}
return type;
}
/* Creation and Destruction
*---------------------------------------------------------------------------*/
......
......@@ -58,6 +58,7 @@ EXTRA_DIST = \
$(plugin_in_files) \
$(document_manager_plugin_DATA) \
$(document_manager_ui_DATA) \
$(document_manager_glade_DATA)
$(document_manager_glade_DATA) \
$(prefs_keyfile)
-include $(top_srcdir)/git.mk
......@@ -1428,6 +1428,22 @@ get_line_auto_indentation (CppJavaPlugin *plugin, IAnjutaEditor *editor,
return line_indent;
}
static void on_editor_char_inserted_cpp (IAnjutaEditor *editor,
IAnjutaIterable *insert_pos,
gchar ch,
CppJavaPlugin *plugin);
static void
insert_editor_blocked (IAnjutaEditor* editor,
IAnjutaIterable* iter,
gchar* text,
CppJavaPlugin* plugin)
{
g_signal_handlers_block_by_func (editor, on_editor_char_inserted_cpp, plugin);
ianjuta_editor_insert (editor, iter, text, -1, NULL);
g_signal_handlers_unblock_by_func (editor, on_editor_char_inserted_cpp, plugin);
}
static void
on_editor_char_inserted_cpp (IAnjutaEditor *editor,
IAnjutaIterable *insert_pos,
......@@ -1525,12 +1541,12 @@ on_editor_char_inserted_cpp (IAnjutaEditor *editor,
switch (ch)
{
case '[':
ianjuta_editor_insert (editor, iter,
"]", 1, NULL);
insert_editor_blocked (editor, iter,
"]", plugin);
break;
case '(':
ianjuta_editor_insert (editor, iter,
")", 1, NULL);
insert_editor_blocked (editor, iter,
")", plugin);
break;
default:
break;
......@@ -1570,7 +1586,7 @@ on_editor_char_inserted_cpp (IAnjutaEditor *editor,
else c = g_strdup ("'");
ianjuta_document_begin_undo_action (IANJUTA_DOCUMENT (editor), NULL);
ianjuta_editor_insert (editor, iter, c, 1, NULL);
insert_editor_blocked (editor, iter, c, plugin);
ianjuta_editor_goto_position (editor, iter, NULL);
ianjuta_document_end_undo_action (IANJUTA_DOCUMENT (editor), NULL);
......
......@@ -56,7 +56,7 @@ js-parser-y-tab.c js-parser-y-tab.h lex.yy.c lex.yy.h js-node.c js-node.h js-con
ijs-symbol.h ijs-symbol.c gir-symbol.c gir-symbol.h gi-symbol.c gi-symbol.h simple-symbol.c \
simple-symbol.h local-symbol.c local-symbol.h node-symbol.c node-symbol.h import-symbol.c \
import-symbol.h dir-symbol.c dir-symbol.h std-symbol.c std-symbol.h database-symbol.c database-symbol.h \
db-anjuta-symbol.c db-anjuta-symbol.h jstypes.h
db-anjuta-symbol.c db-anjuta-symbol.h jstypes.h prefs.h
libjs_support_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
......
......@@ -53,4 +53,5 @@ EXTRA_DIST = \
$(python_plugin_ui_DATA) \
$(python_plugin_glade_DATA) \
$(python_plugin_pixmaps_DATA) \
$(scripts_SCRIPTS)
$(scripts_SCRIPTS) \
$(prefs_keyfile)
......@@ -51,6 +51,7 @@ EXTRA_DIST = \
$(anjuta_pixmaps_DATA) \
$(anjuta_plugin_DATA) \
$(anjuta_ui_DATA) \
$(anjuta_glade_DATA)
$(anjuta_glade_DATA) \
$(schema_in_files)
-include $(top_srcdir)/git.mk
......@@ -90,7 +90,8 @@ EXTRA_DIST = \
$(plugin_in_files) \
$(sourceview_plugin_DATA) \
$(sourceview_pixmaps_DATA) \
$(sourceview_xml_DATA)
$(sourceview_xml_DATA) \
$(prefs_keyfile)
......
......@@ -31,7 +31,7 @@ js-parser/lex.yy.c : ${LEXFILE}
${LEXER} ${LEXCCFLAGS} ${LEXFILE}
ctags-visitor.c: ctags-visitor.vala
$(VALAC) -g -h ctags-vala.h -C --pkg vala-0.10 $^
$(VALAC) -g -h ctags-vala.h -C --pkg libvala-0.12 $^
anjuta_tags_SOURCES = \
main.c \
......
......@@ -112,7 +112,7 @@ public class CTagsVisitor : CodeVisitor {
}
return ret.str;
}
static string signature (Vala.List<Vala.FormalParameter> parameter) {
static string signature (Vala.List<Vala.Parameter> parameter) {
var ret = new StringBuilder("(");
var first = true;
foreach (var p in parameter) {
......@@ -367,7 +367,7 @@ public class CTagsVisitor : CodeVisitor {
* assumes that Parser.context is the same as source_file.context anyway */
var context = new CodeContext();
context.report = new DummyReport();
var source_file = new SourceFile(context, filename, filename.has_suffix("vapi"));
var source_file = new SourceFile(context, filename.has_suffix("vapi") ? SourceFileType.PACKAGE : SourceFileType.SOURCE, filename);
CodeContext.push(context);
context.add_source_file(source_file);
......@@ -383,7 +383,7 @@ public class CTagsVisitor : CodeVisitor {
taglist = new GLib.List<CTagsEntry?>();
var context = new CodeContext();
context.report = new DummyReport();
var source_file = new SourceFile(context, filename);
var source_file = new SourceFile(context, SourceFileType.SOURCE, filename);
context.add_source_file(source_file);
CodeContext.push(context);
......
......@@ -130,8 +130,9 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
GdkColor* background;
gchar *profile;
g_return_if_fail (client != NULL);
g_return_if_fail (settings != NULL);
#if 0
/* Update the currently available list of terminal profiles */
setting = g_settings_get_boolean (settings,
PREFS_TERMINAL_PROFILE_USE_DEFAULT);
......@@ -242,6 +243,7 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
g_free (profile);
g_object_unref (client);
#endif
}
static void
......@@ -428,7 +430,7 @@ terminal_keypress_cb (GtkWidget *widget, GdkEventKey *event,
return FALSE;
/* ctrl-d */
if ((event->keyval == GDK_d || event->keyval == GDK_D) &&
if ((event->keyval == GDK_KEY_d || event->keyval == GDK_KEY_D) &&
(event->state & GDK_CONTROL_MASK))
{
if (terminal_plugin->child_pid)
......@@ -925,7 +927,6 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
{
GError* error = NULL;
GSList *profiles;
GConfClient *client;
/* Create the terminal preferences page */
TerminalPlugin* term_plugin = ANJUTA_PLUGIN_TERMINAL (ipref);
......
This diff is collapsed.
......@@ -65,6 +65,7 @@ EXTRA_DIST = \
anjuta-shell.ui \
$(anjuta_layout_DATA) \
$(anjuta_glade_DATA) \
$(anjuta_pixmaps_DATA)
$(anjuta_pixmaps_DATA) \
$(prefs_keyfile)
-include $(top_srcdir)/git.mk
......@@ -37,10 +37,6 @@
#include "anjuta.h"
#ifdef ENABLE_NLS
#include <locale.h>
#endif
#define ANJUTA_PIXMAP_SPLASH_SCREEN "anjuta_splash.png"
/* App */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment