Commit 5fb31c3a authored by Sebastien Granjoux's avatar Sebastien Granjoux

Merge branch 'master' into newproject

Conflicts:
	plugins/Makefile.am
	plugins/gbf-am/Makefile.am
	plugins/mk-project/Makefile.am
	plugins/project-manager/pkg-config.h
#
# 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:   Makefile.am
#	modified:   NEWS
#	new file:   anjuta.jhbuildrc
#	modified:   configure.ac
#	modified:   libanjuta/Makefile.am
#	modified:   libanjuta/anjuta-plugin-manager.c
#	modified:   libanjuta/anjuta-tabber.c
#	modified:   libanjuta/anjuta-utils.c
#	modified:   libanjuta/cell-renderer-captioned-image.c
#	modified:   libanjuta/e-splash.c
#	modified:   libanjuta/interfaces/Makefile.am.iface
#	renamed:    libanjuta/libanjuta-1.0.pc.in -> libanjuta/libanjuta-3.0.pc.in
#	modified:   manuals/anjuta-manual/de/de.po
#	modified:   manuals/anjuta-manual/th/th.po
#	modified:   manuals/reference/libanjuta/Makefile.am
#	modified:   plugins/Makefile.am
#	modified:   plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
#	modified:   plugins/build-basic-autotools/build-options.c
#	modified:   plugins/class-gen/combo-flags.c
#	modified:   plugins/class-gen/window.c
#	modified:   plugins/debug-manager/Makefile.am
#	modified:   plugins/debug-manager/chunk_view.c
#	modified:   plugins/debug-manager/data_view.c
#	modified:   plugins/debug-manager/org.gnome.anjuta.debug-manager.gschema.xml.in
#	modified:   plugins/debug-manager/sharedlib.c
#	modified:   plugins/debug-manager/signals.c
#	modified:   plugins/debug-manager/sparse_view.c
#	modified:   plugins/debug-manager/start.c
#	modified:   plugins/document-manager/Makefile.am
#	modified:   plugins/document-manager/plugin.c
#	modified:   plugins/document-manager/search-box.c
#	modified:   plugins/file-loader/plugin.c
#	modified:   plugins/file-manager/file-view.c
#	modified:   plugins/gdb/Makefile.am
#	modified:   plugins/gdb/preferences.c
#	modified:   plugins/git/anjuta-git.ui
#	modified:   plugins/git/giggle-graph-renderer.c
#	modified:   plugins/git/git-diff-dialog.c
#	modified:   plugins/git/git-log-dialog.c
#	modified:   plugins/git/git-ui-utils.c
#	modified:   plugins/glade/plugin.c
#	modified:   plugins/language-manager/Makefile.am
#	modified:   plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
#	modified:   plugins/language-support-cpp-java/plugin.c
#	modified:   plugins/language-support-js/Makefile.am
#	modified:   plugins/language-support-js/anjuta-language-javascript.ui
#	modified:   plugins/language-support-js/plugin.c
#	modified:   plugins/language-support-js/plugin.h
#	new file:   plugins/language-support-js/prefs.h
#	modified:   plugins/language-support-js/util.c
#	modified:   plugins/language-support-python/Makefile.am
#	modified:   plugins/language-support-vala/Makefile.am
#	modified:   plugins/language-support-vala/plugin.vala
#	modified:   plugins/language-support-vala/provider.vala
#	modified:   plugins/message-view/anjuta-msgman.c
#	modified:   plugins/message-view/message-view.c
#	modified:   plugins/message-view/plugin.c
#	modified:   plugins/mk-project/Makefile.am
#	modified:   plugins/project-manager/project-view.c
#	modified:   plugins/project-wizard/druid.c
#	modified:   plugins/project-wizard/property.c
#	modified:   plugins/run-program/Makefile.am
#	modified:   plugins/run-program/anjuta-run-program.ui
#	modified:   plugins/run-program/execute.c
#	modified:   plugins/run-program/org.gnome.anjuta.run.gschema.xml.in
#	modified:   plugins/run-program/parameters.c
#	modified:   plugins/search/anjuta-search.ui
#	modified:   plugins/search/search-replace.c
#	modified:   plugins/snippets-manager/Makefile.am
#	modified:   plugins/snippets-manager/plugin.c
#	modified:   plugins/snippets-manager/snippets-browser.c
#	modified:   plugins/snippets-manager/snippets-editor.c
#	modified:   plugins/sourceview/Makefile.am
#	modified:   plugins/sourceview/anjuta-view.c
#	modified:   plugins/sourceview/assist-tip.c
#	modified:   plugins/sourceview/sourceview-prefs.c
#	modified:   plugins/sourceview/sourceview.c
#	modified:   plugins/starter/starter.c
#	modified:   plugins/subversion/subversion-commit-dialog.c
#	modified:   plugins/subversion/subversion-log-dialog.c
#	modified:   plugins/symbol-db/Makefile.am
#	modified:   plugins/symbol-db/anjuta-tags/Makefile.am
#	modified:   plugins/symbol-db/anjuta-tags/ctags-visitor.vala
#	modified:   plugins/symbol-db/symbol-db-model.h
#	modified:   plugins/symbol-db/symbol-db-views.c
#	modified:   plugins/terminal/Makefile.am
#	modified:   plugins/terminal/terminal.c
#	modified:   plugins/tools/editor.c
#	modified:   po/LINGUAS
#	modified:   po/POTFILES.in
#	modified:   po/es.po
#	modified:   po/gl.po
#	modified:   po/ja.po
#	new file:   po/ug.po
#	modified:   scripts/builder2schema.pl
#	modified:   src/Makefile.am
#	modified:   src/anjuta-app.c
#	modified:   src/main.c
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.anjuta/
#	.anjuta_sym_db.db
#	ABOUT-NLS
#	Debug/
#	INSTALL
#	Makefile.in
#	aclocal.m4
#	compile
#	config.guess
#	config.h.in
#	config.rpath
#	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.c
#	libanjuta/interfaces/ianjuta-language.h
#	libanjuta/interfaces/ianjuta-loader.c
#	libanjuta/interfaces/ianjuta-loader.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
#	libfoocanvas/Makefile.in
#	ltmain.sh
#	m4/gnome-doc-utils.m4
#	m4/intltool.m4
#	manuals/reference/libanjuta/libanjuta-sections.txt
#	manuals/reference/libanjuta/libanjuta.types
#	manuals/reference/libanjuta/tmpl/
#	missing
#	mkinstalldirs
#	module.patch
#	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/am-project/tests/Makefile.am~
#	plugins/am-project/tests/Makefile.in
#	plugins/am-project/tests/group.at~
#	plugins/am-project/tests/package.at~
#	plugins/am-project/tests/package.m4
#	plugins/am-project/tests/testsuite
#	plugins/class-inheritance/Makefile.in
#	plugins/glade/Makefile.in
#	plugins/gtodo/Makefile.in
#	plugins/js-debugger/Makefile.in
#	plugins/language-support-cpp-java/cxxparser/Makefile.in
#	plugins/language-support-js/Makefile.in
#	plugins/language-support-python/Makefile.in
#	plugins/mk-project/Makefile.am~
#	plugins/mk-project/Makefile.in
#	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/benchmark/Makefile.in
#	po/Makefile.in.in~
#	po/Makevars.template
#	po/Rules-quot
#	po/boldquot.sed
#	po/en@boldquot.header
#	po/en@quot.header
#	po/insert-header.sin
#	po/quot.sed
#	po/remove-potcdate.sin
#	xmldocs.make
#	ylwrap
parents bed225e6 bc368964
......@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
pixmaps scripts data \
doc libfoocanvas libanjuta plugins src manuals mime launcher po
doc libanjuta plugins src manuals mime launcher po
anjutadocdir = $(docdir)
anjutadoc_DATA = \
......
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)
......@@ -33,31 +33,30 @@ AC_SUBST(ANJUTA_VERSION)
dnl Anjuta core
GLIB_REQUIRED=2.25.15
GTK_REQUIRED=2.20.0
GTK_REQUIRED=2.29.1
GTHREAD_REQUIRED=2.22.0
GDK_PIXBUF_REQUIRED=2.0.0
GCONF_REQUIRED=2.12.0
GDA_REQUIRED=4.1.6
VTE_REQUIRED=0.13.1
LIBXML_REQUIRED=2.4.23
GDL_REQUIRED=2.27.1
GDL_REQUIRED=2.91.1
LIBWNCK_REQUIRED=2.12
UNIQUE_REQUIRED=1.0.0
UNIQUE_REQUIRED=2.90.1
dnl GtkSourceView
GTKSOURCEVIEW_REQUIRED=2.9.7
dnl Devhelp
LIBDEVHELP_REQUIRED=0.22
LIBDEVHELP_REQUIRED=2.90.6
dnl Glade
GLADEUI_REQUIRED=3.6.7
GLADEUI_REQUIRED=3.7.1
dnl Vala
VALA_REQUIRED=0.9.5
VALA_REQUIRED=0.11.2
dnl Introspection
GI_REQUIRED=0.6.6
GI_REQUIRED=0.9.5
dnl Various
LIBGRAPHVIZ_REQUIRED=1.0
......@@ -69,10 +68,10 @@ SVN_MINOR=5
SVN_PATCH=0
SUBVERSION_REQUIRED=$SVN_MAJOR.$SVN_MINOR.$SVN_PATCH
AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip])
AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip])
AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Check for C Compiler
AC_PROG_CC
......@@ -117,6 +116,9 @@ dnl DEPRECATED_FLAGS="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
dnl AC_SUBST(DEPRECATED_FLAGS)
dnl fi
dnl Check for pkg-config
PKG_PROG_PKG_CONFIG([0.22])
dnl Enable versioned user preferences directory
AC_ARG_WITH(pref-suffix,
AS_HELP_STRING([--with-pref-suffix=VALUE],[Suffix to add to user preferences dir.]),
......@@ -131,14 +133,6 @@ AC_DEFINE_UNQUOTED(PREF_SUFFIX,
LT_PREREQ([2.2])
LT_INIT([disable-static])
dnl ***************************************************************************
dnl Check for GConf stuff to handle schema installation
dnl ***************************************************************************
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
dnl ***************************************************************************
dnl Check for GObject-Introspection
dnl ***************************************************************************
......@@ -151,35 +145,35 @@ dnl ***************************************************************************
gjsdir=`pkg-config --variable=jsdir gjs-1.0`
AC_SUBST(gjsdir)
dnl ***************************************************************************
dnl Check for pkgconfig
dnl ***************************************************************************
AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
if test x$PKG_CONFIG = xno; then
AC_MSG_ERROR(Please install the pkg-config package from http://www.freedesktop.org/software/pkgconfig/)
fi
dnl Check base modules
PKG_CHECK_MODULES([ANJUTA],
[gthread-2.0 >= $GTHREAD_REQUIRED
unique-1.0 >= $UNIQUE_REQUIRED
unique-3.0 >= $UNIQUE_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
vte >= $VTE_REQUIRED
libxml-2.0 >= $LIBXML_REQUIRED
gdl-1.0 >= $GDL_REQUIRED
libgda-4.0 >= $GDA_REQUIRED
libxslt])
gtk+-3.0 >= $GTK_REQUIRED
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
PKG_CHECK_MODULES([XML],
[libxml-2.0 >= $LIBXML_REQUIRED])
PKG_CHECK_MODULES([GDL],
[gdl-3.0 >= $GDL_REQUIRED])
PKG_CHECK_MODULES([GDA],
[libgda-4.0 >= $GDA_REQUIRED])
PKG_CHECK_MODULES([VTE],
[vte-2.90 >= $VTE_REQUIRED])
dnl Check for autogen
dnl -----------------
AC_PATH_PROG(AUTOGEN_PATH, autogen,no)
if test x$AUTOGEN_PATH = xno; then
AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])
AC_MSG_WARN([Couldn't find autogen. You will be able to build anjuta without autogen \
but several things won't work. You can get it from http://autogen.sourceforge.net/])
fi
dnl Check for Devhelp
......@@ -199,7 +193,7 @@ if test "$user_disabled_devhelp" = 1; then
else
AC_MSG_RESULT(no)
PKG_CHECK_MODULES(PLUGIN_DEVHELP,
[libdevhelp-2.0 >= $LIBDEVHELP_REQUIRED webkit-1.0],
[libdevhelp-3.0 >= $LIBDEVHELP_REQUIRED],
[
devhelp_enabled=yes
], [
......@@ -226,7 +220,7 @@ if test "$user_disabled_glade" = 1; then
else
AC_MSG_RESULT(no)
gladeui_version=0
PKG_CHECK_MODULES(PLUGIN_GLADE, gladeui-1.0 >= $GLADEUI_REQUIRED,
PKG_CHECK_MODULES(PLUGIN_GLADE, gladeui-3.0 >= $GLADEUI_REQUIRED,
[
gladeui_found=yes
], [
......@@ -254,7 +248,7 @@ else
AC_MSG_RESULT(no)
sourceview="yes"
PKG_CHECK_MODULES(PLUGIN_SOURCEVIEW,
[gtksourceview-2.0 >= $GTKSOURCEVIEW_REQUIRED])
[gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED])
fi
AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
......@@ -262,13 +256,26 @@ AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
dnl Check for vala
dnl -------------------------------------------------------------
PKG_CHECK_MODULES(VALA,
[vala-0.10 >= $VALA_REQUIRED],
[enable_vala="yes"],
[enable_vala="no"])
AC_ARG_ENABLE(vala,
AC_HELP_STRING([--disable-vala],[Disable vala support]),
[ if test "$enableval" = "no"; then
user_disabled_vala=1
fi ],
[ user_disabled_vala=0 ])
AC_MSG_CHECKING(if vala support is disabled)
if test "$user_disabled_vala" = 1; then
AC_MSG_RESULT(yes)
enable_vala="no"
else
AC_MSG_RESULT(no)
enable_vala="yes"
PKG_CHECK_MODULES(VALA,
[libvala-0.12 >= $VALA_REQUIRED])
fi
if test x$enable_vala = xyes; then
AC_PATH_PROG(VALAC, valac, valac)
AC_PATH_PROGS(VALAC, [valac-0.12 valac], valac)
AC_SUBST(VALAC)
fi
......@@ -300,7 +307,7 @@ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
dnl Setup Anjuta Library flags
dnl --------------------------
LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta-3.la'
AC_SUBST(LIBANJUTA_CFLAGS)
AC_SUBST(LIBANJUTA_LIBS)
......@@ -332,11 +339,6 @@ AC_SUBST(anjuta_ui_dir)
AC_SUBST(anjuta_glade_dir)
AC_SUBST(anjuta_image_dir)
dnl ***************************************************************************
dnl Check for old vte version
dnl ***************************************************************************
PKG_CHECK_MODULES(VTE, vte >= $VTE_REQUIRED)
dnl ***************************************************************************
dnl Check for marshal and enum generators
dnl ***************************************************************************
......@@ -800,9 +802,8 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
AC_CONFIG_FILES([
Makefile
po/Makefile.in
libfoocanvas/Makefile
libanjuta/Makefile
libanjuta/libanjuta-1.0.pc
libanjuta/libanjuta-3.0.pc
libanjuta/anjuta-version.h
libanjuta/interfaces/Makefile
src/Makefile
......@@ -821,10 +822,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
......@@ -840,7 +839,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/symbol-db/benchmark/Makefile
......@@ -856,6 +854,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
......@@ -961,7 +960,7 @@ if [ test x$devhelp_enabled = xyes ]; then
echo "Building devhelp plugin: ...............................YES"
else
echo "Building devhelp plugin: ...............................NO"
echo " Requires libdevhelp-2.0 (>= $LIBDEVHELP_REQUIRED)"
echo " Requires libdevhelp-3.0 (>= $LIBDEVHELP_REQUIRED)"
fi
if [ test x$sourceview = xyes ]; then
......
......@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
$(WARN_CFLAGS) \
$(DEPRECATED_FLAGS) \
$(ANJUTA_CFLAGS) \
$(XML_CFLAGS) \
-DDATADIR="\"$(datadir)\"" \
-DPACKAGE_PIXMAPS_DIR="\"$(datadir)/pixmaps/$(PACKAGE)\"" \
-DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
......@@ -14,13 +15,14 @@ AM_CPPFLAGS = \
-DPACKAGE_DOC_DIR="\"$(docdir)\"" \
-DG_LOG_DOMAIN=\"libanjuta\"
lib_LTLIBRARIES = libanjuta.la
libanjuta_la_LDFLAGS = $(ANJUTA_LDFLAGS)
libanjuta_la_LIBADD = \
lib_LTLIBRARIES = libanjuta-3.la
libanjuta_3_la_LDFLAGS = $(ANJUTA_LDFLAGS)
libanjuta_3_la_LIBADD = \
interfaces/libanjuta-interfaces.la \
$(ANJUTA_LIBS)
$(ANJUTA_LIBS) \
$(XML_LIBS)
libanjuta_la_SOURCES= \
libanjuta_3_la_SOURCES= \
anjuta-enum-types.h \
anjuta-enum-types.c \
anjuta-marshal.h \
......@@ -111,11 +113,11 @@ if HAVE_PLUGIN_GLADE
gladeanjutadir = $(libdir)/glade3/modules
gladeanjuta_LTLIBRARIES = libgladeanjuta.la
libgladeanjuta_la_SOURCES = anjuta-glade-catalog.c
libgladeanjuta_la_LDFLAGS = $(ANJUTA_LDFLAGS) -module -avoid-version
libgladeanjuta_la_LIBADD = \
libanjuta.la \
gladeanjuta_LTLIBRARIES = libgladeanjuta-3.la
libgladeanjuta_3_la_SOURCES = anjuta-glade-catalog.c
libgladeanjuta_3_la_LDFLAGS = $(ANJUTA_LDFLAGS) -module -avoid-version
libgladeanjuta_3_la_LIBADD = \
libanjuta-3.la \
$(GLADE_LIBS)
# For now install in our own prefix
......@@ -126,7 +128,7 @@ catalog_DATA = anjuta-glade.xml
endif
libanjutaincludedir=$(includedir)/libanjuta-1.0/libanjuta
libanjutaincludedir=$(includedir)/libanjuta-3.0/libanjuta
libanjuta_include = \
libanjuta.h \
......@@ -211,11 +213,11 @@ anjuta-enum-types.c: Makefile
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libanjuta-1.0.pc
pkgconfig_DATA = libanjuta-3.0.pc
EXTRA_DIST = \
$(libanjutainclude_HEADERS) \
libanjuta-1.0.pc.in \
libanjuta-3.0.pc.in \
anjuta-marshal.list \
$(catalog_DATA)
......@@ -226,26 +228,28 @@ DISTCLEANFILES = \
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(builddir) -I $(top_builddir)
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(builddir) -I $(top_builddir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
anjuta_introspection_sources = $(libanjuta_la_SOURCES)
anjuta_introspection_sources = $(libanjuta_3_la_SOURCES)
ianjuta_introspection_sources = $(srcdir)/interfaces/*.c $(srcdir)/interfaces/*.h
Anjuta-1_0.gir: libanjuta.la
Anjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
Anjuta_1_0_gir_CFLAGS = $(ANJUTA_CFLAGS) -I$(top_srcdir)
Anjuta_1_0_gir_LIBS = anjuta
Anjuta_1_0_gir_FILES = $(anjuta_introspection_sources)
INTROSPECTION_GIRS += Anjuta-1.0.gir
IAnjuta-1_0.gir: interfaces/libanjuta-interfaces.la libanjuta.la Anjuta-1.0.gir
IAnjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 Anjuta-1.0
IAnjuta_1_0_gir_CFLAGS = $(LIBANJUTA_CFLAGS) -I$(top_srcdir)
IAnjuta_1_0_gir_LIBS = interfaces/libanjuta-interfaces.la anjuta
IAnjuta_1_0_gir_FILES = $(ianjuta_introspection_sources)
INTROSPECTION_GIRS += IAnjuta-1.0.gir
Anjuta-3.0.gir: libanjuta-3.la
Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
Anjuta_3_0_gir_CFLAGS = $(ANJUTA_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
Anjuta_3_0_gir_LIBS = anjuta-3
Anjuta_3_0_gir_FILES = $(anjuta_introspection_sources)
Anjuta_3_0_gir_SCANNERFLAGS = --c-include=libanjuta/libanjuta.h
INTROSPECTION_GIRS += Anjuta-3.0.gir
IAnjuta-3.0.gir: interfaces/libanjuta-interfaces.la libanjuta-3.la Anjuta-3.0.gir
IAnjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Anjuta-3.0
IAnjuta_3_0_gir_CFLAGS = $(ANJUTA_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
IAnjuta_3_0_gir_LIBS = interfaces/libanjuta-interfaces.la anjuta-3
IAnjuta_3_0_gir_FILES = $(ianjuta_introspection_sources)
IAnjuta_3_0_gir_SCANNERFLAGS = --add-include-path=$(top_srcdir)/libanjuta/ --symbol-prefix=ianjuta --c-include=libanjuta/interfaces/libanjuta-interfaces.h
INTROSPECTION_GIRS += IAnjuta-3.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
......
......@@ -1891,7 +1891,7 @@ on_plugin_list_selection_changed (GtkTreeSelection *tree_selection,
GList *list;
GtkButton *bt = NULL;
action_area = (GtkContainer *) dialog->action_area;
action_area = GTK_CONTAINER (gtk_dialog_get_action_area (dialog));
list = gtk_container_get_children (action_area);
for (; list; list = list->next) {
bt = list->data;
......
......@@ -158,7 +158,9 @@ anjuta_tabber_get_padding(GtkWidget* widget)
}
static void
anjuta_tabber_size_request(GtkWidget* widget, GtkRequisition* req)
anjuta_tabber_get_preferred_width (GtkWidget* widget,
gint* minimum,
gint* preferred)
{
g_return_if_fail (ANJUTA_IS_TABBER (widget));
......@@ -168,16 +170,53 @@ anjuta_tabber_size_request(GtkWidget* widget, GtkRequisition* req)
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
GtkRequisition child_req;
gint child_min;
gint child_preferred;
GtkStyle *style;
gtk_widget_size_request (GTK_WIDGET (child->data), &child_req);
gtk_widget_get_preferred_width (GTK_WIDGET (child->data), &child_min, &child_preferred);
style = gtk_widget_get_style (widget);
req->width += child_req.width + 2 * (style->xthickness + padding);
req->height = MAX(req->height, child_req.height + 2 * style->ythickness);
if (minimum)
{
*minimum += child_min + 2 * (style->xthickness + padding);
}
if (preferred)
{
*preferred += child_preferred + 2 * (style->xthickness + padding);
}
}
}
static void
anjuta_tabber_get_preferred_height (GtkWidget* widget,
gint* minimum,
gint* preferred)
{
g_return_if_fail (ANJUTA_IS_TABBER (widget));
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
GList* child;
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
gint child_min;
gint child_preferred;
GtkStyle *style;
gtk_widget_get_preferred_height (GTK_WIDGET (child->data), &child_min, &child_preferred);
style = gtk_widget_get_style (widget);
if (minimum)
{
*minimum = MAX(*minimum, child_min + 2 * style->ythickness);
}
if (preferred)
{
*preferred = MAX(*preferred, child_preferred + 2 * style->ythickness);
}
}
}
static void
anjuta_tabber_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
{
......@@ -246,12 +285,15 @@ anjuta_tabber_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
}
static gboolean
anjuta_tabber_expose_event (GtkWidget* widget, GdkEventExpose *event)
anjuta_tabber_draw (GtkWidget* widget, cairo_t* cr)
{
g_return_val_if_fail (ANJUTA_IS_TABBER (widget), FALSE);
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
GList* child;
gint padding = anjuta_tabber_get_padding (widget);
GtkAllocation widget_alloc;
gtk_widget_get_allocation (widget, &widget_alloc);
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
......@@ -263,22 +305,23 @@ anjuta_tabber_expose_event (GtkWidget* widget, GdkEventExpose *event)
style = gtk_widget_get_style (widget);
alloc.x -= style->xthickness + padding;
alloc.y -= style->ythickness;
alloc.x -= style->xthickness + padding + widget_alloc.x;
alloc.y -= style->ythickness + widget_alloc.y;
alloc.width += 2 * (style->xthickness + padding);
alloc.height += style->ythickness;
gtk_paint_extension (style,
gtk_widget_get_window (widget),
cr,
state, GTK_SHADOW_OUT,
NULL, widget, "tab",
widget, "tab",
alloc.x,
alloc.y,
alloc.width,
alloc.height,
GTK_POS_BOTTOM);
gtk_container_propagate_expose (GTK_CONTAINER (tabber),
GTK_WIDGET(child->data), event);
GTK_POS_BOTTOM);
gtk_container_propagate_draw (GTK_CONTAINER (tabber),
GTK_WIDGET(child->data), cr);
}
return FALSE;
}
......@@ -476,9 +519,10 @@ anjuta_tabber_class_init (AnjutaTabberClass *klass)
object_class->set_property = anjuta_tabber_set_property;
object_class->get_property = anjuta_tabber_get_property;
widget_class->size_request = anjuta_tabber_size_request;
widget_class->get_preferred_height = anjuta_tabber_get_preferred_height;
widget_class->get_preferred_width = anjuta_tabber_get_preferred_width;
widget_class->size_allocate = anjuta_tabber_size_allocate;
widget_class->expose_event = anjuta_tabber_expose_event;
widget_class->draw = anjuta_tabber_draw;
widget_class->button_press_event = anjuta_tabber_button_press_event;
widget_class->realize = anjuta_tabber_realize;
widget_class->unrealize = anjuta_tabber_unrealize;
......
......@@ -55,8 +55,6 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/anjuta-debug.h>
......@@ -1132,7 +1130,8 @@ anjuta_util_user_shell (void)
gchar **
anjuta_util_user_terminal (void)
{
#ifndef G_OS_WIN32
/* FIXME: GSettings */
#if 0
GConfClient *client;
gchar *terminal = NULL;
gchar **argv = NULL;
......
......@@ -100,7 +100,7 @@ anjuta_cell_renderer_captioned_image_new (void)
static void
anjuta_cell_renderer_captioned_image_get_size (GtkCellRenderer *gtk_cell,
GtkWidget *widget,
GdkRectangle *cell_area,
const GdkRectangle *cell_area,
int *x_offset,
int *y_offset,
int *width,
......@@ -135,12 +135,11 @@ anjuta_cell_renderer_captioned_image_get_size (GtkCellRenderer *gtk_cell,
static void
anjuta_cell_renderer_captioned_image_render (GtkCellRenderer *gtk_cell,
GdkWindow *window,
cairo_t *cr,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
guint flags)
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
AnjutaCellRendererCaptionedImage *cell = ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE (gtk_cell);
......@@ -164,13 +163,11 @@ anjuta_cell_renderer_captioned_image_render (GtkCellRenderer *gtk_cell,
text_area.height = height;
text_area.width = width;
gtk_cell_renderer_render (cell->image, window, widget,
background_area, &pixbuf_area,
expose_area, flags);
gtk_cell_renderer_render (cell->image, cr, widget,
background_area, &pixbuf_area, flags);
gtk_cell_renderer_render (cell->caption, window, widget,
background_area, &text_area,
expose_area, flags);
gtk_cell_renderer_render (cell->caption, cr, widget,
background_area, &text_area, flags);
}
static void
......
......@@ -58,7 +58,7 @@ G_DEFINE_TYPE(ESplash, e_splash, GTK_TYPE_WINDOW)
/* GtkObject methods. */
static void
impl_destroy (GtkObject *object)
impl_destroy (GtkWidget *object)
{
ESplash *splash;
ESplashPrivate *priv;
......@@ -84,10 +84,10 @@ e_splash_finalize (GObject *obj)
static void
e_splash_class_init (ESplashClass *klass)
{
GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gtkobject_class->destroy = impl_destroy;
widget_class->destroy = impl_destroy;
object_class->finalize = e_splash_finalize;
}
......@@ -113,31 +113,30 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
}
static gboolean
on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
ESplash *splash)
on_draw_cb (GtkWidget *widget, cairo_t *cr,
ESplash *splash)
{
ESplashPrivate *priv;
GdkWindow *window;
cairo_t *cr;
gint inc_width;
priv = splash->priv;
window = gtk_widget_get_window (widget);
/* draw the background pixbuf */
cr = gdk_cairo_create (window);
cairo_save (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
gdk_cairo_set_source_pixbuf (cr, priv->splash_image_pixbuf, 0, 0);
cairo_paint (cr);
cairo_restore (cr);
/* draw the plugin icon */
if (priv->icon_pixbuf)
{
cr = gdk_cairo_create (window);
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, priv->icon_pixbuf, ICON_X, ICON_Y);
cairo_paint (cr);
cairo_restore (cr);
}
/* draw the plugin text */
......@@ -146,37 +145,41 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
PangoContext *pc;
PangoLayout *layout;
gint layout_height;
cairo_save (cr);