3.0.0

This now handles overflow and underflow correctly, by parsing the string
and then clamping the value between INT_MIN and INT_MAX. `atoi` was
giving us garbage values when the buffer overflowed.

Fixes #408

.circleci/config.yml

@@ -0,0 +1,64 @@
+version: 2.0
+
+shared: &shared
+
+    steps:
+
+        - checkout
+
+        - run:
+            name: Prepare environment
+            command: apt-get update
+
+        - run:
+            name: Install dependencies
+            command: |
+                wget https://github.com/linuxmint/xapps/releases/download/master.${CIRCLE_JOB}/packages.tar.gz -O xapps.tar.gz
+                ls *.tar.gz | xargs -i tar zxvf {}
+                apt install --yes --allow-downgrades ./packages/*.deb
+                rm -rf packages
+
+        - run:
+            name: Build project
+            command: mint-build -i
+
+        - run:
+            name: Prepare packages
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    mkdir /packages
+                    mv /root/*.deb /packages/
+                    git log > /packages/git.log
+                    cd /
+                    tar zcvf packages.tar.gz packages
+                fi
+
+        - run:
+            name: Deploy packages to Github
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip
+                    apt-get install --yes unzip
+                    unzip ghr_v0.5.4_linux_amd64.zip
+                    TAG="master".$CIRCLE_JOB
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -replace $TAG /packages.tar.gz
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -recreate -b "Latest unstable packages" $TAG /packages.tar.gz
+                fi
+
+jobs:
+    "mint20":
+        <<: *shared
+        docker:
+            - image: linuxmintd/mint20-amd64
+
+    "lmde4":
+        <<: *shared
+        docker:
+            - image: linuxmintd/lmde4-amd64
+
+workflows:
+    version: 2
+    build:
+        jobs:
+            - "mint20"
+            - "lmde4"

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+
+```
+ * Xed version (xed --version)
+ * Distribution - (Mint 17.2, Arch, Fedora 25, etc...)
+```
+
+**Issue**
+
+
+
+**Steps to reproduce**
+
+
+
+**Expected behaviour**
+
+
+
+**Other information**

.gitignore

@@ -0,0 +1,12 @@
+# Specify filepatterns you want git to ignore.
+debian/tmp/
+debian/build/
+debian/.debhelper/
+debian/xed/
+debian/xed-common/
+debian/xed-dbg/
+debian/xed-dev/
+debian/xed-doc/
+debian/files
+debian/*.log
+debian/*.substvars

Makefile.am

@@ -1,74 +0,0 @@
-## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = xed pixmaps po data plugin-loaders plugins docs help
-
-if ENABLE_TESTS
-    SUBDIRS += tests
-endif
-
-distuninstallcheck_listfiles = find . -type f -print
-
-EXTRA_DIST = 			\
-	autogen.sh		\
-	ChangeLog		\
-	HACKING			\
-	NEWS			\
-	NEWS.GNOME		\
-	README			\
-	xmldocs.make 		\
-	omf.make		\
-	intltool-extract.in 	\
-	intltool-merge.in 	\
-	intltool-update.in
-
-DISTCLEANFILES = 		\
-	intltool-extract 	\
-	intltool-merge 		\
-	intltool-update
-
-MAINTAINERCLEANFILES = 		\
-	aclocal.m4		\
-	config.guess		\
-	config.h.in		\
-	config.sub		\
-	depcomp			\
-	intltool-extract.in 	\
-	intltool-merge.in 		\
-	intltool-update.in \
-	configure \
-	INSTALL \
-	gtk-doc.make		\
-	install-sh		\
-	ltmain.sh		\
-	missing			\
-	mkinstalldirs		\
-	omf.make		\
-	py-compile		\
-	xmldocs.make		\
-	m4/gtk-doc.m4		\
-	m4/intltool.m4		\
-	m4/libtool.m4		\
-	m4/ltoptions.m4		\
-	m4/ltsugar.m4		\
-	m4/ltversion.m4		\
-	m4/lt~obsolete.m4	\
-	`find "$(srcdir)" -type f -name Makefile.in -print`
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-tests
-
-dist-hook:
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		echo Creating ChangeLog && \
-		(GIT_DIR=$(top_srcdir)/.git \
-		  ./missing --run git log --stat -M -C --name-status  --date=short --no-color) | \
-		  fmt --split-only > ChangeLog.tmp \
-		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		|| ( rm -f ChangeLog.tmp ; \
-		  echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
-
--include $(top_srcdir)/git.mk

NEWS

@@ -1,69 +0,0 @@
-xed 1.13.0
-============
-
-xed 1.12.1
-============
-
-  * Add --without-matedesktop option to enable build without
-    dependency on libmate-desktop
-
-xed 1.12.0
-============
-
-  * Add --enable-tests option to enable/disable running tests
-    during the build
-  * Add plugin to strip trailing spaces on saving
-  * Bring back active plugins listing in bugreport script
-  * Drop support for win32/osx and checkupdate plugin
-  * Retrieve strings directly from gschema (requires intltool 0.50.1)
-  * Capitalize Xed in window titles and desktop file
-  * GTK3. fix print-preview
-  * Some annotation fixes
-  * Some minor fixes and cleanups
-
-xed 1.10.2
-============
-
-  * Window title: display full path to files on mounted drives
-  * Close confirmation dialog: make text unfocusable
-  * Quickopen plugin: fix filebrowser plugin support
-  * Time plugin: GTK+3 fix
-  * Multiple help fixes
-
-xed 1.10.1
-============
-
-  * Fix gschema translations
-  * GTK3 fixes
-  * Fix man page formatting
-  * Build system fixes
-
-xed 1.10.0
-============
-
-  * Use MateAboutDialog from libmate-desktop
-
-xed 1.8.1
-===========
-
-  * Fix go to line crash
-  * Translations updates
-
-xed 1.8.0
-===========
-
-  * Add GTK3 support
-  * Use yelp-tools instead of mate-doc-utils
-  * Move user plugin dir from config_dir to data_dir. Plugins should have
-    never been installed in the config dir as they are not part of the
-    configuration. This means user will need to move the plugins directory
-    from: $HOME/.config/xed/ to $HOME/.local/share/xed/.
-
-xed 1.5.0
-===========
-
-  * Migration to GSettings and drop mateconf
-    (All code is migrated, except pythonconsole plugin. The plugin works,
-    except you cant configure it; the configurable things were command
-    and error colors; this will be fixed migrating the plugin to Gir
-    instead of python-gtk)

NEWS.PLUMA

@@ -0,0 +1,69 @@
+xed 1.13.0
+============
+
+xed 1.12.1
+============
+
+  * Add --without-matedesktop option to enable build without
+    dependency on libmate-desktop
+
+xed 1.12.0
+============
+
+  * Add --enable-tests option to enable/disable running tests
+    during the build
+  * Add plugin to strip trailing spaces on saving
+  * Bring back active plugins listing in bugreport script
+  * Drop support for win32/osx and checkupdate plugin
+  * Retrieve strings directly from gschema (requires intltool 0.50.1)
+  * Capitalize Xed in window titles and desktop file
+  * GTK3. fix print-preview
+  * Some annotation fixes
+  * Some minor fixes and cleanups
+
+xed 1.10.2
+============
+
+  * Window title: display full path to files on mounted drives
+  * Close confirmation dialog: make text unfocusable
+  * Quickopen plugin: fix filebrowser plugin support
+  * Time plugin: GTK+3 fix
+  * Multiple help fixes
+
+xed 1.10.1
+============
+
+  * Fix gschema translations
+  * GTK3 fixes
+  * Fix man page formatting
+  * Build system fixes
+
+xed 1.10.0
+============
+
+  * Use MateAboutDialog from libmate-desktop
+
+xed 1.8.1
+===========
+
+  * Fix go to line crash
+  * Translations updates
+
+xed 1.8.0
+===========
+
+  * Add GTK3 support
+  * Use yelp-tools instead of mate-doc-utils
+  * Move user plugin dir from config_dir to data_dir. Plugins should have
+    never been installed in the config dir as they are not part of the
+    configuration. This means user will need to move the plugins directory
+    from: $HOME/.config/xed/ to $HOME/.local/share/xed/.
+
+xed 1.5.0
+===========
+
+  * Migration to GSettings and drop mateconf
+    (All code is migrated, except pythonconsole plugin. The plugin works,
+    except you cant configure it; the configurable things were command
+    and error colors; this will be fixed migrating the plugin to Gir
+    instead of python-gtk)

README

@@ -1,41 +0,0 @@
-General Information
-===================
-
-xed is a small and lightweight text editor.
-
-xed supports most standard editing features, plus several not found in your
-average text editor (plugins being the most notable of these).
-
-Although new features are always under development, currently xed has:
-
-    * Complete support for UTF-8 text
-    * Syntax highlighting
-    * Support for editing remote files
-    * Search and Replace
-    * Printing and Print Previewing Support
-    * File Revert
-    * A complete preferences interface
-    * Configurable Plugin system, with optional python support
-
-Some of the plugins, packaged and installed with xed include, among others:
-
-    * Word count
-    * Spell checker
-    * Change case of selected text
-    * File Browser
-    * Sort
-    * Insert Date/Time
-    * Tag list
-
-xed is released under the GNU General Public License (GPL) version 2, see
-the file 'COPYING' for more information.
-
-Installation
-============
-
-Simple install procedure:
-
-  % ./autogen.sh				# run the `configure' script
-  % make					# build xed
-  [ Become root if necessary ]
-  % make install				# install xed

README.md

@@ -0,0 +1,74 @@
+# Xed Text Editor
+
+xed is a small and lightweight text editor.
+
+xed supports most standard editing features, plus several not found in your
+average text editor (plugins being the most notable of these).
+
+Although new features are always under development, currently xed has:
+
+    * Complete support for UTF-8 text
+    * Syntax highlighting
+    * Support for editing remote files
+    * Search and Replace
+    * Printing and Print Previewing Support
+    * File Revert
+    * A complete preferences interface
+    * Configurable Plugin system, with optional python support
+
+Some of the plugins, packaged and installed with xed include, among others:
+
+    * Change Case
+    * Document Statistics
+    * File Browser
+    * Indent Lines
+    * Insert Date/Time
+    * Modelines
+    * Save Without Trailing Spaces
+    * Sort
+    * Spell checker
+    * Tag list
+    * Word Completion
+
+
+## Installation
+
+```
+    1. run the 'configure' script
+      # meson --prefix=/usr build
+    2. build xed
+      # ninja -v -C build
+    3. install xed
+      # sudo ninja install -v -C build
+
+    ** Build Instructions for Debian-based distros **
+    1. run "dpkg-buildpackage" from the xed base directory
+    2. cd ..
+    3. run 
+      # sudo dpkg -i *.deb
+    4. From then, any new changes can be applied by running
+      # sudo ninja -C debian/build install 
+```
+
+### Xed look and feel
+
+##### Classic Mode
+![classic-screenshot](/screencaptures/classic_screencapture.png?raw=true)
+
+##### Theme selections
+![theme-screenshot](/screencaptures/theme_screencapture.png?raw=true)
+
+##### Search and Replace feature
+![search-replace-screenshot](/screencaptures/search_replace_screencapture.png?raw=true)
+
+##### Select from several languages in Highlight syntax mode
+![highlightmode-screenshot](/screencaptures/highlightmode_screencapture.png?raw=true)
+
+##### Xed Shortcuts
+![shortcuts-1-screenshot](/screencaptures/shortcuts_1_screencapture.png?raw=true)
+![shortcuts-2-screenshot](/screencaptures/shortcuts_2_screencapture.png?raw=true)
+
+
+
+> xed is released under the GNU General Public License (GPL) version 2, see
+> the file 'COPYING' for more information.

autogen.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="xed"
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common"
-    exit 1
-}
-
-
-which yelp-build || {
-    echo "You need to install yelp-tools"
-    exit 1
-}
-
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_MACROS=python.m4
-GNOME_DATADIR="$gnome_datadir"
-USE_COMMON_DOC_BUILD=yes
-
-. gnome-autogen.sh
-

configure.ac

@@ -1,410 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.63.2)
-
-m4_define(xed_major_version, 1)
-m4_define(xed_minor_version, 0)
-m4_define(xed_micro_version, 6)
-m4_define(xed_version, xed_major_version.xed_minor_version.xed_micro_version)
-
-AC_INIT([xed], [xed_version],
-    [https://github.com/linuxmint/xed/issues],
-    [xed], [http://github.com/linuxmint/xed])
-
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_SRCDIR(xed/xed.c)
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_DEFINE(XED_MAJOR_VERSION, xed_major_version, [Xed major version])
-AC_SUBST(XED_MAJOR_VERSION, xed_major_version)
-AC_DEFINE(XED_MINOR_VERSION, xed_minor_version, [Xed minor version])
-AC_SUBST(XED_MINOR_VERSION, xed_minor_version)
-AC_DEFINE(XED_MICRO_VERSION, xed_micro_version, [Xed micro version])
-AC_SUBST(XED_MICRO_VERSION, xed_micro_version)
-
-AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wno-portability check-news])
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-# Checks for programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_SYS_LARGEFILE
-PKG_PROG_PKG_CONFIG
-
-# Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT(disable-static)
-
-GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
-
-AC_CHECK_FUNC(sigaction)
-AC_CHECK_LIB(m, floor)
-
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
-
-dnl toolbar style for GSettings schemas
-TOOLBAR_STYLE="XED_TOOLBAR_SYSTEM"
-AC_SUBST(TOOLBAR_STYLE)
-
-# GLib min/max required versions
-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36],
-	[Warn on use of APIs added after GLib 2.36])
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36],
-	[Warn on use of APIs deprecated before GLib 2.36])
-
-dnl ===============================================================
-dnl Expanded dirs
-dnl ===============================================================
-
-# This macro expands DIR and assigns it to RET.
-# If DIR is NONE, then it's replaced by DEFAULT.
-# Based on AC_DEFINE_DIR
-AC_DEFUN([XED_FULLPATH], [
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_expand=[$]$1
-  test "x$ac_expand" = xNONE && ac_expand="[$]$2"
-  ac_expand=`eval echo [$]ac_expand`
-  $3=`eval echo [$]ac_expand`
-])
-
-dnl ================================================================
-dnl Gettext stuff.
-dnl ================================================================
-
-IT_PROG_INTLTOOL([0.50.1])
-GETTEXT_PACKAGE=xed
-AC_SUBST([GETTEXT_PACKAGE])
-AM_GLIB_GNU_GETTEXT
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
-
-dnl ================================================================
-dnl Use gvfs metadata or the old xml file store.
-dnl ================================================================
-
-AC_ARG_ENABLE([gvfs-metadata],
-	AS_HELP_STRING([--enable-gvfs-metadata], [Enable using gvfs to store metadata]),
-	[enable_gvfs_metadata=$enableval],
-	[enable_gvfs_metadata=yes])
-
-AM_CONDITIONAL(ENABLE_GVFS_METADATA, test "x$enable_gvfs_metadata" != "xno")
-
-if test "x$enable_gvfs_metadata" != "xno"; then
-	AC_DEFINE([ENABLE_GVFS_METADATA], [1], [Define to enable using gvfs metadata])
-fi
-
-dnl ================================================================
-dnl spell plugins checks: enchant and iso-codes
-dnl ================================================================
-
-ENCHANT_REQUIRED=1.2.0
-ISO_CODES_REQUIRED=0.35
-
-AC_ARG_ENABLE([spell],
-	AS_HELP_STRING([--disable-spell],[Disable spell plugin (default: enabled)]),
-	[enable_enchant=$enableval],
-	[enable_enchant=yes])
-
-if test "x$enable_enchant" = "xyes" ; then
-
-	PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED, \
-			  have_enchant=yes, have_enchant=no)
-
-	if test "x$have_enchant" = "xyes"; then
-
-		PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
-				 [have_iso_codes=yes],[have_iso_codes=no])
-
-		if test "x$have_iso_codes" = "xyes"; then
-			AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
-			if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \
-			   $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then
-				result=yes
-			else
-				result=no
-				have_iso_codes=no
-			fi
-			AC_MSG_RESULT([$result])
-		fi
-
-		if test "x$have_iso_codes" = "xyes"; then
-			AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
-			AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
-		else
-			AC_MSG_ERROR([iso-codes is required to build the spell plugin. Use --disable-spell to build without spell plugin.])
-		fi
-	else
-		enable_enchant=no
-		AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spell plugin.])
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
-
-dnl ================================================================
-dnl Start of pkg-config checks
-dnl ================================================================
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-  [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.24.0
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=3.0.0
-       ;;
-esac
-AC_SUBST(GTK_API_VERSION)
-
-PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
-PKG_CHECK_MODULES(XED, [
-	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.36.0
-	$GMODULE_ADD
-	gthread-2.0 >= 2.13.0
-	gio-2.0 >= 2.26.0
-	gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-	gtksourceview-$GTK_API_VERSION >= 2.9.7
-])
-
-PKG_CHECK_MODULES(X11, [x11])
-
-XED_CFLAGS="$XED_CFLAGS $X11_CFLAGS"
-XED_LIBS="$XED_LIBS $X11_LIBS"
-
-AC_SUBST(XED_CFLAGS)
-AC_SUBST(XED_LIBS)
-
-PKG_CHECK_MODULES(EGG_SMCLIENT, [sm >= 1.0.0])
-
-AC_SUBST(EGG_SMCLIENT_CFLAGS)
-AC_SUBST(EGG_SMCLIENT_LIBS)
-
-dnl ================================================================
-dnl GSettings related settings
-dnl ================================================================
-
-GLIB_GSETTINGS
-
-dnl ================================================================
-dnl Python
-dnl ================================================================
-
-AC_MSG_CHECKING([whether Python support is requested])
-AC_ARG_ENABLE([python],
-	AS_HELP_STRING([--enable-python],[Enable python support]),
-	[enable_python=$enableval have_python=$enableval],
-	[enable_python=autodetect have_python=yes])
-AC_MSG_RESULT([$enable_python])
-
-if test "x$have_python" != "xno"; then
-	AM_PATH_PYTHON([2.5],[],[no])
-	if test "x$PYTHON" = "x:"; then
-		have_python=no
-	fi
-fi
-
-if test "x$have_python" != "xno"; then
-	AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "x$have_python" != "xno"; then
-	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
-	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-
-	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
-	PYTHON_LIB_LOC="-L$libdir/python$PYTHON_VERSION/config"
-	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-	PYTHON_MAKEFILE="$libdir/python$PYTHON_VERSION/config/Makefile"
-	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
-
-	AC_SUBST([PYTHON_LIBS])
-	AC_SUBST([PYTHON_LIB_LOC])
-	AC_SUBST([PYTHON_CFLAGS])
-	AC_SUBST([PYTHON_EXTRA_LIBS])
-fi
-
-if test "x$have_python" != "xyes"; then
-	if test "x$enable_python" = "xyes"; then
-		AC_MSG_ERROR([Python not found])
-	elif test "x$enable_python" = "xautodetect"; then
-		enable_python=no
-		AC_MSG_WARN([Python not found, disabling python support])
-	fi
-fi
-
-if test "x$have_python" != "xno"; then
-	PYGOBJECT_REQUIRED=2.15.4
-	PYGTK_REQUIRED=2.12.0
-	PYGTKSOURCEVIEW_REQUIRED=2.9.2
-
-	PKG_CHECK_MODULES([PYGTK], [
-		pygobject-2.0 >= $PYGOBJECT_REQUIRED
-		pygtk-2.0 >= $PYGTK_REQUIRED
-		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED],
-		[],
-		[
-		have_python=no
-		if test "x$enable_python" = "xyes"; then
-			AC_MSG_ERROR([$PYGTK_PKG_ERRORS])
-		elif test "x$enable_python" = "xautodetect"; then
-			enable_python=no
-			AC_MSG_WARN([$PYGTK_PKG_ERRORS])
-			AC_MSG_WARN([Disabling python support])
-		fi
-		])
-fi
-
-if test "x$have_python" != "xno"; then
-	AC_MSG_CHECKING([for pygtk defs])
-	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-	AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygobject defs])
-	PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0`
-	AC_MSG_RESULT([$PYGOBJECT_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygtk codegen])
-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-	AC_MSG_RESULT([$PYGTK_CODEGEN])
-
-	AC_MSG_CHECKING([for pygtk h2def])
-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-	AC_MSG_RESULT([$PYGTK_H2DEF])
-
-	AC_SUBST([PYGTK_DEFSDIR])
-	AC_SUBST([PYGOBJECT_DEFSDIR])
-	AC_SUBST([PYGTK_CODEGEN])
-	AC_SUBST([PYGTK_H2DEF])
-
-	dnl Check for -fno-strict-aliasing
-	FLAGS="-fno-strict-aliasing"
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $FLAGS"
-	AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[compiler_has_option=yes],[compiler_has_option=no])
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT($compiler_has_option)
-	if test $compiler_has_option = yes; then
-		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-	fi
-	AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-fi
-
-if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
-	enable_python=yes
-	AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
-
-dnl This allows the bug-report script to know whether python has been enabled
-AC_SUBST(enable_python)
-
-dnl ================================================================
-dnl Misc
-dnl ================================================================
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
-GNOME_COMPILE_WARNINGS(yes)
-
-AC_ARG_ENABLE(deprecations,
-              [AS_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
-
-if test "x$enable_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="\
--DG_DISABLE_DEPRECATED \
--DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
-AC_ARG_ENABLE([tests],
-	AS_HELP_STRING([--enable-tests], [Enable the tests]),
-	[enable_tests=$enableval],
-	[enable_tests=yes])
-
-AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
-
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
-LOADER_LIBTOOL_FLAGS="-module -avoid-version"
-
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
-AC_SUBST(LOADER_LIBTOOL_FLAGS)
-
-XED_PLUGINS_DATA_DIR="$datadir/xed/plugins"
-AC_SUBST(XED_PLUGINS_DATA_DIR)
-
-XED_PLUGINS_LIBS_DIR="$libdir/xed/plugins"
-AC_SUBST(XED_PLUGINS_LIBS_DIR)
-
-YELP_HELP_INIT
-
-AC_CONFIG_FILES([
-Makefile
-data/xed.desktop.in
-data/xed-bugreport.sh
-data/xed.pc
-data/org.x.editor.gschema.xml
-data/Makefile
-docs/Makefile
-docs/reference/Makefile
-xed/dialogs/Makefile
-xed/smclient/Makefile
-xed/Makefile
-help/Makefile
-pixmaps/Makefile
-plugin-loaders/Makefile
-plugin-loaders/c/Makefile
-plugin-loaders/python/Makefile
-plugin-loaders/python/bindings/Makefile
-plugins/Makefile
-plugins/changecase/Makefile
-plugins/docinfo/Makefile
-plugins/filebrowser/Makefile
-plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml
-plugins/modelines/Makefile
-plugins/sort/Makefile
-plugins/spell/Makefile
-plugins/spell/org.x.editor.plugins.spell.gschema.xml
-plugins/taglist/Makefile
-plugins/time/Makefile
-plugins/time/org.x.editor.plugins.time.gschema.xml
-plugins/trailsave/Makefile
-po/Makefile.in
-tests/Makefile
-])
-
-AC_OUTPUT
-
-echo "
-
-Configuration:
-
-	Source code location:	${srcdir}
-	Compiler:		${CC}
-	GTK API version:	$GTK_API_VERSION
-	Python Plugins Support: $enable_python
-	Spell Plugin enabled:	$enable_enchant
-	Gvfs metadata enabled:	$enable_gvfs_metadata
-	Tests enabled:		$enable_tests
-"

data/Makefile.am

@@ -1,38 +0,0 @@
-desktopdir 	 = $(datadir)/applications
-desktop_in_files = xed.desktop.in
-desktop_DATA 	 = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-@INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_in_files = xed.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-gsettings_SCHEMAS = org.x.editor.gschema.xml
-@GSETTINGS_RULES@
-
-man_MANS = xed.1
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xed.pc
-
-bugreportdir = $(libexecdir)/xed
-bugreport_SCRIPTS = xed-bugreport.sh
-
-EXTRA_DIST = 			\
-	$(appdata_in_files)	\
-	$(desktop_in_files)	\
-	$(man_MANS)			\
-	xed.pc.in			\
-	xed-bugreport.sh.in
-
-CLEANFILES =	 			\
-	$(desktop_DATA)			\
-	$(gsettings_SCHEMAS)	\
-	$(pkgconfig_DATA)		\
-	$(appdata_DATA)
-
-
-
-
--include $(top_srcdir)/git.mk

data/meson.build

@@ -0,0 +1,42 @@
+desktop = custom_target(
+    'desktop',
+    input: 'xed.desktop.in.in',
+    output: 'xed.desktop',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: desktopdir,
+)
+
+appdata = custom_target(
+    'appdata',
+    input: 'xed.appdata.xml.in',
+    output: 'xed.appdata.xml',
+    command: [intltool_merge, '-x', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: join_paths(datadir, 'metainfo'),
+)
+
+schema_conf = configuration_data()
+schema_conf.set('GETTEXT_PACKAGE', 'xed')
+
+schema_file = configure_file(
+    input: 'org.x.editor.gschema.xml.in',
+    output: 'org.x.editor.gschema.xml',
+    configuration: schema_conf,
+    install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
+)
+
+service_conf = configuration_data()
+service_conf.set('bindir', join_paths(prefix, bindir))
+
+configure_file(
+    input: 'org.x.editor.service.in',
+    output: 'org.x.editor.service',
+    configuration: service_conf,
+    install_dir: join_paths(datadir, 'dbus-1', 'services')
+)
+
+install_data(
+    'xed.1',
+    install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
+)

data/org.x.editor.gschema.xml.in

@@ -1,200 +1,378 @@
 <?xml version="1.0"?>
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.x.editor" path="/org/x/editor/">
+<schemalist>
+  <enum id="org.x.editor.WrapMode">
+    <value nick="none" value="0"/>
+    <value nick="char" value="1"/>
+    <value nick="word" value="2"/>
+    <value nick="word-char" value="3"/>
+  </enum>
+
+  <enum id="org.x.editor.SmartHomeEnd">
+    <value nick="disabled" value="0"/>
+    <value nick="before" value="1"/>
+    <value nick="after" value="2"/>
+    <value nick="always" value="3"/>
+  </enum>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor" path="/org/x/editor/">
+    <child name="preferences" schema="org.x.editor.preferences"/>
+    <child name="state" schema="org.x.editor.state"/>
+    <child name="plugins" schema="org.x.editor.plugins"/>
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences" path="/org/x/editor/preferences/">
+    <child name="editor" schema="org.x.editor.preferences.editor"/>
+    <child name="ui" schema="org.x.editor.preferences.ui"/>
+    <child name="print" schema="org.x.editor.preferences.print"/>
+    <child name="encodings" schema="org.x.editor.preferences.encodings"/>
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.editor" path="/org/x/editor/preferences/editor/">
+
     <key name="use-default-font" type="b">
       <default>true</default>
       <summary>Use Default Font</summary>
       <description>Whether to use the system's default fixed width font for editing text instead of a font specific to xed.  If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.</description>
     </key>
+
     <key name="editor-font" type="s">
       <default context="editor-font" l10n="messages">'Monospace 12'</default>
       <summary>Editor Font</summary>
       <description>A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off.</description>
     </key>
-    <key name="color-scheme" type="s">
+
+    <key name="prefer-dark-theme" type="b">
+      <default>false</default>
+      <summary>Prefer Dark Theme</summary>
+      <description>Whether xed should prefer the dark variation of the current Gtk theme if available.</description>
+    </key>
+
+    <key name="scheme" type="s">
       <default>'tango'</default>
       <summary>Style Scheme</summary>
       <description>The ID of a GtkSourceView Style Scheme used to color the text.</description>
     </key>
+
     <key name="create-backup-copy" type="b">
       <default>false</default>
       <summary>Create Backup Copies</summary>
       <description>Whether xed should create backup copies for the files it saves.  You can set the backup file extension with the "Backup Copy Extension" option.</description>
     </key>
+
     <key name="auto-save" type="b">
       <default>false</default>
       <summary>Autosave</summary>
       <description>Whether xed should automatically save modified files after a time interval.  You can set the time interval with the "Autosave Interval" option.</description>
     </key>
-    <key name="auto-save-interval" type="i">
+
+    <key name="auto-save-interval" type="u">
       <default>10</default>
       <summary>Autosave Interval</summary>
       <description>Number of minutes after which xed will automatically save modified files.  This will only take effect if the "Autosave" option is turned on.</description>
     </key>
+
     <key name="writable-vfs-schemes" type="as">
       <default>[ 'dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh' ]</default>
       <summary>Writable VFS schemes</summary>
       <description>List of VFS schemes xed supports in write mode. The 'file' scheme is writable by default.</description>
     </key>
+
     <key name="max-undo-actions" type="i">
       <default>2000</default>
       <summary>Maximum Number of Undo Actions</summary>
       <description>Maximum number of actions that xed will be able to undo or redo. Use "-1" for unlimited number of actions.</description>
     </key>
-    <key name="wrap-mode" type="s">
-      <default>'GTK_WRAP_WORD'</default>
+
+    <key name="wrap-mode" enum="org.x.editor.WrapMode">
+      <default>'word'</default>
       <summary>Line Wrapping Mode</summary>
-      <description>Specifies how to wrap long lines in the editing area. Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
+      <description>Specifies how to wrap long lines in the editing area. Use "none" for no wrapping, "word" for wrapping at word boundaries, and "char" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
     </key>
-    <key name="tabs-size" type="i">
+
+    <key name="tabs-size" type="u">
       <default>4</default>
       <summary>Tab Size</summary>
       <description>Specifies the number of spaces that should be displayed instead of Tab characters.</description>
     </key>
+
     <key name="insert-spaces" type="b">
-      <default>false</default>
+      <default>true</default>
       <summary>Insert spaces</summary>
       <description>Whether xed should insert spaces instead of tabs.</description>
     </key>
+
     <key name="auto-indent" type="b">
       <default>false</default>
       <summary>Automatic indent</summary>
       <description>Whether xed should enable automatic indentation.</description>
     </key>
+
     <key name="display-line-numbers" type="b">
       <default>false</default>
       <summary>Display Line Numbers</summary>
       <description>Whether xed should display line numbers in the editing area.</description>
     </key>
+
     <key name="highlight-current-line" type="b">
       <default>false</default>
       <summary>Highlight Current Line</summary>
       <description>Whether xed should highlight the current line.</description>
     </key>
+
     <key name="bracket-matching" type="b">
       <default>false</default>
       <summary>Highlight Matching Bracket</summary>
       <description>Whether xed should highlight the bracket matching the selected one.</description>
     </key>
+
     <key name="display-right-margin" type="b">
       <default>false</default>
       <summary>Display Right Margin</summary>
       <description>Whether xed should display the right margin in the editing area.</description>
     </key>
-    <key name="right-margin-position" type="i">
-      <default>80</default>
+
+    <key name="right-margin-position" type="u">
+      <default>120</default>
       <summary>Right Margin Position</summary>
       <description>Specifies the position of the right margin.</description>
     </key>
-    <key name="smart-home-end" type="s">
+
+    <key name="smart-home-end" enum="org.x.editor.SmartHomeEnd">
       <default>'after'</default>
       <summary>Smart Home End</summary>
-      <description>Specifies how the cursor moves when the HOME and END keys are pressed. Use "DISABLED" to always move at the start/end of the line, "AFTER" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, "BEFORE" to move to the start/end of the text before moving to the start/end of the line and "ALWAYS" to always move to the start/end of the text instead of the start/end of the line.</description>
+      <description>Specifies how the cursor moves when the HOME and END keys are pressed. Use "disabled" to always move at the start/end of the line, "after" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, "before" to move to the start/end of the text before moving to the start/end of the line and "always" to always move to the start/end of the text instead of the start/end of the line.</description>
     </key>
+
     <key name="restore-cursor-position" type="b">
       <default>true</default>
       <summary>Restore Previous Cursor Position</summary>
       <description>Whether xed should restore the previous cursor position when a file is loaded.</description>
     </key>
-    <key name="enable-search-highlighting" type="b">
+
+    <key name="search-highlighting" type="b">
       <default>true</default>
       <summary>Enable Search Highlighting</summary>
       <description>Whether xed should highlight all the occurrences of the searched text.</description>
     </key>
-    <key name="enable-syntax-highlighting" type="b">
+
+    <key name="syntax-highlighting" type="b">
       <default>true</default>
       <summary>Enable Syntax Highlighting</summary>
       <description>Whether xed should enable syntax highlighting.</description>
     </key>
+
+    <key name="ensure-trailing-newline" type="b">
+      <default>true</default>
+      <summary>Ensure Trailing Newline</summary>
+      <description>Whether xed will ensure that documents always end with a trailing newline.</description>
+    </key>
+
+    <key name="draw-whitespace" type="b">
+      <default>false</default>
+      <summary>Draw whitespace</summary>
+      <description>Whether xed should render whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-leading" type="b">
+      <default>false</default>
+      <summary>Draw leading whitespace</summary>
+      <description>Whether xed should render leading whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-inside" type="b">
+      <default>false</default>
+      <summary>Draw whitespace within text</summary>
+      <description>Whether xed should render whitespace between words and characters</description>
+    </key>
+
+    <key name="draw-whitespace-trailing" type="b">
+      <default>false</default>
+      <summary>Draw trailing whitespace</summary>
+      <description>Whether xed should render trailing whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-newline" type="b">
+      <default>false</default>
+      <summary>Draw newline characters</summary>
+      <description>Whether xed should render newline characters</description>
+    </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.ui" path="/org/x/editor/preferences/ui/">
+
     <key name="toolbar-visible" type="b">
       <default>true</default>
       <summary>Toolbar is Visible</summary>
       <description>Whether the toolbar should be visible in editing windows.</description>
     </key>
-    <key name="toolbar-buttons-style" type="s">
-      <default>'@TOOLBAR_STYLE@'</default>
-      <summary>Toolbar Buttons Style</summary>
-      <description>Style for the toolbar buttons.  Possible values are "XED_TOOLBAR_SYSTEM" to use the system's default style, "XED_TOOLBAR_ICONS" to display icons only, "XED_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and "XED_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
-    </key>
+
     <key name="statusbar-visible" type="b">
       <default>true</default>
       <summary>Status Bar is Visible</summary>
       <description>Whether the status bar at the bottom of editing windows should be visible.</description>
     </key>
-    <key name="side-pane-visible" type="b">
+
+    <key name="side-panel-visible" type="b">
       <default>false</default>
       <summary>Side Pane is Visible</summary>
       <description>Whether the side pane at the left of editing windows should be visible.</description>
     </key>
+
     <key name="bottom-panel-visible" type="b">
       <default>false</default>
       <summary>Bottom Panel is Visible</summary>
       <description>Whether the bottom panel at the bottom of editing windows should be visible.</description>
     </key>
-    <key name="max-recents" type="i">
+
+    <key name="enable-tab-scrolling" type="b">
+      <default>true</default>
+      <summary>Allow changing active tabs by scrolling</summary>
+      <description>Whether you can change active tabs by scrolling.</description>
+    </key>
+
+    <key name="minimap-visible" type="b">
+      <default>false</default>
+      <summary>Minimap is visible</summary>
+      <description>Whether the minimap for the document should be visible.</description>
+    </key>
+
+    <key name="max-recents" type="u">
       <default>5</default>
       <summary>Maximum Recent Files</summary>
       <description>Specifies the maximum number of recently opened files that will be displayed in the "Recent Files" submenu.</description>
     </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.print" path="/org/x/editor/preferences/print/">
+
     <key name="print-syntax-highlighting" type="b">
       <default>true</default>
       <summary>Print Syntax Highlighting</summary>
       <description>Whether xed should print syntax highlighting when printing documents.</description>
     </key>
+
     <key name="print-header" type="b">
       <default>true</default>
       <summary>Print Header</summary>
       <description>Whether xed should include a document header when printing documents.</description>
     </key>
-    <key name="print-wrap-mode" type="s">
-      <default>'GTK_WRAP_WORD'</default>
+
+    <key name="print-wrap-mode" enum="org.x.editor.WrapMode">
+      <default>'word'</default>
       <summary>Printing Line Wrapping Mode</summary>
-      <description>Specifies how to wrap long lines for printing.  Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
+      <description>Specifies how to wrap long lines for printing.  Use "none" for no wrapping, "word" for wrapping at word boundaries, and "char" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
     </key>
-    <key name="print-line-numbers" type="i">
+
+    <key name="print-line-numbers" type="u">
       <default>0</default>
       <summary>Print Line Numbers</summary>
       <description>If this value is 0, then no line numbers will be inserted when printing a document.  Otherwise, xed will print line numbers every such number of lines.</description>
     </key>
+
     <key name="print-font-body-pango" type="s">
       <default context="print-font-body-pango" l10n="messages">'Monospace 9'</default>
       <summary>Body Font for Printing</summary>
       <description>Specifies the font to use for a document's body when printing documents.</description>
     </key>
+
     <key name="print-font-header-pango" type="s">
       <default context="print-font-header-pango" l10n="messages">'Sans 11'</default>
       <summary>Header Font for Printing</summary>
       <description>Specifies the font to use for page headers when printing a document. This will only take effect if the "Print Header" option is turned on.</description>
     </key>
+
     <key name="print-font-numbers-pango" type="s">
       <default context="print-font-numbers-pango" l10n="messages">'Sans 8'</default>
       <summary>Line Number Font for Printing</summary>
       <description>Specifies the font to use for line numbers when printing.  This will only take effect if the "Print Line Numbers" option is non-zero.</description>
     </key>
-    <key name="auto-detected-encodings" type="as">
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.encodings" path="/org/x/editor/preferences/encodings/">
+
+    <key name="auto-detected" type="as">
       <default context="auto-detected" l10n="messages">[ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]</default>
       <summary>Automatically Detected Encodings</summary>
       <description>Sorted list of encodings used by xed for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.</description>
     </key>
-    <key name="shown-in-menu-encodings" type="as">
+
+    <key name="shown-in-menu" type="as">
       <default context="shown-in-menu" l10n="messages">[ 'ISO-8859-15' ]</default>
       <summary>Encodings shown in menu</summary>
       <description>List of encodings shown in the Character Encoding menu in open/save file selector. Only recognized encodings are used.</description>
     </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state" path="/org/x/editor/state/">
+    <child name="window" schema="org.x.editor.state.window"/>
+    <child name="file-filter" schema="org.x.editor.state.file-filter"/>
+    <child name="history-entry" schema="org.x.editor.state.history-entry"/>
+  </schema>
+
+  <schema id="org.x.editor.state.window" path="/org/x/editor/state/window/">
+
+    <key name="state" type="i">
+      <default>0</default>
+    </key>
+
+    <key name="size" type="(ii)">
+      <default>(650,500)</default>
+    </key>
+
+    <key name="side-panel-size" type="i">
+      <default>200</default>
+    </key>
+
+    <key name="side-panel-active-page" type="i">
+      <default>0</default>
+    </key>
+
+    <key name="bottom-panel-size" type="i">
+      <default>140</default>
+    </key>
+
+    <key name="bottom-panel-active-page" type="i">
+      <default>0</default>
+    </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state.file-filter" path="/org/x/editor/state/file-filter/">
+
+    <key name="filter-id" type="i">
+      <default>0</default>
+    </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state.history-entry" path="/org/x/editor/state/history-entry/">
+
     <key name="history-search-for" type="as">
       <default>[]</default>
       <summary>History for "search for" entries</summary>
       <description>List of entries in "search for" textbox.</description>
     </key>
+
     <key name="history-replace-with" type="as">
       <default>[]</default>
       <summary>History for "replace with" entries</summary>
       <description>List of entries in "replace with" textbox.</description>
     </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.plugins" path="/org/x/editor/plugins/">
+
     <key name="active-plugins" type="as">
-      <default>[ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time' ]</default>
+      <default>[ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time', 'bracketcompletion' ]</default>
       <summary>Active plugins</summary>
       <description>List of active plugins. It contains the "Location" of the active plugins. See the .xed-plugin file for obtaining the "Location" of a given plugin.</description>
     </key>
+
   </schema>
+
 </schemalist>

data/org.x.editor.service.in

@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.x.editor
+Exec=@bindir@/xed

data/xed-bugreport.sh.in

@@ -1,73 +0,0 @@
-#!/bin/sh
-
-ENABLE_PYTHON=@enable_python@
-
-PKG_CONFIG_MODULES="glib-2.0 gtk+-2.0 gtksourceview-2.0 \
-		    pygobject-2.0 pygtk-2.0 \
-		    pygtksourceview-2.0 enchant iso-codes"
-
-echo_padded ()
-{
-	echo -n "  - $1 "
-	N=$(echo -n $1 | wc -m)
-	while test $N -le 20
-	do
-		echo -n " "
-		N=`expr $N + 1`
-	done
-}
-
-if (which gsettings >/dev/null)
-then
-	echo "GSettings configuration dump:"
-	gsettings list-recursively org.x.editor
-	echo
-fi
-
-echo "Active plugins:"
-gsettings get org.x.editor active-plugins 				\
-	| sed -r -e 's/^\[(.*)\]$/\1/' -e 's/, /\n/g'			\
-	| sed -e 's/^.*$/  - \0/'
-echo
-
-# Manually installed plugins (in $HOME)
-if [ -d $HOME/.config/xed/plugins ]
-then
-	echo "Plugins in \$HOME:"
-	ls $HOME/.config/xed/plugins/*.xed-plugin			\
-		| sed -r -e 's#.*/([^/]*)\.xed-plugin$#  - \1#'
-else
-	echo "No plugin installed in \$HOME."
-fi
-echo
-
-echo "Module versions:"
-if (which pkg-config > /dev/null)
-then
-	for i in $PKG_CONFIG_MODULES
-	do
-		echo_padded "`echo -n $i | sed -r -e 's/^(.*)-[0-9]\.[0-9]$/\1/'`"
-		pkg-config --modversion $i 2>/dev/null || echo
-	done
-else
-	echo "  pkg-config unavailable"
-fi
-echo
-
-echo "Python module versions:"
-if test "$ENABLE_PYTHON" = "yes"
-then
-	echo_padded "python"
-	python -V 2>&1 | cut -c8-
-
-	echo_padded "pygtk"
-	python -c "import gtk, sys; \
-		   sys.stdout.write('%d.%d.%d ' % gtk.pygtk_version); \
-		   sys.stdout.write('(GTK+ %d.%d.%d)' % gtk.gtk_version)" \
-		   2>/dev/null
-	echo
-else
-	echo "  Python support was not enabled at compile time."
-fi
-echo
-

data/xed.1

@@ -42,6 +42,9 @@ Output version information and exit
 \fB\-?, \-h, \-\-help\fR
 Print standard command line options.
 .TP
+\fB\-w, \-\-wait\fR
+Open files and block the xed process.
+.TP
 \fB\-\-help\-all\fR
 Print all command line options.
 .P

data/xed.desktop.in.in

@@ -8,5 +8,10 @@ StartupNotify=true
 MimeType=text/plain;
 Icon=accessories-text-editor
 Categories=GTK;Utility;TextEditor;
-Keywords=text;editor;tabs;highlighting;code;multiple;files;pluggable;
+Keywords=text;editor;tabs;highlighting;code;multiple;files;pluggable;notepad;
 X-MATE-DocPath=xed/xed.xml
+Actions=new-window;
+
+[Desktop Action new-window]
+Name=New Window
+Exec=xed --new-window %U

data/xed.pc.in

@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-pluginsdir=@libdir@/xed/plugins
-
-Name: xed
-Description: xed
-Requires: gtksourceview-@GTK_API_VERSION@
-Version: @VERSION@
-Cflags: -I${includedir}/xed
-Libs: -L${libdir}

debian/changelog

@@ -1,3 +1,726 @@
+xed (3.0.0) uma; urgency=medium
+
+  [ Talkashie ]
+  * Fix various typos in index.docbook
+
+  [ Soapux ]
+  * Fix permissions
+
+  [ okaestne ]
+  * Implement #225: Options to render whitespace
+
+  [ Michael Webster ]
+  * i18n: Don't translate gsettings strings.
+
+  [ okaestne ]
+  * Fix crashes when no documents (tabs) are open
+
+  [ Justin Schiff ]
+  * Uses strtol instead of atoi so that we can properly handle errors.
+  * Use CLAMP macro instead
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 01 Jun 2021 12:56:22 +0100
+
+xed (2.8.4) ulyssa; urgency=medium
+
+  [ Eli Schwartz ]
+  * fixup! cleanup: remove code dropped in commit 67892da099357e24b3fd3c31fa758947b1dfc47a
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 02 Jan 2021 17:33:30 +0000
+
+xed (2.8.3) ulyssa; urgency=medium
+
+  * Packaging: Add missing dependency on gir1.2-gtksource-4
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 14 Dec 2020 08:11:29 +0000
+
+xed (2.8.2) ulyssa; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 10 Dec 2020 12:14:34 +0000
+
+xed (2.8.1) ulyssa; urgency=medium
+
+  [ Eli Schwartz ]
+  * cleanup: remove code dropped in commit 67892da099357e24b3fd3c31fa758947b1dfc47a
+  * remove never-used variable added in commit 9e805380d4aa6338ca1b85d06b5dbf60e9fb0cbe
+
+  [ Clement Lefebvre ]
+  * bracketcompletion: Enable plugin by default
+  * Remove links in plugin about dialogs
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 08 Dec 2020 10:11:12 +0000
+
+xed (2.8.0) ulyssa; urgency=medium
+
+  [ JosephMcc ]
+  * Port to Gtksourceview4
+  * Add a new window desktop action
+  * plugins: Clean up deprecated preprcessor commands
+  * Clean up remaining deprecated preprocessor commands
+  * xed-highlight-mode-selector.c: Fix a couple of missing casts
+  * textsize plugin: Zoom text regardless of selection
+  * xed-highlight-mode-dialog/selector: Clean up code style
+  * xed-completion-plugin.c: Clean up the code style
+
+  [ Hrutvik Suthar ]
+  * auto bracket complete feature   - added bracket-complete dir in plugins   - gtksourceview min depedency change to 4.0.3
+
+  [ Michael Webster ]
+  * Add XAppFavorites support to the file menu.
+  * meson.build: bump xapp version.
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 30 Nov 2020 11:25:34 +0000
+
+xed (2.6.2) ulyana; urgency=medium
+
+  * CI: Update targets
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 24 Jun 2020 12:44:58 +0100
+
+xed (2.6.1) ulyana; urgency=medium
+
+  [ NikoKrause ]
+  * l10n: add missing strings for new plugin joinlines (#385)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 24 Jun 2020 12:06:37 +0100
+
+xed (2.6.0) ulyana; urgency=medium
+
+  [ Stephen Collins ]
+  * Disable the comments action when not supported to avoid confusion
+  * Trailsave plugin: remove second trailing line
+  * xed-tab-label.c: remove unused event box preventing scroll events
+
+  [ Michael Webster ]
+  * xed-tab-label.c: Apply tab tooltip to the box containing the tab's label and icon, regression from 808e77b052322b8f.
+
+  [ Stephen Collins ]
+  * Add .gitignore file
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+  [ Stephen Collins ]
+  * Add settings widget to the prefs dialog for the implicit newline setting
+
+  [ icarter09 ]
+  * Created initial test dir. Created File menu test.
+  * Removed override_dh_auto_test so tests are not ran by default when building with dpkg.
+  * Removed link that was not working.
+  * Created new section for the Word Wrap shortcut. Increased height attribute to fit new section so a new page is not created.
+  * Added logic to support using replace all across documents.
+  * Added logic to check if the focus need to be set. Squashed formatting commits.
+
+  [ Clement Lefebvre ]
+  * Packaging: Remove python dependency
+
+  [ Isaac Carter ]
+  * Fixed memory issue found by valgrind (#366)
+
+  [ icarter09 ]
+  * Cleaned up broken links.
+  * Changed shortcut window to be non-model.
+  * Added wait entry to man page. Removed logic that cause wait to open extra tab.
+  * Added screen captures to README. Changed README to README.md and added markdown. Updated README with plugins and debian build instructions.
+
+  [ Isaac Carter ]
+  * Update README.md
+
+  [ icarter09 ]
+  * Added JoinLines plugin. Removed logic to split lines. Moved Join Line shortcut from Layout to Editing section.
+
+  [ JosephMcc ]
+  * taglist: Use a symbolic icon in the notebook sidebar
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 11 May 2020 13:58:58 +0100
+
+xed (2.4.2) tricia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 11 Dec 2019 14:49:32 +0000
+
+xed (2.4.1) tricia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 26 Nov 2019 17:14:23 +0000
+
+xed (2.4.0) tricia; urgency=medium
+
+  [ Michael Webster ]
+  * print-preview: add a print button to the preview toolbar, to immediately print the previewed document.
+
+  [ nardholio ]
+  * Packaging: remove dependency on libpeas-1.0-0-python3loader (#325)
+
+  [ Pavel Shlyak ]
+  * Cleanup (#321)
+
+  [ Leigh Scott ]
+  * add open uri plugin (#317)
+
+  [ Clement Lefebvre ]
+  * open-uri: Make the plugin built-in
+  * open-uri: Simplify and fix translations
+  * Print preview: Reuse existing msgid
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 22 Nov 2019 12:12:12 +0000
+
+xed (2.2.3) tina; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun, 28 Jul 2019 15:03:33 +0200
+
+xed (2.2.2) tina; urgency=medium
+
+  * Preferences: Make dialog slightly taller
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 25 Jul 2019 10:59:55 +0200
+
+xed (2.2.1) tina; urgency=medium
+
+  [ Alexander Drozdov ]
+  * Automatically open new Xed window on current workspace... (#319)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 10 Jul 2019 11:26:12 +0200
+
+xed (2.2.0) tina; urgency=medium
+
+  [ Eli Schwartz ]
+  * meson: require itstool command to be available (#266)
+
+  [ JosephMcc ]
+  * statusbar: Fix the menu button styling (#281)
+  * cleanup: Remove an unused Makefile.am (#280)
+
+  [ Stephen Collins ]
+  * print preview: fix layout drawing for 1X2 and 2X1 layouts (#291)
+  * Filebrowser: Kill the click policy property with fire (#293)
+
+  [ JosephMcc ]
+  * xed-window: Fix the tabs/spaces label in the statusbar (#283)
+  * xed-notebook: Always show the main notebook tabs (#285)
+
+  [ Stephen Collins ]
+  * Fix some deprecation warnings (#289)
+  * print preview: fix logic for forward button sensitivity (#292)
+  * Add toggle comment and toggle comment block actions w/ keybindings (#290)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+  [ Stephen Collins ]
+  * print job: replace some deprecated font button functions (#294)
+  * Replace deprecated gdk_cursor_new with gdk_cursor_new_for_display (#295)
+  * Print preview: remove a couple calls to gtk_adjustment_value_changed (#296)
+  * Search: replace a few functions that were deprecated in Gtk 3.22 (#297)
+  * Fix stuttering and disappearing of the toolbar when fullscreen (#300)
+  * Switch deprecated gtk_icon_info_free to g_object_unref (#301)
+  * Remove references to deprecated GTK_STOCK_* (#298)
+  * Remove deprecated call to gtk_widget_override_background_color (#299)
+  * Tab width popup: only select a menu item when the menu is open (#311)
+  * Simplify an if statement. The logic is identical, but easier to read (#314)
+
+  [ Leigh Scott ]
+  * Add minimum required version for xapp (#313)
+
+  [ Stephen Collins ]
+  * Prevent a warning when closing the window while print preview is open (#315)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 29 Jun 2019 17:23:48 +0200
+
+xed (2.0.2) tessa; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Fix non-translated desktop file
+
+  [ Michael Webster ]
+  * highlight mode window:  Make activatable via shortcut (ctrl-shift-H), focus the search entry by default, and allow Escape to cancel the dialog from the search entry.
+
+  [ chingyinwan123 ]
+  * Fix warnings when building xed 2.0.1 (#264)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 11 Dec 2018 14:10:08 +0000
+
+xed (2.0.1) tessa; urgency=medium
+
+  [ Leigh Scott ]
+  * Switch build instructions for meson port. (#263)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 27 Nov 2018 18:33:21 +0000
+
+xed (2.0.0) tessa; urgency=medium
+
+  [ Tomasz Gąsior ]
+  * Import GeditHighlightModeDialog and -Selector from Gedit to Xed.
+  * Use highlight dialog instead submenu in "View" menu.
+  * XedWindow cleanup.
+  * Import GeditStatusMenuButton.
+  * Fix compilation warning.
+  * Use popover with highlight selector instead loooong menu in statusbar.
+  * Use XedStatusMenuButton instead -ComboBox in statusbar, for consistency.
+  * Kill XedStatusComboBox. It's not used now.
+
+  [ JosephMcc ]
+  * xed-window: Indicate if we are currently using spaces or tabs in statusbar (#246)
+
+  [ NikoKrause ]
+  * Use icon for keyboard shortcuts help entry (#255)
+  * Rearrange help entries (xapp consistency) (#256)
+  * close dialog: use "suggested-action" style class (#261)
+
+  [ Stephen Collins ]
+  * Port to meson (#258)
+
+  [ Clement Lefebvre ]
+  * Fix merge issues
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 19 Nov 2018 11:34:46 +0000
+
+xed (1.8.3) tara; urgency=medium
+
+  [ Michael Webster ]
+  * search bar/xed-history-entry: Set a 'width-chars' on the GtkEntry widgets of the search and replace entry widgets, and allow their labels to ellipsize upon resizing.
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 17 Jul 2018 09:32:59 +0200
+
+xed (1.8.2) tara; urgency=medium
+
+  [ NikoKrause ]
+  * missing l10n: Help -> Shortcuts (#229)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 26 Jun 2018 13:21:55 +0200
+
+xed (1.8.1) tara; urgency=medium
+
+  * l10n: Update translations
+  * l10n: Update files
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 22 May 2018 12:53:38 +0100
+
+xed (1.8.0) tara; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Add CI configuration
+
+  [ Leigh Scott ]
+  * Fix clang compile issue (#209)
+  * Fix Py*DeprecationWarning (#202)
+
+  [ JosephMcc ]
+  * Pull upstream fixes for gtk and gtksourceview changes
+  * preferences-dialog: Complete revamp
+  * xed-window: Rework the fullscreen toolbar
+  * xed-status-combo-box: Remove some deprecated css functionality
+  * xed-view-frame: Fix the css for the minimap frame
+  * xed-notebook: Clean up some gtk3.20+ conditionals
+  * Add a shortcuts window
+  * xed-view: Add shortcuts for change case
+  * debian: Add --enable-silent-rules to debian/rules
+  * css: Add support for Adwaita
+  * xed-searchbar: Fix the size of the searchbar close button
+  * xed-spell-checker.c: Clean up the code formatting
+  * spell-plugin: Update for removal of some deprecated functionality
+  * xed-notebook: Allow changing tabs with mouse back/forward buttons
+  * Fix a couple of issues turned up by Codacy
+  * Clean up a few build warnings
+  * spell-plugin: Port to gspell
+  * spell-plugin: Fix a link to the help file
+
+  [ Nic ]
+  * Add C tags to the taglist plugin (#188)
+
+  [ Clement Lefebvre ]
+  * CI: Don't build for Mint 18
+
+  [ JosephMcc ]
+  * xed-window: Fix a potential crash
+
+  [ Mickael Albertus ]
+  * Creation of plugin Word completion (#199)
+
+  [ Clement Lefebvre ]
+  * Wordcompletion: Fix a few mgsids
+  * l10n: Update POT file
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun, 06 May 2018 16:43:18 +0100
+
+xed (1.6.3) sylvia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 23 Nov 2017 12:24:36 +0000
+
+xed (1.6.2) sylvia; urgency=medium
+
+  [ JosephMcc ]
+  * xed-status-combo-box: Simplify the widget heirarchy (#185)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 17 Nov 2017 10:42:21 +0000
+
+xed (1.6.1) sylvia; urgency=medium
+
+  * l10n: Fix localization in TextSize plugin
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 15 Nov 2017 13:11:20 +0000
+
+xed (1.6.0) sylvia; urgency=medium
+
+  [ JosephMcc ]
+  * translations: Add the textsize plugin to POTFILES.in (#151)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+
+  [ JosephMcc ]
+  * text zoom: Put a limit on the min and max zoom (#137)
+
+  [ Gavin D. Howard ]
+  * Make the trailsave plugin also strip trailing lines (#135)
+
+  [ JosephMcc ]
+  * Don't present users with the hidden highlight languages (#167)
+  * xed-view: Fix a crash when right clicking the left gutter (#166)
+  * Minimap (#175)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 03 Nov 2017 21:13:44 +0000
+
+xed (1.4.6) sonya; urgency=medium
+
+  [ githpr ]
+  * Use correct value to save the window state in gsettings. (#147)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 15 Jul 2017 21:37:18 +0200
+
+xed (1.4.5) sonya; urgency=medium
+
+  [ JosephMcc ]
+  * Create ISSUE_TEMPLATE.md
+
+  [ Clement Lefebvre ]
+  * Packaging: Remove dependency on libpeas-1.0-0-python3loader in LMDE
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 04 Jul 2017 13:11:46 +0200
+
+xed (1.4.4) sonya; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 28 Jun 2017 10:11:34 +0200
+
+xed (1.4.3) sonya; urgency=medium
+
+  [ Mike Krüger ]
+  * bugfix: ugly white border (gtk 3.20>) (#128)
+
+  [ JosephMcc ]
+  * filebrowser: Change an icon name (#132)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 20 Jun 2017 15:22:10 +0200
+
+xed (1.4.2) sonya; urgency=medium
+
+  [ leigh123linux ]
+  * fix gtksourceprintcompositor.h includes warning (#117)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 23 May 2017 13:35:28 +0100
+
+xed (1.4.1) sonya; urgency=medium
+
+  * Depend on gtksourceview-3.0 >= 3.14.0
+  * Only use gtk_text_view_set_top_margin() with GTK 3.18+
+  * Packaging: Change description
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 06 May 2017 14:57:27 +0100
+
+xed (1.4.0) sonya; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Search: Don't jump to the next result when toggling search options
+
+  [ JosephMcc ]
+  * close-confirmation-dialog: Clean up code styling
+  * close-confirmation-dialog: Clean up some deprecations
+  * xed-encodings-dialog: Clean up code styling
+  * xed-encodings-dialog: Clean up some deprecations
+  * xed-encodings-combo-box: Clean up code styling
+  * xed-commands-file: Clean up code styling
+  * xed-commands-file: Clean up deprecations
+  * xed-app: Clean up code styling
+  * xed-app: Remove an unused variable
+  * xed-commands-search: Fix some missing casts
+  * xed-document: Clean up code style
+  * xed-document: Remove use of deprecated gdk_color_parse
+  * xed-documents-panel: Cleanup code styling
+  * xed-documents-panel: Remove an unused variable
+  * xed-message-bus: Clean up code styling
+  * xed-message-bus: Clean up an unused variables
+  * xed-io-error-message-area: Clean up code styling
+  * xed-io-error-message-area: Fix up some deprecations
+  * xed-panel: Clean up code formatting
+  * plugins: Drop support for old style python plugins
+  * build: Clean up a bit more of the gtk2 and --enable-python leftovers
+  * build GObject introspection data
+  * Fix some introspection warnings
+  * Remove a couple of invalid annotations
+  * xed-window: Remove an unused function
+  * Drop some leftover 2.xx comments from gnome/pluma
+  * Port plugin system to libpeas
+  * changecase-plugin: Port to libpeas
+  * docinfo-plugin: Port to libpeas
+  * filebrowser-plugin: Port to libpeas
+  * modelines-plugin: Port to libpeas
+  * sort-plugin: Port to libpeas
+  * spell-plugin: Port to libpeas
+  * taglist-plugin: Port to libpeas
+  * time-plugin: Port to libpeas
+  * trailsave-plugin: Port to libpeas
+  * plugins: Make them actually recognized and loaded by Xed
+  * Remove old plugin system and docs for it
+  * enable dh_girepository helper to fill ${gir:Depends} properly
+  * taglist plugin: don't look for taglist in non-existing legacy dirs
+  * xed-panel: Clean up the layout of the panels
+  * xed-sort-plugin.c: Clean up code styling
+  * Add buttons to the statusbar to show/hide the panels
+  * xed-window: Stop using deprecated (v/h)box
+  * xed-panel: Remove the header and close button
+  * xed-panel: Simplify panel building a bit
+  * xed-panel: Move the notebook tabs to the top
+  * Add a few style classes
+  * xed-statusbar: Clean up the styling a bit
+  * Add view menu entry for word wrap
+  * preferences-dialog: Clean up code styling
+  * preferences-dialog: Clean up uses of GtkStock
+  * Allow scrolling on notebook tabs to change the active page
+  * xed-prefs-manager-app: Remove some leftover logging
+  * xed-notebook.c: Clean up the code formatting
+  * xed-pref-manager-app.c: Clean up code style
+  * xed-prefs-manager-app.c: Clean up an unused variable
+  * notebooks: Don't show tabs when the notebook only has one page
+  * xed-window.c: Fix a few missing casts
+  * xed-utils: Clean up code styling
+  * xed-utils.h: Clean up code styling
+  * xed-utils: Remove a couple functions
+  * xed-panel: Clean up more uses of GtkStock
+  * xed-panel.c: Add a couple of missing casts
+  * xed-status-combo-box: Don't use deprecated GtkArrow
+  * xed-status-combo-box.c: Clean up some code styling
+  * xed-tab.c: Clean up code style
+  * xed-tab: Clean up some uses of GtkStock
+  * xed-window: Use a better icon for the documents panel tab
+  * xed-print-preview.c: Clean up code styling
+  * xed-print-preview.c: Restyle the toolbar
+  * xed-print-preview.c: Don't you deprecated gtk_layout_get_*adjustment
+  * xed-progress-message-area.c: Clean up code style
+  * xed-progress-message-area: Clean up more uses of GtkStock
+  * Install introspection data and lib into a private dir
+  * Add new (App/Window/View)Activatable interfaces for plugins
+  * docinfo-plugin: Update for WindowActivatable changes
+  * sort-plugin: Port the sort plugin to WindowActivatable
+  * spell-plugin: Update to the new WindowActivatable interface
+  * time-plugin: Port to WindowActivatable
+  * changecase-plugin: Port to WindowActivatable
+  * taglist-plugin: Port to WindowActivatable
+  * trailsave-plugin: Port to WindowActivatable
+  * time-plugin: Clean up a bit from libpeas port
+  * spell-plugin: Clean up a few things
+  * Clean up uses of deprecated GtkMisc
+  * xed-tab-label.c/h: Clean up code styling
+  * xed-file-dialog.c/h: Clean up code styling
+  * xed-statusbar.c/h: Clean up code styling
+  * xed-statusbar: Fix a missing cast
+  * xed-searchbar: Add a couple missing casts and remove an unused variable
+  * xed-searchbar.c/h: Clean up styling a bit
+  * Port to the use of GFile instead of URIs and merge gio document loader and saver into document loader and saver
+  * Revamp our handling of settings
+  * Clean up the docs a bit
+  * Redesign the goto line popup dialog
+  * xed-preferences-dialog: Fix a setting having the wrong sensitiviy
+  * tests: Fix to use GFile instead of uris
+  * xed-document-output-stream: Clean up code style
+  * xed-document-output-stream: Clean up code style
+  * Merge smart converter in the document output stream
+  * xed-document-output-stream: Factor out validate_and_insert method
+  * Pull some upstream changes from Gedit in prep for using more of the GtkSource* backend
+  * Remove the xed style scheme manager instance
+  * xed-document: Fix a couple of possible memory leaks
+  * Kill xed-language-manager and use gtksourcelanguagemanager directly
+  * xed-document: Rework externally modified/deleted check
+  * Remove xed_utils_location_has_file_scheme
+  * Clean up our GSettings use a bit more
+  * Port to the GtkSourceView search functionality
+  * Add _xed_document_needs_saving
+  * Plugins: Remove the changecase plugin
+  * xed-document: Do some cleanup
+  * Port to GtkSource* API
+  * Port xed to dbus and GtkApplication
+  * message-area: Rename message area to info bar
+  * info-bars: Don't use deprecated gtk_misc
+  * info-bars: Don't use deprecated GtkStock
+  * info-bar: Don't use icons in buttons
+  * xed-progress-info-bar: Properly expand the progress bar
+  * Don't use deprecated gtk_widget_set margin_left/right
+  * Remove the dialog utility library
+  * Start using GResource
+  * Set textdomain as soon as possible
+  * Don't use global vars for command line parsing
+  * xed-app: Handle also application::open
+  * xed-app: Shutdown metadata-manager after GTK+
+  * xed-app: Fix a typo
+  * xed-window: Fix getting the wrong window size when cloning a window
+  * Add a preference to allow using the dark variant of a theme if available
+  * Debian: Bring back the xed-doc package
+  * xed-view: Add some margin to the top and left of the text view
+  * Makefile: Forgot to git add changes
+  * debian: Add a dependency on xapps-common
+  * prefs-dialog: Fix a crash when removing style schemes
+  * docs: Start cleaning up the docs
+  * Implement font zooming in the editor
+  * Sort: Turn sort into a simpler and undoable action
+  * Focus view when opening files from the filebrowser or documents panel
+  * Fix g_free which should be g_object_unref in file browser
+  * Use slice allocator instead of g_new when appropriate
+  * xed-file-browser-widget: Clean up code styling
+  * filebrowser-view: Removed the unused "busy" cursor
+  * Do not leak file info for . and .. dirs
+  * filebrowser: Unref the enumerator in the filebrowser plugin
+  * file-browser-messages: Clean up formatting
+  * filebrowser: Don't leak GFiles
+  * filebrowser: Fix crash on open_terminal action
+  * filebrowser: Remove the back and forward toolbar dropdowns
+  * filebrowser: Support new location of gtk bookmarks file
+  * xed-file-browser-utils.c: Clean up code style
+  * filebrowser: "Rename" menu entry should have an ellipsis
+  * filebrowser: use Untitled File/Folder for new file/folders
+  * filebrowser: don't use deprecated GIOScheduler
+  * filebrowser: Redesign the toolbar in filebrowser
+  * filebrowser: Activate selected item when search is complete
+  * filebrowser: Don't use deprecated GtkStock
+  * filebrowser: Do not parse .hidden in the file browser
+  * filebrowser: Make the "Open terminal here" command work again
+  * filebrowser: Set the combobox insensitive when the bookmarks are showing
+  * build: Fix the python3 dependency
+  * Actually fix the python dependency
+  * Fix calling set_command_line_wait()
+  * Allow building with --disable-spell
+  * debian: Add dependency on libpeas-1.0-0-python3loader
+  * Focus a tab when attempting to close it with unsaved changes
+  * Add a new animated xed-paned
+  * xed-commands-view: Clean up code style
+  * time-plugin: Use GDateTime
+  * xed-utils: Add runtime checks for x11 specific functions
+
+  [ leigh123linux ]
+  * Fix FSF address
+
+  [ JosephMcc ]
+  * Use GtkApplication inhibit API
+
+  [ Clement Lefebvre ]
+  * Fix po/POTFILES.in and generate POT file
+  * Fix "gedit" occurence
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 05 May 2017 08:38:39 +0100
+
+xed (1.2.2) serena; urgency=medium
+
+  [ JosephMcc ]
+  * searchbar: Add a close button
+  * searchbar: Make sure we clear highlighting when the last character is removed
+
+  [ Clement Lefebvre ]
+  * Search: Fix search jumping to next result while typing
+  * Search: Perform a search when case-sensitive or entire-word buttons are clicked
+  * l10n: Add missing pot file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 12 Dec 2016 12:43:35 +0000
+
+xed (1.2.1) serena; urgency=medium
+
+  * l10n: Improve some of the new msgids
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 10 Nov 2016 00:36:06 +0000
+
+xed (1.2.0) serena; urgency=medium
+
+  [ JosephMcc ]
+  * configure: Don't require passing --with-gtk=3.0 to build
+
+  [ Clement Lefebvre ]
+  * Fixed NEWS files
+  * Add "notepad" to the list of menu item keywords
+  * Fixed some UI elements not localized
+  * Makepot
+  * Revert "Makepot"
+  * Revert "Fixed some UI elements not localized"
+  * When running as root, add an infobar to warn about Elevated Privileges
+  * Toolbar: Don't emphasize toolbar items (save, open, undo)
+  * Give Xed a Sublime-like searchbar
+  * Reformated code to conform to Mint coding style
+  * Default Settings: Changed line width to 120 chars and enabled "insert-spaces".
+
+  [ JosephMcc ]
+  * toolbar: Revamp the main toolbar style
+  * ui: Convert the remaining actions to use symbolic icons
+  * prefs: Remove now unused toolbar style prefs
+  * ui: Don't hide the main notebook tabs in fullscreen
+  * xed-close-button: Convert to using a symbolic icon
+  * filbrowser-plugin: Convert indentation to spaces and remove extra whitespace
+  * filebrowser-plugin: Convert most icons to symbolic icons
+
+  [ Clement Lefebvre ]
+  * Update pot file
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 02 Nov 2016 15:55:04 +0000
+
 xed (1.0.6) sarah; urgency=medium
 
   [ Michael Webster ]

debian/clean

@@ -0,0 +1 @@
+debian/build/

debian/control

@@ -2,20 +2,25 @@ Source: xed
 Section: x11
 Priority: optional
 Maintainer: Linux Mint <root@linuxmint.com>
-Build-Depends: autotools-dev,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
+               gobject-introspection,
                gtk-doc-tools,
                intltool,
-               iso-codes,
-               libenchant-dev,
+               libgirepository1.0-dev,
                libglib2.0-dev,
+               libgspell-1-dev,
                libgtk-3-dev,
-               libgtksourceview-3.0-dev,
+               libgtksourceview-4-dev,
+               libpeas-dev,
+               libxapp-dev (>= 1.9),
                libsm-dev,
                libx11-dev,
                libxml2-dev,
                gnome-common,
+               python3,
+               python3-gi,
                yelp-tools,
+               meson
 Standards-Version: 3.9.6
 
 Package: xed
@@ -25,9 +30,13 @@ Depends: iso-codes,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
+         python3,
+         python3-gi,
+         gir1.2-gtksource-4,
+         xapps-common (>= 1.9.0),
          zenity
 XB-Python-Version: ${python:Versions}
-Description: generic text editor
+Description: Text editor
  Xed is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
  found in simple text editors. Xed is a graphical application which
@@ -45,9 +54,8 @@ Description: generic text editor
 
 Package: xed-common
 Architecture: all
-Depends: python,
-         ${misc:Depends},
-Description: generic text editor (common files)
+Depends: ${misc:Depends},
+Description: Text editor (common files)
  Xed is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
  found in simple text editors. Xed is a graphical application which
@@ -70,7 +78,7 @@ Architecture: any
 Section: devel
 Depends: xed (= ${binary:Version}),
          ${misc:Depends},
-Description: generic text editor (development files)
+Description: Text editor (development files)
  Xed is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
  found in simple text editors. Xed is a graphical application which
@@ -94,7 +102,7 @@ Priority: extra
 Architecture: any
 Depends: xed (= ${binary:Version}),
          ${misc:Depends},
-Description: generic text editor (debugging symbols)
+Description: Text editor (debugging symbols)
  Xed is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
  found in simple text editors. Xed is a graphical application which
@@ -120,7 +128,7 @@ Package: xed-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-Description: generic text editor (documentation files)
+Description: Text editor (documentation files)
  Xed is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
  found in simple text editors. Xed is a graphical application which

debian/copyright

@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: xed (old name: mate-text-editor)
-Upstream-Contact: Stefano Karapetsas <stefano@karapetsas.com>
-Source: http://git.mate-desktop.org/xed/
+Upstream-Name: xed
+Upstream-Contact: Linux Mint <root@linuxmint.com>
+Source: http://github.com/linuxmint/xed/
 
 Files: plugins/docinfo/xed-docinfo-plugin.c
        plugins/docinfo/xed-docinfo-plugin.h

debian/rules

@@ -3,31 +3,27 @@
 DHFLAGS=--parallel
 
 %:
-	dh $@ $(DHFLAGS)
-
-override_dh_install:
-	rm -rfv debian/tmp/usr/lib/*/xed/plugin-loaders/*.la
-	rm -rfv debian/tmp/usr/lib/*/xed/plugins/*.la
-	dh_install --fail-missing
+	dh $@ $(DHFLAGS) --with gir
 
 override_dh_auto_configure:
-	# upstream tarball is without configure. autogen.sh will create it
-	NOCONFIGURE=1 ./autogen.sh
-	dh_auto_configure $(DHFLAGS) -- \
-		--disable-silent-rules \
-		--libexecdir=/usr/lib/ \
-		--disable-python \
-		--enable-gtk-doc \
-		--with-gtk=3.0
+	meson debian/build \
+		--prefix=/usr \
+		--buildtype=plain \
+		-D docs=true \
+		-D deprecated_warnings=false
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-override_dh_auto_test:
-	DEB_BUILD_OPTIONS=nocheck dh_auto_test
-
 override_dh_strip:
 	dh_strip --dbg-package=xed-dbg
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..
+
+override_dh_auto_install:
+	DESTDIR=${CURDIR}/debian/tmp \
+	ninja -C debian/build install
+
+override_dh_auto_build:
+	ninja -C debian/build

debian/xed-common.install

@@ -1,7 +1,6 @@
-usr/share/appdata/
-usr/share/glib-2.0/
-usr/share/help/
-usr/share/locale/
-usr/share/xed/icons/
-usr/share/xed/plugins/
-usr/share/xed/ui/
+usr/share/metainfo
+usr/share/xed/plugins
+usr/share/glib-2.0
+usr/share/help
+usr/share/locale
+usr/share/xed/icons

debian/xed-dev.install

@@ -1,2 +1,3 @@
-usr/include/xed/
+usr/include
 usr/lib/*/pkgconfig/
+usr/share/xed/gir-1.0

debian/xed-doc.install

@@ -1 +1 @@
-usr/share/gtk-doc/
+usr/share/gtk-doc

debian/xed.install

@@ -1,6 +1,7 @@
-usr/bin/
-usr/lib/*/xed/plugin-loaders/*.so
+usr/bin/xed
+usr/lib/*/xed/girepository-1.0/
 usr/lib/*/xed/plugins/
-usr/lib/xed/xed-bugreport.sh
-usr/share/applications/
+usr/lib/*/xed/*.so
+usr/share/applications/xed.desktop
+usr/share/dbus-1/
 usr/share/man/

docs/Makefile.am

@@ -1,5 +0,0 @@
-SUBDIRS = reference
-
-EXTRA_DIST = class-diagram.dia
-
--include $(top_srcdir)/git.mk

docs/reference/Makefile.am

@@ -1,119 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# see /gtk-doc/examples/Makefile.am
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=xed
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-DOC_SOURCE_DIR=../../xed
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-HFILE_GLOB=$(top_srcdir)/xed/*.h
-CFILE_GLOB=$(top_srcdir)/xed/*.c
-
-# Header files to ignore when scanning (These are internal to xed).
-IGNORE_HFILES=		\
-	xed-commands.h			\
-	xed-document-loader.h			\
-	xed-document-saver.h			\
-	xed-documents-panel.h			\
-	xed-io-error-message-area.h		\
-	xed-languages-manager.h		\
-	xed-object-module.h			\
-	xed-plugin-manager.h			\
-	xed-plugins-engine.h			\
-	xed-prefs-manager-private.h		\
-	xed-session.h				\
-	xed-ui.h				\
-	xed-window-private.h			\
-	xed-output-window.h			\
-	xed-close-confirmation-dialog.h	\
-	xed-encodings-dialog.h		\
-	xed-open-location-dialog.h		\
-	xed-page-setup-dialog.h		\
-	xed-preferences-dialog.h		\
-	xed-search-dialog.h			\
-	xed-marshal.h				\
-	xed-enum-types.h
-
-# These files are not part of xed but were copied into it for some reason.
-# Do not parse them to make the docs.
-IGNORE_HFILES +=	\
-	bacon-message-connection.h		\
-	xedtextregion.h			\
-	sexy-icon-entry.h
-
-# Images to copy into HTML directory.
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-GTKDOC_CFLAGS=	\
-	-I$(top_srcdir)/xed	\
-	-I$(top_builddir)/xed \
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	$(XED_CFLAGS)
-
-GTKDOC_LIBS=	\
-	$(top_builddir)/xed/libxed.la	\
-	$(XED_LIBS)
-
-if ENABLE_PYTHON
-GTKDOC_CFLAGS += \
-        $(NO_STRICT_ALIASING_CFLAGS)    \
-        $(PYGTK_CFLAGS)                 \
-        $(PYTHON_CFLAGS)                \
-        $(AM_CFLAGS)
-GTKDOC_LIBS += \
-	$(top_builddir)/plugin-loaders/python/bindings/xed.la
-endif
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-
-regenerate-types:
-	grep _get_type $(DOC_SOURCE_DIR)/xed-*.h | grep -oR '^.*\.h' | sort | uniq - | sed -r 's/^.*\.h$/#include "\0"/' > xed.types
-	grep _get_type $(DOC_SOURCE_DIR)/xed-*.h | grep -oR '^.*\.h' | sort | uniq - | sed -re 'y/-/_/' -e 's/^(.*)\.h$/\1_get_type/' >> xed.types.new
-
--include $(top_srcdir)/git.mk

docs/reference/meson.build

@@ -0,0 +1,36 @@
+docs_ignore_h = [
+    'xed-close-confirmation-dialog.h',
+    'xed-dirs.h',
+    'xed-commands.h',
+    'xed-documents-panel.h',
+    'xed-io-error-info-bar.h',
+    'xed-languages-manager.h',
+    'xed-plugins-engine.h',
+    'xed-session.h',
+    'xed-ui.h',
+    'xed-window-private.h',
+    'xed-output-window.h',
+    'xed-encodings-dialog.h',
+    'xed-open-location-dialog.h',
+    'xed-page-setup-dialog.h',
+    'xed-preferences-dialog.h',
+    'xed-search-dialog.h',
+    'xed-marshal.h',
+    'xed-enum-types.h'
+]
+
+gnome.gtkdoc(
+    'xed',
+    mode: 'xml',
+    install: true,
+    main_xml: 'xed-docs.xml',
+    gobject_typesfile: 'xed.types',
+    src_dir: [
+        join_paths(meson.source_root(), 'xed'),
+        join_paths(meson.build_root(), 'xed'),
+    ],
+    ignore_headers: docs_ignore_h,
+    dependencies: libxed_dep,
+    scan_args: ['--rebuild-types'],
+    mkdb_args: ['--xml-mode', '--output-format=xml'],
+)

docs/reference/xed-docs.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
@@ -9,29 +9,39 @@
   <chapter>
     <title>xed</title>
     <xi:include href="xml/xed-app.xml"/>
+    <xi:include href="xml/xed-app-activatable.xml"/>
     <xi:include href="xml/xed-document.xml"/>
-    <xi:include href="xml/xed-encodings-option-menu.xml"/>
+    <xi:include href="xml/xed-encodings-combo-box.xml"/>
     <xi:include href="xml/xed-file-chooser-dialog.xml"/>
     <xi:include href="xml/xed-message-bus.xml"/>
     <xi:include href="xml/xed-message-type.xml"/>
     <xi:include href="xml/xed-message.xml"/>
     <xi:include href="xml/xed-notebook.xml"/>
     <xi:include href="xml/xed-panel.xml"/>
-    <xi:include href="xml/xed-plugin.xml"/>
     <xi:include href="xml/xed-print-job-preview.xml"/>
-    <xi:include href="xml/xed-print.xml"/>
-    <xi:include href="xml/xed-progress-message-area.xml"/>
+    <xi:include href="xml/xed-print-job.xml"/>
+    <xi:include href="xml/xed-progress-info-bar.xml"/>
     <xi:include href="xml/xed-statusbar.xml"/>
     <xi:include href="xml/xed-tab.xml"/>
     <xi:include href="xml/xed-view.xml"/>
+    <xi:include href="xml/xed-view-activatable.xml"/>
     <xi:include href="xml/xed-window.xml"/>
     <xi:include href="xml/xed-convert.xml"/>
     <xi:include href="xml/xed-debug.xml"/>
-    <xi:include href="xml/xed-encodings.xml"/>
     <xi:include href="xml/xed-help.xml"/>
-    <xi:include href="xml/xed-metadata-manager.xml"/>
-    <xi:include href="xml/xed-prefs-manager-app.xml"/>
-    <xi:include href="xml/xed-prefs-manager.xml"/>
     <xi:include href="xml/xed-utils.xml"/>
   </chapter>
+
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/xed-sections.txt

@@ -1,14 +1,13 @@
 <SECTION>
 <FILE>xed-app</FILE>
-XedAppPrivate
 <TITLE>XedApp</TITLE>
 XedApp
-xed_app_get_default
 xed_app_create_window
-xed_app_get_windows
-xed_app_get_active_window
+xed_app_set_window_title
+xed_app_get_main_windows
 xed_app_get_documents
 xed_app_get_views
+xed_app_show_help
 <SUBSECTION Standard>
 XED_APP
 XED_IS_APP
@@ -19,45 +18,40 @@ XED_IS_APP_CLASS
 XED_APP_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>xed-app-activatable</FILE>
+<TITLE>XedAppActivatable</TITLE>
+XedAppActivatable
+xed_app_activatable_activate
+xed_app_activatable_deactivate
+<SUBSECTION Standard>
+XED_TYPE_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE_IFACE
+XED_IS_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE_GET_IFACE
+xed_app_activatable_get_type
+</SECTION>
+
 <SECTION>
 <FILE>xed-document</FILE>
-XedSearchFlags
 XedDocumentPrivate
 <TITLE>XedDocument</TITLE>
 XedDocument
-XedDocumentSaveFlags
-XED_DOCUMENT_ERROR
-xed_document_error_quark
 xed_document_new
-xed_document_get_uri
+xed_document_get_file
 xed_document_get_uri_for_display
 xed_document_get_short_name_for_display
+xed_document_set_short_name_for_display
 xed_document_get_mime_type
 xed_document_get_readonly
-xed_document_load
-xed_document_insert_file
-xed_document_load_cancel
-xed_document_save
-xed_document_save_as
 xed_document_is_untouched
 xed_document_is_untitled
 xed_document_get_deleted
 xed_document_goto_line
-xed_document_set_search_text
-xed_document_get_search_text
-xed_document_get_can_search_again
-xed_document_search_forward
-xed_document_search_backward
-xed_document_replace_all
+xed_document_goto_line_offset
 xed_document_set_language
-xed_document_set_enable_search_highlighting
-xed_document_get_enable_search_highlighting
-XED_SEARCH_IS_DONT_SET_FLAGS
-XED_SEARCH_SET_DONT_SET_FLAGS
-XED_SEARCH_IS_ENTIRE_WORD
-XED_SEARCH_SET_ENTIRE_WORD
-XED_SEARCH_IS_CASE_SENSITIVE
-XED_SEARCH_SET_CASE_SENSITIVE
+xed_document_get_metadata
 <SUBSECTION Standard>
 XED_DOCUMENT
 XED_IS_DOCUMENT
@@ -69,21 +63,20 @@ XED_DOCUMENT_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>xed-encodings-option-menu</FILE>
-XedEncodingsOptionMenuPrivate
+<FILE>xed-encodings-combo-box</FILE>
 <TITLE>XedEncodingsOptionMenu</TITLE>
-XedEncodingsOptionMenu
-xed_encodings_option_menu_new
-xed_encodings_option_menu_get_selected_encoding
-xed_encodings_option_menu_set_selected_encoding
+XedEncodingsComboBox
+xed_encodings_combo_box_new
+xed_encodings_combo_box_get_selected_encoding
+xed_encodings_combo_box_set_selected_encoding
 <SUBSECTION Standard>
-XED_ENCODINGS_OPTION_MENU
-XED_IS_ENCODINGS_OPTION_MENU
-XED_TYPE_ENCODINGS_OPTION_MENU
-xed_encodings_option_menu_get_type
-XED_ENCODINGS_OPTION_MENU_CLASS
-XED_IS_ENCODINGS_OPTION_MENU_CLASS
-XED_ENCODINGS_OPTION_MENU_GET_CLASS
+XED_ENCODINGS_COMBO_BOX
+XED_IS_ENCODINGS_COMBO_BOX
+XED_TYPE_ENCODINGS_COMBO_BOX
+xed_encodings_combo_box_get_type
+XED_ENCODINGS_COMBO_BOX_CLASS
+XED_IS_ENCODINGS_COMBO_BOX_CLASS
+XED_ENCODINGS_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -236,30 +229,6 @@ XED_IS_PANEL_CLASS
 XED_PANEL_GET_CLASS
 </SECTION>
 
-<SECTION>
-<FILE>xed-plugin</FILE>
-<TITLE>XedPlugin</TITLE>
-XedPlugin
-xed_plugin_activate
-xed_plugin_deactivate
-xed_plugin_update_ui
-xed_plugin_is_configurable
-xed_plugin_create_configure_dialog
-XED_PLUGIN_REGISTER_TYPE
-<SUBSECTION Standard>
-XED_PLUGIN
-XED_IS_PLUGIN
-XED_TYPE_PLUGIN
-xed_plugin_get_type
-XED_PLUGIN_CLASS
-XED_IS_PLUGIN_CLASS
-XED_PLUGIN_GET_CLASS
-XED_PLUGIN_REGISTER_TYPE_WITH_CODE
-XED_PLUGIN_REGISTER_TYPE
-XED_PLUGIN_DEFINE_TYPE_WITH_CODE
-XED_PLUGIN_DEFINE_TYPE
-</SECTION>
-
 <SECTION>
 <FILE>xed-print-job-preview</FILE>
 XedPrintJobPreviewPrivate
@@ -277,7 +246,7 @@ XED_PRINT_JOB_PREVIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>xed-print</FILE>
+<FILE>xed-print-job</FILE>
 <TITLE>XedPrintJob</TITLE>
 XedPrintJob
 xed_print_job_new
@@ -294,33 +263,30 @@ XED_PRINT_JOB_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>xed-progress-message-area</FILE>
-XedProgressMessageAreaPrivate
-<TITLE>XedProgressMessageArea</TITLE>
-XedProgressMessageArea
-xed_progress_message_area_new
-xed_progress_message_area_set_stock_image
-xed_progress_message_area_set_markup
-xed_progress_message_area_set_text
-xed_progress_message_area_set_fraction
-xed_progress_message_area_pulse
+<FILE>xed-progress-info-bar</FILE>
+<TITLE>XedProgressInfoBar</TITLE>
+XedProgressInfoBar
+xed_progress_info_bar_new
+xed_progress_info_bar_set_icon_name
+xed_progress_info_bar_set_markup
+xed_progress_info_bar_set_text
+xed_progress_info_bar_set_fraction
+xed_progress_info_bar_pulse
 <SUBSECTION Standard>
-XED_PROGRESS_MESSAGE_AREA
-XED_IS_PROGRESS_MESSAGE_AREA
-XED_TYPE_PROGRESS_MESSAGE_AREA
-xed_progress_message_area_get_type
-XED_PROGRESS_MESSAGE_AREA_CLASS
-XED_IS_PROGRESS_MESSAGE_AREA_CLASS
-XED_PROGRESS_MESSAGE_AREA_GET_CLASS
+XED_PROGRESS_INFO_BAR
+XED_IS_PROGRESS_INFO_BAR
+XED_TYPE_PROGRESS_INFO_BAR
+xed_progress_info_bar_get_type
+XED_PROGRESS_INFO_BAR_CLASS
+XED_IS_PROGRESS_INFO_BAR_CLASS
+XED_PROGRESS_INFO_BAR_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>xed-statusbar</FILE>
-XedStatusbarPrivate
 <TITLE>XedStatusbar</TITLE>
 XedStatusbar
 xed_statusbar_new
-XedStatus
 xed_statusbar_set_window_state
 xed_statusbar_set_overwrite
 xed_statusbar_set_cursor_position
@@ -384,6 +350,22 @@ XED_IS_VIEW_CLASS
 XED_VIEW_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>xed-view-activatable</FILE>
+<TITLE>XedViewActivatable</TITLE>
+XedViewActivatable
+xed_view_activatable_activate
+xed_view_activatable_deactivate
+xed_view_activatable_update_state
+<SUBSECTION Standard>
+XED_TYPE_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE_IFACE
+XED_IS_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE_GET_IFACE
+xed_view_activatable_get_type
+</SECTION>
+
 <SECTION>
 <FILE>xed-window</FILE>
 XedWindowState
@@ -391,7 +373,7 @@ XedWindowPrivate
 <TITLE>XedWindow</TITLE>
 XedWindow
 xed_window_create_tab
-xed_window_create_tab_from_uri
+xed_window_create_tab_from_location
 xed_window_close_tab
 xed_window_close_all_tabs
 xed_window_close_tabs
@@ -409,7 +391,6 @@ xed_window_get_statusbar
 xed_window_get_ui_manager
 xed_window_get_state
 xed_window_get_tab_from_location
-xed_window_get_tab_from_uri
 xed_window_get_message_bus
 <SUBSECTION Standard>
 XED_WINDOW
@@ -421,6 +402,20 @@ XED_IS_WINDOW_CLASS
 XED_WINDOW_GET_CLASS
 </SECTION>
 
+<FILE>xed-window-activatable</FILE>
+<TITLE>XedWindowActivatable</TITLE>
+XedWindowActivatable
+xed_window_activatable_activate
+xed_window_activatable_deactivate
+xed_window_activatable_update_state
+<SUBSECTION Standard>
+XED_TYPE_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE_IFACE
+XED_IS_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE_GET_IFACE
+xed_window_activatable_get_type
+
 <SECTION>
 <FILE>xed-convert</FILE>
 XedConvertError
@@ -453,307 +448,16 @@ xed_debug
 xed_debug_message
 </SECTION>
 
-<SECTION>
-<FILE>xed-encodings</FILE>
-XedEncoding
-XED_TYPE_ENCODING
-xed_encoding_get_type
-xed_encoding_copy
-xed_encoding_free
-xed_encoding_get_from_charset
-xed_encoding_get_from_index
-xed_encoding_to_string
-xed_encoding_get_name
-xed_encoding_get_charset
-xed_encoding_get_utf8
-xed_encoding_get_current
-</SECTION>
-
 <SECTION>
 <FILE>xed-help</FILE>
 xed_help_display
 </SECTION>
 
-<SECTION>
-<FILE>xed-metadata-manager</FILE>
-xed_metadata_manager_shutdown
-xed_metadata_manager_get
-xed_metadata_manager_set
-</SECTION>
-
-<SECTION>
-<FILE>xed-prefs-manager-app</FILE>
-xed_prefs_manager_app_init
-xed_prefs_manager_app_shutdown
-xed_prefs_manager_get_window_state
-xed_prefs_manager_set_window_state
-xed_prefs_manager_window_state_can_set
-xed_prefs_manager_get_window_size
-xed_prefs_manager_get_default_window_size
-xed_prefs_manager_set_window_size
-xed_prefs_manager_window_size_can_set
-xed_prefs_manager_get_side_panel_size
-xed_prefs_manager_get_default_side_panel_size
-xed_prefs_manager_set_side_panel_size
-xed_prefs_manager_side_panel_size_can_set
-xed_prefs_manager_get_bottom_panel_size
-xed_prefs_manager_get_default_bottom_panel_size
-xed_prefs_manager_set_bottom_panel_size
-xed_prefs_manager_bottom_panel_size_can_set
-</SECTION>
-
-<SECTION>
-<FILE>xed-prefs-manager</FILE>
-XED_BASE_KEY
-GPM_PREFS_DIR
-GPM_FONT_DIR
-GPM_USE_DEFAULT_FONT
-GPM_EDITOR_FONT
-GPM_COLORS_DIR
-GPM_USE_DEFAULT_COLORS
-GPM_BACKGROUND_COLOR
-GPM_TEXT_COLOR
-GPM_SELECTED_TEXT_COLOR
-GPM_SELECTION_COLOR
-GPM_SAVE_DIR
-GPM_CREATE_BACKUP_COPY
-GPM_BACKUP_COPY_EXTENSION
-GPM_AUTO_SAVE
-GPM_AUTO_SAVE_INTERVAL
-GPM_UNDO_DIR
-GPM_UNDO_ACTIONS_LIMIT
-GPM_WRAP_MODE_DIR
-GPM_WRAP_MODE
-GPM_TABS_DIR
-GPM_TABS_SIZE
-GPM_INSERT_SPACES
-GPM_AUTO_INDENT_DIR
-GPM_AUTO_INDENT
-GPM_LINE_NUMBERS_DIR
-GPM_DISPLAY_LINE_NUMBERS
-GPM_CURRENT_LINE_DIR
-GPM_HIGHLIGHT_CURRENT_LINE
-GPM_BRACKET_MATCHING_DIR
-GPM_BRACKET_MATCHING
-GPM_RIGHT_MARGIN_DIR
-GPM_DISPLAY_RIGHT_MARGIN
-GPM_RIGHT_MARGIN_POSITION
-GPM_CURSOR_POSITION_DIR
-GPM_RESTORE_CURSOR_POSITION
-GPM_SEARCH_HIGHLIGHTING_DIR
-GPM_SEARCH_HIGHLIGHTING_ENABLE
-GPM_TOOLBAR_DIR
-GPM_TOOLBAR_VISIBLE
-GPM_TOOLBAR_BUTTONS_STYLE
-GPM_STATUSBAR_DIR
-GPM_STATUSBAR_VISIBLE
-GPM_SIDE_PANE_DIR
-GPM_SIDE_PANE_VISIBLE
-GPM_BOTTOM_PANEL_DIR
-GPM_BOTTOM_PANEL_VISIBLE
-GPM_RECENTS_DIR
-GPM_MAX_RECENTS
-GPM_PRINT_PAGE_DIR
-GPM_PRINT_SYNTAX
-GPM_PRINT_HEADER
-GPM_PRINT_WRAP_MODE
-GPM_PRINT_LINE_NUMBERS
-GPM_PRINT_FONT_DIR
-GPM_PRINT_FONT_BODY
-GPM_PRINT_FONT_BODY_PANGO
-GPM_PRINT_FONT_HEADER
-GPM_PRINT_FONT_HEADER_PANGO
-GPM_PRINT_FONT_NUMBERS
-GPM_PRINT_FONT_NUMBERS_PANGO
-GPM_WINDOW_DIR
-GPM_WINDOW_STATE
-GPM_WINDOW_WIDTH
-GPM_WINDOW_HEIGHT
-GPM_SIDE_PANEL_SIZE
-GPM_BOTTOM_PANEL_SIZE
-GPM_ENCODINGS_DIR
-GPM_AUTO_DETECTED_ENCODINGS
-GPM_SHOWN_IN_MENU_ENCODINGS
-GPM_SYNTAX_HL_DIR
-GPM_SYNTAX_HL_ENABLE
-GPM_WRITABLE_VFS_SCHEMES
-GPM_DEFAULT_USE_DEFAULT_FONT
-GPM_DEFAULT_EDITOR_FONT
-GPM_DEFAULT_USE_DEFAULT_COLORS
-GPM_DEFAULT_BACKGROUND_COLOR
-GPM_DEFAULT_TEXT_COLOR
-GPM_DEFAULT_SELECTED_TEXT_COLOR
-GPM_DEFAULT_SELECTION_COLOR
-GPM_DEFAULT_CREATE_BACKUP_COPY
-GPM_DEFAULT_BACKUP_COPY_EXTENSION
-GPM_DEFAULT_AUTO_SAVE
-GPM_DEFAULT_AUTO_SAVE_INTERVAL
-GPM_DEFAULT_UNDO_ACTIONS_LIMIT
-GPM_DEFAULT_WRAP_MODE
-GPM_DEFAULT_TABS_SIZE
-GPM_DEFAULT_INSERT_SPACES
-GPM_DEFAULT_AUTO_INDENT
-GPM_DEFAULT_DISPLAY_LINE_NUMBERS
-GPM_DEFAULT_AUTO_DETECTED_ENCODINGS
-GPM_DEFAULT_TOOLBAR_VISIBLE
-GPM_DEFAULT_TOOLBAR_BUTTONS_STYLE
-GPM_DEFAULT_TOOLBAR_SHOW_TOOLTIPS
-GPM_DEFAULT_STATUSBAR_VISIBLE
-GPM_DEFAULT_SIDE_PANE_VISIBLE
-GPM_DEFAULT_BOTTOM_PANEL_VISIBLE
-GPM_DEFAULT_PRINT_SYNTAX
-GPM_DEFAULT_PRINT_HEADER
-GPM_DEFAULT_PRINT_WRAP_MODE
-GPM_DEFAULT_PRINT_LINE_NUMBERS
-GPM_DEFAULT_PRINT_FONT_BODY_PANGO
-GPM_DEFAULT_PRINT_FONT_HEADER_PANGO
-GPM_DEFAULT_PRINT_FONT_NUMBERS_PANGO
-GPM_DEFAULT_MAX_RECENTS
-GPM_DEFAULT_WINDOW_STATE
-GPM_DEFAULT_WINDOW_WIDTH
-GPM_DEFAULT_WINDOW_HEIGHT
-GPM_DEFAULT_WINDOW_STATE_STR
-GPM_DEFAULT_WINDOW_WIDTH_STR
-GPM_DEFAULT_WINDOW_HEIGHT_STR
-GPM_DEFAULT_SIDE_PANEL_SIZE
-GPM_DEFAULT_BOTTOM_PANEL_SIZE
-GPM_DEFAULT_SIDE_PANEL_SIZE_STR
-GPM_DEFAULT_BOTTOM_PANEL_SIZE_STR
-GPM_DEFAULT_HIGHLIGHT_CURRENT_LINE
-GPM_DEFAULT_BRACKET_MATCHING
-GPM_DEFAULT_DISPLAY_RIGHT_MARGIN
-GPM_DEFAULT_RIGHT_MARGIN_POSITION
-GPM_DEFAULT_SYNTAX_HL_ENABLE
-GPM_DEFAULT_WRITABLE_VFS_SCHEMES
-GPM_DEFAULT_RESTORE_CURSOR_POSITION
-GPM_DEFAULT_SEARCH_HIGHLIGHTING_ENABLE
-XedToolbarSetting
-xed_prefs_manager_init
-xed_prefs_manager_shutdown
-xed_prefs_manager_get_use_default_font
-xed_prefs_manager_set_use_default_font
-xed_prefs_manager_use_default_font_can_set
-xed_prefs_manager_get_editor_font
-xed_prefs_manager_set_editor_font
-xed_prefs_manager_editor_font_can_set
-xed_prefs_manager_get_use_default_colors
-xed_prefs_manager_set_use_default_colors
-xed_prefs_manager_use_default_colors_can_set
-xed_prefs_manager_get_background_color
-xed_prefs_manager_set_background_color
-xed_prefs_manager_background_color_can_set
-xed_prefs_manager_get_text_color
-xed_prefs_manager_set_text_color
-xed_prefs_manager_text_color_can_set
-xed_prefs_manager_get_selection_color
-xed_prefs_manager_set_selection_color
-xed_prefs_manager_selection_color_can_set
-xed_prefs_manager_get_selected_text_color
-xed_prefs_manager_set_selected_text_color
-xed_prefs_manager_selected_text_color_can_set
-xed_prefs_manager_get_create_backup_copy
-xed_prefs_manager_set_create_backup_copy
-xed_prefs_manager_create_backup_copy_can_set
-xed_prefs_manager_get_backup_extension
-xed_prefs_manager_get_auto_save
-xed_prefs_manager_set_auto_save
-xed_prefs_manager_auto_save_can_set
-xed_prefs_manager_get_auto_save_interval
-xed_prefs_manager_set_auto_save_interval
-xed_prefs_manager_auto_save_interval_can_set
-xed_prefs_manager_get_undo_actions_limit
-xed_prefs_manager_set_undo_actions_limit
-xed_prefs_manager_undo_actions_limit_can_set
-xed_prefs_manager_get_wrap_mode
-xed_prefs_manager_set_wrap_mode
-xed_prefs_manager_wrap_mode_can_set
-xed_prefs_manager_get_tabs_size
-xed_prefs_manager_set_tabs_size
-xed_prefs_manager_tabs_size_can_set
-xed_prefs_manager_get_insert_spaces
-xed_prefs_manager_set_insert_spaces
-xed_prefs_manager_insert_spaces_can_set
-xed_prefs_manager_get_auto_indent
-xed_prefs_manager_set_auto_indent
-xed_prefs_manager_auto_indent_can_set
-xed_prefs_manager_get_display_line_numbers
-xed_prefs_manager_set_display_line_numbers
-xed_prefs_manager_display_line_numbers_can_set
-xed_prefs_manager_get_toolbar_visible
-xed_prefs_manager_set_toolbar_visible
-xed_prefs_manager_toolbar_visible_can_set
-xed_prefs_manager_get_toolbar_buttons_style
-xed_prefs_manager_set_toolbar_buttons_style
-xed_prefs_manager_toolbar_buttons_style_can_set
-xed_prefs_manager_get_statusbar_visible
-xed_prefs_manager_set_statusbar_visible
-xed_prefs_manager_statusbar_visible_can_set
-xed_prefs_manager_get_side_pane_visible
-xed_prefs_manager_set_side_pane_visible
-xed_prefs_manager_side_pane_visible_can_set
-xed_prefs_manager_get_bottom_panel_visible
-xed_prefs_manager_set_bottom_panel_visible
-xed_prefs_manager_bottom_panel_visible_can_set
-xed_prefs_manager_get_print_syntax_hl
-xed_prefs_manager_set_print_syntax_hl
-xed_prefs_manager_print_syntax_hl_can_set
-xed_prefs_manager_get_print_header
-xed_prefs_manager_set_print_header
-xed_prefs_manager_print_header_can_set
-xed_prefs_manager_get_print_wrap_mode
-xed_prefs_manager_set_print_wrap_mode
-xed_prefs_manager_print_wrap_mode_can_set
-xed_prefs_manager_get_print_line_numbers
-xed_prefs_manager_set_print_line_numbers
-xed_prefs_manager_print_line_numbers_can_set
-xed_prefs_manager_get_print_font_body
-xed_prefs_manager_set_print_font_body
-xed_prefs_manager_print_font_body_can_set
-xed_prefs_manager_get_default_print_font_body
-xed_prefs_manager_get_print_font_header
-xed_prefs_manager_set_print_font_header
-xed_prefs_manager_print_font_header_can_set
-xed_prefs_manager_get_default_print_font_header
-xed_prefs_manager_get_print_font_numbers
-xed_prefs_manager_set_print_font_numbers
-xed_prefs_manager_print_font_numbers_can_set
-xed_prefs_manager_get_default_print_font_numbers
-xed_prefs_manager_get_max_recents
-xed_prefs_manager_get_auto_detected_encodings
-xed_prefs_manager_get_shown_in_menu_encodings
-xed_prefs_manager_set_shown_in_menu_encodings
-xed_prefs_manager_shown_in_menu_encodings_can_set
-xed_prefs_manager_get_highlight_current_line
-xed_prefs_manager_set_highlight_current_line
-xed_prefs_manager_highlight_current_line_can_set
-xed_prefs_manager_get_bracket_matching
-xed_prefs_manager_set_bracket_matching
-xed_prefs_manager_bracket_matching_can_set
-xed_prefs_manager_get_display_right_margin
-xed_prefs_manager_set_display_right_margin
-xed_prefs_manager_display_right_margin_can_set
-xed_prefs_manager_get_right_margin_position
-xed_prefs_manager_set_right_margin_position
-xed_prefs_manager_right_margin_position_can_set
-xed_prefs_manager_get_enable_syntax_highlighting
-xed_prefs_manager_set_enable_syntax_highlighting
-xed_prefs_manager_enable_syntax_highlighting_can_set
-xed_prefs_manager_get_writable_vfs_schemes
-xed_prefs_manager_get_restore_cursor_position
-xed_prefs_manager_get_enable_search_highlighting
-xed_prefs_manager_set_enable_search_highlighting
-xed_prefs_manager_enable_search_highlighting_can_set
-</SECTION>
-
 <SECTION>
 <FILE>xed-utils</FILE>
 GBOOLEAN_TO_POINTER
 GPOINTER_TO_BOOLEAN
 IS_VALID_BOOLEAN
-xed_utils_uri_has_writable_scheme
-xed_utils_uri_has_file_scheme
-xed_utils_menu_position_under_widget
-xed_utils_menu_position_under_tree_view
 xed_gtk_button_new_with_stock_icon
 xed_dialog_add_button
 xed_utils_escape_underscores
@@ -763,8 +467,6 @@ g_utf8_caselessnmatch
 xed_utils_set_atk_name_description
 xed_utils_set_atk_relation
 xed_utils_uri_exists
-xed_utils_escape_search_text
-xed_utils_unescape_search_text
 xed_utils_get_stdin
 xed_warning
 xed_utils_make_valid_utf8

docs/reference/xed.types

@@ -1,32 +0,0 @@
-#include "xed-app.h"
-#include "xed-document.h"
-#include "xed-encodings.h"
-#include "xed-encodings-combo-box.h"
-#include "xed-file-chooser-dialog.h"
-#include "xed-message.h"
-#include "xed-message-bus.h"
-#include "xed-message-type.h"
-#include "xed-notebook.h"
-#include "xed-panel.h"
-#include "xed-plugin.h"
-#include "xed-progress-message-area.h"
-#include "xed-statusbar.h"
-#include "xed-tab.h"
-#include "xed-view.h"
-#include "xed-window.h"
-xed_app_get_type
-xed_document_get_type
-xed_encoding_get_type
-xed_encodings_combo_box_get_type
-xed_file_chooser_dialog_get_type
-xed_message_get_type
-xed_message_bus_get_type
-xed_message_type_get_type
-xed_notebook_get_type
-xed_panel_get_type
-xed_plugin_get_type
-xed_progress_message_area_get_type
-xed_statusbar_get_type
-xed_tab_get_type
-xed_view_get_type
-xed_window_get_type

help/C/index.docbook

@@ -292,7 +292,7 @@
 		</listitem>
 		</orderedlist>
 		<para>Valid types of <replaceable>URI</replaceable> include <literal>http:</literal>, <literal>ftp:</literal>, <literal>file:</literal>, and all of the methods supported by <literal>gvfs</literal>.</para>
-		<para>Files from some types of URI are opened as read-only, and any changes you make must be saved to a different location. HTTP only allows files to be read. Files opened from FTP are read-only because because not all FTP servers may correctly work with saving remote files.</para>
+		<para>Files from some types of URI are opened as read-only, and any changes you make must be saved to a different location. HTTP only allows files to be read. Files opened from FTP are read-only because not all FTP servers may correctly work with saving remote files.</para>
 	 </sect2>
 
 <!-- ============= Working with tabs ======================== -->
@@ -350,7 +350,7 @@
 		  </listitem>
 		  <listitem><para>Type the string that you want to find in the <guilabel>Search for</guilabel> field. You can include special characters such as a new line or tab: see <xref linkend="xed-find-escapes"/>.</para>
 		  </listitem>
-		  <listitem><para>Click <guibutton>Find</guibutton> to search the file for the first occurrence of the string after your current cursor position. If <application>&app;</application> finds the string, the application selects first occurrence of the string. Other occurrences of the string are highlighted.</para>
+		  <listitem><para>Click <guibutton>Find</guibutton> to search the file for the first occurrence of the string after your current cursor position. If <application>&app;</application> finds the string, the application selects the first occurrence of the string. Other occurrences of the string are highlighted.</para>
 		  </listitem>
 		  <listitem><para>To find the next occurrence of the string, click <guibutton>Find</guibutton> or choose <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice>. To find the previous occurrence of the text, choose <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Find Previous</guimenuitem> </menuchoice>.</para>
 		  </listitem>
@@ -1191,7 +1191,7 @@
       </variablelist>
     </sect2>
 
-    <sect2 id="xed-prefs-plugins">
+    <sect2 id="xed-prefs-plugins" xreflabel="Plugins Preferences">
       <title>Plugins Preferences</title>
       <para>Plugins add extra features to <application>&app;</application>. For more information on plugins and how to use the built-in plugins, see <xref linkend="xed-plugins-overview"/>.</para>
 
@@ -1245,45 +1245,42 @@
 		  <title>Working with Plugins</title>
   		<para>You can add extra features to <application>&app;</application> by enabling <firstterm>plugins</firstterm>. A plugin is a supplementary program that enhances the functionality of an application. Plugins add new items to the <application>&app;</application> menus for the new features they provide.
   		</para>
-  		<para>Several plugins come built-in with <application>&app;</application>, and you can install more. The <ulink type="http" url="http://live.gnome.org/Xed/Plugins">xed website</ulink> lists third-party plugins.</para>
-  		<para>To enable and disable plugins, or see which plugins are currently enabled, use the <link linkend="xed-prefs-plugins">Plugins Preferences</link>.</para>
+  		<para>Several plugins come built-in with <application>&app;</application>, and you can install more.</para>
+  		<para>To enable and disable plugins, or see which plugins are currently enabled, use the <xref linkend="xed-prefs-plugins"/>.</para>
   		<para>The following plugins come built-in with <application>&app;</application>:</para>
-  		<!-- Not yet documented:
-  		File browser
-  		-->
   		<itemizedlist>
   		  <listitem>
-  		    <para><link linkend="xed-change-case-plugin"><application>Change Case</application></link> allows you to change the case of the selected text.</para>
+  		    <para><xref linkend="xed-change-case-plugin"/> allows you to change the case of the selected text.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-document-statistics-plugin">Document Statistics</link></application> shows the number of lines, words, and characters in the document. </para>
+  		    <para><xref linkend="xed-document-statistics-plugin"/> shows the number of lines, words, and characters in the document. </para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><!-- <link linkend="xed-file-browser-plugin">File Browser</link>-->File Browser</application> allows you to browse your files and folders in the side pane.</para>
+  		    <para><xref linkend="xed-file-browser-plugin"/> allows you to browse your files and folders in the side pane.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-indent-lines-plugin">Indent Lines</link></application> adds or removes indentation from the selected lines.</para>
+  		    <para><xref linkend="xed-indent-lines-plugin"/> adds or removes indentation from the selected lines.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-insert-date-time-plugin">Insert Date/Time</link></application> adds the current date and time into a document.</para>
+  		    <para><xref linkend="xed-insert-date-time-plugin"/> adds the current date and time into a document.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-modelines-plugin">Modelines</link></application> allows you to set editing preferences for individual documents, and supports <application>Emacs</application>, <application>Kate</application> and <application>Vim</application>-style modelines.</para>
+  		    <para><xref linkend="xed-modelines-plugin"/> allows you to set editing preferences for individual documents, and supports <application>Emacs</application>, <application>Kate</application> and <application>Vim</application>-style modelines.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-sort-plugin">Sort</link></application> arranges selected lines of text into alphabetical order.</para>
+  		    <para><xref linkend="xed-sort-plugin"/> arranges selected lines of text into alphabetical order.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-spell-checker-plugin">Spell Checker</link></application> corrects the spelling in the selected text, or marks errors automatically in the document.</para>
+  		    <para><xref linkend="xed-spell-checker-plugin"/> corrects the spelling in the selected text, or marks errors automatically in the document.</para>
   		  </listitem>
   		  <listitem>
-  		    <para><application><link linkend="xed-tag-list-plugin">Tag List</link></application> lets you insert commonly-used tags for HTML and other languages from a list in the side pane.</para>
+  		    <para><xref linkend="xed-tag-list-plugin"/> lets you insert commonly-used tags for HTML and other languages from a list in the side pane.</para>
   		  </listitem>
   		</itemizedlist>
 
   	</sect2>
 
-<sect2 id="xed-change-case-plugin">
+<sect2 id="xed-change-case-plugin" xreflabel="Change Case">
 <title>Change Case Plugin</title>
 	<para>The <application>Change Case</application> plugin changes the case of the selected text.</para>
 	 <para>The following items are added to the <guimenu>Edit</guimenu> menu when the <application>Change Case</application> plugin is enabled:</para>
@@ -1334,7 +1331,7 @@
 
 </sect2>
 
-<sect2 id="xed-document-statistics-plugin">
+<sect2 id="xed-document-statistics-plugin" xreflabel="Document Statistics">
 <title>Document Statistics Plugin</title>
 	<para>The <application>Document Statistics</application> plugin counts the number of lines, words, characters with spaces, characters without spaces, and bytes in the current file. The plugin displays the results in a <guilabel>Document Statistics</guilabel> dialog. To use the Document Statistics plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1364,7 +1361,7 @@
 		</orderedlist>
 </sect2>
 
-<sect2 id="xed-file-browser-plugin">
+<sect2 id="xed-file-browser-plugin" xreflabel="File Browser">
   <title>File Browser Plugin</title>
   <para>The <application>File Browser</application> Plugin shows your files and folders in the side pane, allowing you to quickly open files.</para>
   <para>To view the File Browser, choose <menuchoice><guimenu>View</guimenu> <guimenuitem>Side Pane</guimenuitem> </menuchoice> and then click on the tab showing the File Browser icon at the bottom of the side pane.</para>
@@ -1385,7 +1382,7 @@
     </sect3>
 </sect2>
 
-<sect2 id="xed-indent-lines-plugin">
+<sect2 id="xed-indent-lines-plugin" xreflabel="Indent Lines">
 <title>Indent Lines Plugin</title>
 	<para>The <application>Indent Lines</application> plugin adds or removes space from the beginning of lines of text.</para>
 	<para>To indent or unindent text, perform the following steps:</para>
@@ -1403,11 +1400,11 @@
 		    </itemizedlist>
 		  </listitem>
 		</orderedlist>
-	<para>The amount of space used, and whether tab character or space characters are used, depends on the <guilabel>Tab Stops</guilabel> settings in the Editor Preferences: see <xref linkend="xed-prefs-editor"/>.</para>
+	<para>The amount of space used, and whether tab characters or space characters are used, depends on the <guilabel>Tab Stops</guilabel> settings in the Editor Preferences: see <xref linkend="xed-prefs-editor"/>.</para>
 
 </sect2>
 
-<sect2 id="xed-insert-date-time-plugin">
+<sect2 id="xed-insert-date-time-plugin" xreflabel="Insert Date/Time">
 <title>Insert Date/Time Plugin</title>
 	<para>The <application>Insert Date/Time</application> plugin inserts the current date and time into a document. To use the Insert Date/Time plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1455,7 +1452,7 @@
 </sect3>
 </sect2>
 
-<sect2 id="xed-modelines-plugin">
+<sect2 id="xed-modelines-plugin" xreflabel="Modelines">
   <title>Modelines Plugin</title>
     <para>The <application>Modelines</application> plugin allows you to set  preferences for individual documents. A <firstterm>modeline</firstterm> is a line of text at the start or end of the document with settings that <application>&app;</application> recognises.</para>
     <para>Preferences set using modelines take precedence over the ones specified in the preference dialog.</para>
@@ -1483,21 +1480,21 @@
     <sect3 id="xed-modelines-plugin-emacs">
       <title>Emacs Modelines</title>
       <para>The first two lines of a document are scanned for <application>Emacs</application> modelines.</para>
-      <para>The <application>Emacs</application> options for tab-width, indent-offset, indent-tabs-mode and autowrap are supported. For more information, see the <ulink type="http" url="http://www.delorie.com/gnu/docs/emacs/emacs_486.html">GNU Emacs Manual</ulink>.</para>
+      <para>The <application>Emacs</application> options for tab-width, indent-offset, indent-tabs-mode and autowrap are supported. For more information, see the <ulink type="http" url="http://www.gnu.org/software/emacs/manual/html_node/emacs/index.html">GNU Emacs Manual</ulink>.</para>
     </sect3>
     <sect3 id="xed-modelines-plugin-kate">
       <title>Kate Modelines</title>
-      <para>The first and last ten lines a document are scanned for <application>Kate</application> modelines.</para>
-      <para>The <application>Kate</application> options for tab-width, indent-width, space-indent, word-wrap and word-wrap-column are supported. For more information, see the <ulink type="http" url="http://www.kate-editor.org/article/katepart_modelines">Kate website</ulink>.</para>
+      <para>The first and last ten lines of a document are scanned for <application>Kate</application> modelines.</para>
+      <para>The <application>Kate</application> options for tab-width, indent-width, space-indent, word-wrap and word-wrap-column are supported. For more information, see the <ulink type="http" url="http://www.kate-editor.org">Kate website</ulink>.</para>
     </sect3>
     <sect3 id="xed-modelines-plugin-vim">
       <title>Vim Modelines</title>
-      <para>The first and last three lines a document are scanned for <application>Vim</application> modelines.</para>
+      <para>The first and last three lines of a document are scanned for <application>Vim</application> modelines.</para>
       <para>The <application>Vim</application> options for et, expandtab, ts, tabstop, sw, shiftwidth, wrap, and textwidth are supported. For more information, see the <ulink type="http" url="http://vimdoc.sourceforge.net/htmldoc/options.html#modeline">Vim website</ulink>.</para>
     </sect3>
 </sect2>
 
-<sect2 id="xed-sort-plugin">
+<sect2 id="xed-sort-plugin" xreflabel="Sort">
 <title>Sort Plugin</title>
 	<para>The <application>Sort</application> plugin arranges selected lines of text into alphabetical order.</para>
 		  <caution><para>You cannot undo the Sort operation, so you should save the file before performing the sort. To revert to the saved version of the file after the sort operation, choose <menuchoice> <guimenu>File</guimenu> <guimenuitem>Revert</guimenuitem> </menuchoice>.
@@ -1534,7 +1531,7 @@
 		</orderedlist>
 </sect2>
 
-<sect2 id="xed-spell-checker-plugin">
+<sect2 id="xed-spell-checker-plugin" xreflabel="Spell Checker">
 <title>Spell Checker Plugin</title>
 	<para>The <application>Spell Checker</application> plugin checks the spelling in the selected text. You can configure <application>&app;</application> to check the spelling automatically, or you can check the spelling manually, in the specified language. The language setting, and the autocheck spelling properties, apply per document. To use the Spell checker plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1589,7 +1586,7 @@
 		</orderedlist>
 </sect2>
 
-<sect2 id="xed-tag-list-plugin">
+<sect2 id="xed-tag-list-plugin" xreflabel="Tag List">
 <title>Tag List Plugin</title>
 	<para>The <application>Tag List</application> plugin allows you to insert common tags from a list in the side pane.</para>
   <para>To use the Tag List plugin, perform the following steps:</para>

help/LINGUAS

@@ -0,0 +1,23 @@
+ar
+bg
+ca
+cs
+da
+de
+el
+es
+fi
+fr
+hu
+it
+ja
+ko
+oc
+pt_BR
+ru
+sv
+th
+uk
+zh_CN
+zh_HK
+zh_TW

help/Makefile.am

@@ -1,16 +0,0 @@
-@YELP_HELP_RULES@
- 
-HELP_ID = xed
-HELP_FILES = index.docbook legal.xml
-HELP_MEDIA = \
-	figures/xed_format_bold.png			\
-	figures/xed_format_italic.png			\
-	figures/xed_format_strikethrough.png		\
-	figures/xed_format_underline.png		\
-	figures/xed_recent_files_menu_icon.png	\
-	figures/xed_window.png	
-
-HELP_LINGUAS = ar bg ca cs da de el es fi fr hu it ja ko oc pt_BR ru sv th uk zh_CN zh_HK zh_TW
-
-
--include $(top_srcdir)/git.mk

help/meson.build

@@ -0,0 +1,20 @@
+help_sources = [
+    'index.docbook',
+    'legal.xml'
+]
+
+help_media = [
+    'figures/xed_format_bold.png',
+    'figures/xed_format_italic.png',
+    'figures/xed_format_strikethrough.png',
+    'figures/xed_format_underline.png',
+    'figures/xed_recent_files_menu_icon.png',
+    'figures/xed_window.png'
+]
+
+gnome.yelp(
+    meson.project_name(),
+    sources: help_sources,
+    media: help_media,
+    symlink_media: false
+)

m4/python.m4

@@ -1,62 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])

meson.build

@@ -0,0 +1,114 @@
+project('xed', 'c', version : '3.0.0')
+
+gnome = import('gnome')
+i18n = import('i18n')
+pkgconfig = import('pkgconfig')
+
+version = meson.project_version()
+
+xed_conf = configuration_data()
+xed_conf.set_quoted('VERSION', version)
+#xed_conf.set_quoted('GETTEXT_PACKAGE', 'xed')
+xed_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+
+# directories
+prefix = get_option('prefix')
+bindir = get_option('bindir')
+datadir = get_option('datadir')
+libdir = get_option('libdir')
+includedir = get_option('includedir')
+libexecdir = get_option('libexecdir')
+desktopdir = join_paths(datadir, 'applications')
+schema_dir = join_paths(datadir, 'glib-2.0', 'schemas')
+
+po_dir = join_paths(meson.source_root(), 'po')
+
+# dependencies
+libxml = dependency('libxml-2.0', version: '>= 2.5.0')
+glib = dependency('glib-2.0', version: '>= 2.40.0')
+gthread = dependency('gthread-2.0', version: '>= 2.13.0')
+gio = dependency('gio-2.0', version: '>= 2.40.0')
+gtk = dependency('gtk+-3.0', version: '>= 3.19.3')
+gtksourceview = dependency('gtksourceview-4', version: '>= 4.0.3')
+libpeas = dependency('libpeas-1.0', version: '>= 1.12.0')
+libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.12.0')
+gir_dep = dependency('gobject-introspection-1.0', version: '>= 1.42.0', required: false)
+gmodule = dependency('gmodule-2.0')
+xapp = dependency('xapp', version: '>= 1.9.0')
+X11 = dependency('x11')
+pango = dependency('pango')
+
+if gir_dep.found()
+    xed_conf.set('ENABLE_INTROSPECTION', 1)
+endif
+
+enable_spell = get_option('enable_spell')
+if enable_spell
+    gspell = dependency('gspell-1', version: '>= 0.2.5')
+endif
+
+if get_option('enable_gvfs_metadata')
+    xed_conf.set('ENABLE_GVFS_METADATA', true)
+endif
+
+# on some systems we need to find the math lib to make sure it builds
+cc = meson.get_compiler('c')
+math = cc.find_library('m', required: false)
+
+intltool_merge = find_program('intltool-merge')
+itstool = find_program('itstool')
+
+# generate config.h
+config_h_file = configure_file(
+    output : 'config.h',
+    configuration : xed_conf
+)
+
+config_h = declare_dependency(
+    sources: config_h_file
+)
+
+include_dirs = include_directories('.', 'xed')
+
+# compiler flags
+add_global_arguments('-DDATADIR="@0@"'.format(join_paths(prefix, datadir)), language: 'c')
+add_global_arguments('-DLIBDIR="@0@"'.format(join_paths(prefix, libdir)), language: 'c')
+
+# remove this later or add as build option
+if not get_option('deprecated_warnings')
+    add_global_arguments([
+            '-Wno-deprecated-declarations',
+            '-Wno-deprecated',
+            '-Wno-declaration-after-statement',
+        ],
+        language: 'c',
+    )
+endif
+
+subdir('xed')
+subdir('pixmaps')
+subdir('po')
+subdir('data')
+subdir('plugins')
+subdir('help')
+if get_option('docs')
+    subdir('docs/reference')
+endif
+
+# The tests use an option that doesn't exist in meson before 0.46.
+# Since they aren't strictly necessary, we'll just skip them for earlier versions
+# rather than making 0.46 a hard requirement. This condition can be removed once we
+# no longer need to worry about building on 0.45 or earlier
+meson_version_parts = meson.version().split('.')
+if meson_version_parts[0].to_int() > 0 or meson_version_parts[1].to_int() >= 46
+    subdir('test')
+endif
+
+message('prefix = @0@'.format(prefix))
+message('bindir = @0@'.format(bindir))
+message('datadir = @0@'.format(datadir))
+message('libdir = @0@'.format(libdir))
+message('includedir = @0@'.format(includedir))
+message('libexecdir = @0@'.format(libexecdir))
+message('desktopdir = @0@'.format(desktopdir))
+message('schema_dir = @0@'.format(schema_dir))

meson_options.txt

@@ -0,0 +1,23 @@
+option(
+	'enable_spell',
+	type : 'boolean',
+	value : true,
+	description : 'enable gspell'
+)
+option(
+	'enable_gvfs_metadata',
+	type : 'boolean',
+	value : true,
+	description : 'enable gvfs metadata'
+)
+option('docs',
+    type: 'boolean',
+    value: false,
+    description: 'Build the API references (requires gtk-doc)'
+)
+option(
+	'deprecated_warnings',
+    type : 'boolean',
+    value : false,
+    description: 'Show build warnings for deprecations'
+)

pixmaps/Makefile.am

@@ -1,8 +0,0 @@
-icondir = $(datadir)/xed/icons
-icon_DATA = xed-plugin.png
-
-EXTRA_DIST = \
-	$(icon_DATA) \
-	xed.ico
-
--include $(top_srcdir)/git.mk

pixmaps/meson.build

@@ -0,0 +1,4 @@
+install_data(
+    'xed-plugin.png',
+    install_dir: join_paths(datadir, 'xed', 'icons')
+)

plugin-loaders/Makefile.am

@@ -1,7 +0,0 @@
-SUBDIRS = c
-
-if ENABLE_PYTHON
-SUBDIRS += python
-endif
-
--include $(top_srcdir)/git.mk

plugin-loaders/c/Makefile.am

@@ -1,24 +0,0 @@
-# C plugin loader
-
-loaderdir = $(libdir)/xed/plugin-loaders
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	$(XED_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DXED_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-loader_LTLIBRARIES = libcloader.la
-
-NOINST_H_FILES = \
-	xed-plugin-loader-c.h
-
-libcloader_la_SOURCES = \
-	xed-plugin-loader-c.c 	\
-	$(NOINST_H_FILES)
-
-libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
-libcloader_la_LIBADD = $(XED_LIBS)
-
--include $(top_srcdir)/git.mk

plugin-loaders/c/xed-plugin-loader-c.c

@@ -1,182 +0,0 @@
-/*
- * xed-plugin-loader-c.c
- * This file is part of xed
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#include "xed-plugin-loader-c.h"
-#include <xed/xed-object-module.h>
-
-#define XED_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), XED_TYPE_PLUGIN_LOADER_C, XedPluginLoaderCPrivate))
-
-struct _XedPluginLoaderCPrivate
-{
-	GHashTable *loaded_plugins;
-};
-
-static void xed_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
-
-XED_PLUGIN_LOADER_REGISTER_TYPE (XedPluginLoaderC, xed_plugin_loader_c, G_TYPE_OBJECT, xed_plugin_loader_iface_init);
-
-
-static const gchar *
-xed_plugin_loader_iface_get_id (void)
-{
-	return "C";
-}
-
-static XedPlugin *
-xed_plugin_loader_iface_load (XedPluginLoader *loader,
-				XedPluginInfo   *info,
-				const gchar       *path)
-{
-	XedPluginLoaderC *cloader = XED_PLUGIN_LOADER_C (loader);
-	XedObjectModule *module;
-	const gchar *module_name;
-	XedPlugin *result;
-
-	module = (XedObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info);
-	module_name = xed_plugin_info_get_module_name (info);
-
-	if (module == NULL)
-	{
-		/* For now we force all modules to be resident */
-		module = xed_object_module_new (module_name,
-						  path,
-						  "register_xed_plugin",
-						  TRUE);
-
-		/* Infos are available for all the lifetime of the loader.
-		 * If this changes, we should use weak refs or something */
-
-		g_hash_table_insert (cloader->priv->loaded_plugins, info, module);
-	}
-
-	if (!g_type_module_use (G_TYPE_MODULE (module)))
-	{
-		g_warning ("Could not load plugin module: %s", xed_plugin_info_get_name (info));
-
-		return NULL;
-	}
-
-	/* TODO: for now we force data-dir-name = module-name... if needed we can
-	 * add a datadir field to the plugin descriptor file.
-	 */
-	result = (XedPlugin *)xed_object_module_new_object (module,
-								"install-dir", path,
-								"data-dir-name", module_name,
-								NULL);
-
-	if (!result)
-	{
-		g_warning ("Could not create plugin object: %s", xed_plugin_info_get_name (info));
-		g_type_module_unuse (G_TYPE_MODULE (module));
-		
-		return NULL;
-	}
-
-	g_type_module_unuse (G_TYPE_MODULE (module));
-	
-	return result;
-}
-
-static void
-xed_plugin_loader_iface_unload (XedPluginLoader *loader,
-				  XedPluginInfo   *info)
-{
-	//XedPluginLoaderC *cloader = XED_PLUGIN_LOADER_C (loader);
-	
-	/* this is a no-op, since the type module will be properly unused as
-	   the last reference to the plugin dies. When the plugin is activated
-	   again, the library will be reloaded */
-}
-
-static void
-xed_plugin_loader_iface_init (gpointer g_iface, 
-				gpointer iface_data)
-{
-	XedPluginLoaderInterface *iface = (XedPluginLoaderInterface *)g_iface;
-	
-	iface->get_id = xed_plugin_loader_iface_get_id;
-	iface->load = xed_plugin_loader_iface_load;
-	iface->unload = xed_plugin_loader_iface_unload;
-}
-
-static void
-xed_plugin_loader_c_finalize (GObject *object)
-{
-	XedPluginLoaderC *cloader = XED_PLUGIN_LOADER_C (object);
-	GList *infos;
-	GList *item;
-
-	/* FIXME: this sanity check it's not efficient. Let's remove it
-	 * once we are confident with the code */
-
-	infos = g_hash_table_get_keys (cloader->priv->loaded_plugins);
-	
-	for (item = infos; item; item = item->next)
-	{
-		XedPluginInfo *info = (XedPluginInfo *)item->data;
-
-		if (xed_plugin_info_is_active (info))
-		{
-			g_warning ("There are still C plugins loaded during destruction");
-			break;
-		}
-	}
-
-	g_list_free (infos);	
-
-	g_hash_table_destroy (cloader->priv->loaded_plugins);
-	
-	G_OBJECT_CLASS (xed_plugin_loader_c_parent_class)->finalize (object);
-}
-
-static void
-xed_plugin_loader_c_class_init (XedPluginLoaderCClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	
-	object_class->finalize = xed_plugin_loader_c_finalize;
-
-	g_type_class_add_private (object_class, sizeof (XedPluginLoaderCPrivate));
-}
-
-static void
-xed_plugin_loader_c_class_finalize (XedPluginLoaderCClass *klass)
-{
-}
-
-static void
-xed_plugin_loader_c_init (XedPluginLoaderC *self)
-{
-	self->priv = XED_PLUGIN_LOADER_C_GET_PRIVATE (self);
-	
-	/* loaded_plugins maps XedPluginInfo to a XedObjectModule */
-	self->priv->loaded_plugins = g_hash_table_new (g_direct_hash,
-						       g_direct_equal);
-}
-
-XedPluginLoaderC *
-xed_plugin_loader_c_new ()
-{
-	GObject *loader = g_object_new (XED_TYPE_PLUGIN_LOADER_C, NULL);
-
-	return XED_PLUGIN_LOADER_C (loader);
-}

plugin-loaders/c/xed-plugin-loader-c.h

@@ -1,60 +0,0 @@
-/*
- * xed-plugin-loader-c.h
- * This file is part of xed
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#ifndef __XED_PLUGIN_LOADER_C_H__
-#define __XED_PLUGIN_LOADER_C_H__
-
-#include <xed/xed-plugin-loader.h>
-
-G_BEGIN_DECLS
-
-#define XED_TYPE_PLUGIN_LOADER_C		(xed_plugin_loader_c_get_type ())
-#define XED_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_PLUGIN_LOADER_C, XedPluginLoaderC))
-#define XED_PLUGIN_LOADER_C_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_PLUGIN_LOADER_C, XedPluginLoaderC const))
-#define XED_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_PLUGIN_LOADER_C, XedPluginLoaderCClass))
-#define XED_IS_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_PLUGIN_LOADER_C))
-#define XED_IS_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_PLUGIN_LOADER_C))
-#define XED_PLUGIN_LOADER_C_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_PLUGIN_LOADER_C, XedPluginLoaderCClass))
-
-typedef struct _XedPluginLoaderC		XedPluginLoaderC;
-typedef struct _XedPluginLoaderCClass		XedPluginLoaderCClass;
-typedef struct _XedPluginLoaderCPrivate	XedPluginLoaderCPrivate;
-
-struct _XedPluginLoaderC {
-	GObject parent;
-	
-	XedPluginLoaderCPrivate *priv;
-};
-
-struct _XedPluginLoaderCClass {
-	GObjectClass parent_class;
-};
-
-GType xed_plugin_loader_c_get_type (void) G_GNUC_CONST;
-XedPluginLoaderC *xed_plugin_loader_c_new(void);
-
-/* All the loaders must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin_loader (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __XED_PLUGIN_LOADER_C_H__ */

plugin-loaders/python/Makefile.am

@@ -1,36 +0,0 @@
-# C plugin loader
-
-SUBDIRS = bindings
-loaderdir = $(libdir)/xed/plugin-loaders
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/xed						\
-	-I$(top_builddir)/xed						\
-	$(XED_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	$(PYGTK_CFLAGS)							\
-	$(PYTHON_CFLAGS)						\
-	-DXED_PLUGINS_LIBS_DIR=\"$(XED_PLUGINS_LIBS_DIR)\"		\
-	-DXED_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-loader_LTLIBRARIES = libpythonloader.la
-
-
-NOINST_H_FILES = \
-	xed-plugin-loader-python.h	\
-	xed-plugin-python.h
-
-libpythonloader_la_SOURCES = \
-	xed-plugin-loader-python.c 	\
-	xed-plugin-python.c		\
-	$(NOINST_H_FILES)
-
-libpythonloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
-libpythonloader_la_LIBADD = \
-	$(XED_LIBS) 			\
-	bindings/xed.la
-
--include $(top_srcdir)/git.mk

plugin-loaders/python/bindings/Makefile.am

@@ -1,115 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-noinst_LTLIBRARIES = \
-	xed.la
-
-nodist_xed_la_SOURCES = 	\
-	xed.c			\
-	xedutils.c		\
-	xedcommands.c
-
-xed_la_LDFLAGS = \
-	-module -avoid-version
-
-xed_la_LIBADD = \
-	$(PYTHON_LIB_LOC)       \
-	$(PYTHON_LIBS)		\
-	$(PYTHON_EXTRA_LIBS)	\
-	$(PYGTK_LIBS)
-
-xed_la_CFLAGS = \
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/xed				\
-	-I$(top_builddir)/xed				\
-	-I$(top_srcdir)/plugin-loaders/python		\
-	-I$(top_builddir)/plugin-loaders/python		\
-	$(XED_CFLAGS)					\
-	$(NO_STRICT_ALIASING_CFLAGS)			\
-	$(PYGTK_CFLAGS)					\
-	$(PYTHON_CFLAGS)				\
-	$(AM_CFLAGS)
-
-$(top_builddir)/xed/xed-enum-types.h:
-	cd $(top_builddir)/xed && $(MAKE) xed-enum-types.h
-
-xed.c: xed.defs xed.override xedplugin.override xedmessage.override $(top_builddir)/xed/xed-enum-types.h
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register $(PYGTK_DEFSDIR)/pango-types.defs \
-		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtksourceview2.defs \
-		--register $(PYGOBJECT_DEFSDIR)/gio-types.defs \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-xedutils.c: xedutils.defs xedutils.override
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-xedcommands.c: xedcommands.defs xedcommands.override xed.defs
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register xed.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-BINDING_XED_HEADERS_SRCDIR_IN = \
-	xed/xed-app.h		\
-	xed/xed-document.h		\
-	xed/xed-encodings.h		\
-	xed/xed-plugin.h		\
-	plugin-loaders/python/xed-plugin-python.h \
-	xed/xed-view.h		\
-	xed/xed-statusbar.h		\
-	xed/xed-tab.h 		\
-	xed/xed-panel.h 		\
-	xed/xed-window.h 		\
-	xed/xed-help.h		\
-	xed/xed-debug.h		\
-	xed/xed-message-type.h	\
-	xed/xed-message.h		\
-	xed/xed-message-bus.h	\
-	xed/xed-language-manager.h
-
-BINDING_UTILS_HEADERS_SRCDIR_IN = \
-	xed/xed-utils.h
-
-BINDING_COMMANDS_HEADERS_SRCDIR_IN = \
-	xed/xed-commands.h
-
-BINDING_HEADERS_BUILDDIR_IN = 
-
-BINDING_XED_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_XED_HEADERS_SRCDIR_IN))
-BINDING_UTILS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_UTILS_HEADERS_SRCDIR_IN))
-BINDING_COMMANDS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_COMMANDS_HEADERS_SRCDIR_IN))
-
-BINDING_HEADERS_BUILDDIR	:= $(addprefix $(top_builddir)/,$(BINDING_HEADERS_BUILDDIR_IN))
-
-regenerate-python-binding:
-	$(PYGTK_H2DEF) $(sort $(BINDING_XED_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xed.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_UTILS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xedutils.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_COMMANDS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xedcommands.defs.new
-
-BUILT_SOURCES = \
-	xed.c		\
-	xedutils.c	\
-	xedcommands.c
-
-EXTRA_DIST = \
-	xed.override		\
-	xed.defs		\
-	xedutils.override	\
-	xedutils.defs		\
-	xedcommands.override 	\
-	xedcommands.defs	\
-	xedmessage.override	\
-	xedplugin.override
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
--include $(top_srcdir)/git.mk

plugin-loaders/python/bindings/xed.override

@@ -1,461 +0,0 @@
-%%
-headers
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-#include <xed/xed-language-manager.h>
-#include <xed/xed-plugin.h>
-#include <xed/xed-app.h>
-#include <xed/xed-encodings.h>
-#include <xed/xed-enum-types.h>
-#include <xed/xed-statusbar.h>
-#include <xed/xed-debug.h>
-#include <xed/xed-help.h>
-
-#include "xed-plugin-python.h"
-
-void pyxed_register_classes (PyObject *d); 
-void pyxed_add_constants (PyObject *module, const gchar *strip_prefix);
-
-static PyObject *
-_helper_wrap_gobject_glist (const GList *list)
-{
-    PyObject *py_list;
-    const GList *tmp;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *py_obj = pygobject_new(G_OBJECT(tmp->data));
-
-        if (py_obj == NULL) {
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, py_obj);
-        Py_DECREF(py_obj);
-    }
-    return py_list;
-}
-
-static PyObject *
-_helper_wrap_gobject_gslist (const GSList *list)
-{
-    PyObject *py_list;
-    const GSList *tmp;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *py_obj = pygobject_new(G_OBJECT(tmp->data));
-
-        if (py_obj == NULL) {
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, py_obj);
-        Py_DECREF(py_obj);
-    }
-    return py_list;
-}
-%%
-include
-  xedplugin.override
-  xedmessage.override
-%%
-modulename xed 
-%%
-import gtk.Widget as PyGtkWidget_Type
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-import gtk.VBox as PyGtkVBox_Type
-import gtk.Window as PyGtkWindow_Type
-import gtk.Image as PyGtkImage_Type
-import gtk.Statusbar as PyGtkStatusbar_Type
-import gtksourceview2.Buffer as PyGtkSourceBuffer_Type
-import gtksourceview2.View as PyGtkSourceView_Type
-import gtksourceview2.Language as PyGtkSourceLanguage_Type
-import gtksourceview2.LanguageManager as PyGtkSourceLanguageManager_Type
-%%
-ignore-glob
-  *_get_type
-  xed_document_error_quark
-  xed_panel_add_item_with_stock_icon
-%%
-override xed_app_create_window kwargs
-static PyObject *
-_wrap_xed_app_create_window(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "screen", NULL};
-    PyGObject *screen = NULL;
-    XedWindow *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-			"|O!", kwlist,
-			&PyGdkScreen_Type, &screen))
-        return NULL;
-
-    ret = xed_app_create_window(XED_APP(self->obj),
-				  screen ? GDK_SCREEN(screen->obj) : NULL);
-
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-%%
-override xed_app_get_windows
-static PyObject *
-_wrap_xed_app_get_windows(PyGObject *self)
-{
-    const GList *list;
-    PyObject *py_list;
-
-    list = xed_app_get_windows (XED_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    return py_list;
-}
-%%
-override xed_app_get_views
-static PyObject *
-_wrap_xed_app_get_views(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xed_app_get_views (XED_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free (list);
-
-    return py_list;
-}
-%%
-override xed_app_get_documents
-static PyObject *
-_wrap_xed_app_get_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xed_app_get_documents (XED_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free (list);
-
-    return py_list;
-}
-%%
-override xed_window_get_documents
-static PyObject *
-_wrap_xed_window_get_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xed_window_get_documents (XED_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xed_window_get_unsaved_documents
-static PyObject *
-_wrap_xed_window_get_unsaved_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xed_window_get_unsaved_documents (XED_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xed_window_get_views
-static PyObject *
-_wrap_xed_window_get_views(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xed_window_get_views (XED_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xed_window_close_tabs kwargs
-static PyObject *
-_wrap_xed_window_close_tabs (PyGObject *self,
-			       PyObject  *args,
-			       PyObject  *kwargs)
-{
-	static char *kwlist[] = { "tabs", NULL };
-	PyObject *list, *item;
-	GList *glist = NULL;
-	int len, i;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-					  "O:XedWindow.close_tabs", kwlist,
-					  &list))
-		return NULL;
-
-	if (!PySequence_Check (list))
-	{
-		PyErr_SetString (PyExc_TypeError,
-				 "first argument must be a sequence");
-		return NULL;
-	}
-
-	len = PySequence_Length (list);
-
-	for (i = 0; i < len; i++)
-	{
-		item = PySequence_GetItem (list, i);
-		Py_DECREF(item);
-
-		if (!pygobject_check (item, &PyXedTab_Type))
-		{
-			PyErr_SetString (PyExc_TypeError,
-					 "sequence item not a Gtkwidget object");
-			g_list_free (glist);
-			return NULL;
-		}
-
-		glist = g_list_append (glist, pygobject_get (item));
-	}
-
-	xed_window_close_tabs (XED_WINDOW (self->obj), glist);
-
-	g_list_free (glist);
-	Py_INCREF (Py_None);
-	return Py_None;
-}
-%%
-override xed_document_get_search_text
-static PyObject *
-_wrap_xed_document_get_search_text(PyGObject *self)
-{
-    PyObject *tuple, *string;
-    guint flags;
-    gchar *ret;
-
-    ret = xed_document_get_search_text (XED_DOCUMENT (self->obj), &flags);
-
-    tuple = PyTuple_New(2);
-    if (ret) {
-        string = PyString_FromString(ret);
-        PyTuple_SetItem(tuple, 0, string);
-    } else {
-        Py_INCREF(Py_None);
-        PyTuple_SetItem(tuple, 0, Py_None);
-    }
-    PyTuple_SetItem(tuple, 1, PyInt_FromLong(flags));
-
-    g_free(ret);
-
-    return tuple;
-}
-%%
-override xed_panel_add_item kwargs
-static PyObject *
-_wrap_xed_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist1[] = { "item", "name", "image", NULL };
-    static char *kwlist2[] = { "item", "name", "stock_id", NULL };
-    PyGObject *item, *image;
-    char *name = NULL;
-    char *stock_id = NULL;
-
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!sO!:XedPanel.add_item", kwlist1, &PyGtkWidget_Type, &item, &name, &PyGtkImage_Type, &image)) {
-        xed_panel_add_item(XED_PANEL(self->obj), GTK_WIDGET(item->obj), name, GTK_WIDGET(image->obj));
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    PyErr_Clear();
-
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:XedPanel.add_item", kwlist2, &PyGtkWidget_Type, &item, &name, &stock_id)) {
-        xed_panel_add_item_with_stock_icon(XED_PANEL(self->obj), GTK_WIDGET(item->obj), name, stock_id);
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "the last arg should be either a gtk.Image or a stock_id string");
-    return NULL;
-}
-%%
-override xed_app_get_default_deprecated
-/* deprecated wrappers */
-static PyObject *
-_wrap_xed_app_get_default_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.app_get_default instead") < 0)
-	return NULL;
-    return _wrap_xed_app_get_default(self);
-}
-%%
-override xed_encoding_get_from_charset_deprecated kwargs
-static PyObject *
-_wrap_xed_encoding_get_from_charset_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.encoding_get_from_charset instead") < 0)
-	return NULL;
-    return _wrap_xed_encoding_get_from_charset(self, args, kwargs);
-}
-%%
-override xed_encoding_get_from_index_deprecated kwargs
-static PyObject *
-_wrap_xed_encoding_get_from_index_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.encoding_get_from_index instead") < 0)
-	return NULL;
-    return _wrap_xed_encoding_get_from_index(self, args, kwargs);
-}
-%%
-override xed_encoding_get_utf8_deprecated
-static PyObject *
-_wrap_xed_encoding_get_utf8_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.encoding_get_utf8 instead") < 0)
-	return NULL;
-    return _wrap_xed_encoding_get_utf8(self);
-}
-%%
-override xed_encoding_get_current_deprecated
-static PyObject *
-_wrap_xed_encoding_get_current_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.encoding_get_current instead") < 0)
-	return NULL;
-    return _wrap_xed_encoding_get_current(self);
-}
-%%
-override xed_tab_get_from_document_deprecated kwargs
-static PyObject *
-_wrap_xed_tab_get_from_document_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xed.tab_get_from_document instead") < 0)
-	return NULL;
-    return _wrap_xed_tab_get_from_document(self, args, kwargs);
-}
-%%
-override xed_language_manager_list_languages_sorted kwargs
-static PyObject *
-_wrap_xed_language_manager_list_languages_sorted(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "lm", "include_hidden", NULL };
-    PyGObject *lm;
-    int include_hidden;
-    PyObject *py_list;
-    GSList *list;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-                                      "O!i:language_manager_list_languages_sorted",
-                                      kwlist, &PyGtkSourceLanguageManager_Type, &lm,
-                                      &include_hidden))
-        return NULL;
-
-    list = xed_language_manager_list_languages_sorted (GTK_SOURCE_LANGUAGE_MANAGER (lm->obj),
-                                                         include_hidden);
-
-    py_list = _helper_wrap_gobject_gslist (list);
-
-    g_slist_free (list);
-
-    return py_list;
-}
-%%
-override xed_debug kwargs
-static PyObject *
-_wrap_xed_debug(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "message", NULL };
-    PyObject *traceback_module, *mdict, *func, *traceback, *tuple;
-    PyObject *filename, *lineno, *funcname;
-    char *message = NULL;
-
-    if (g_getenv ("XED_DEBUG_PLUGINS") == NULL)
-    {
-        Py_INCREF (Py_None);
-        return Py_None;
-    }
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs, "|s", kwlist, &message))
-        return NULL;
-
-    traceback_module = PyImport_ImportModule ("traceback");
-    if (traceback_module == NULL)
-    {
-        g_warning ("traceback module cannot be imported");
-        Py_INCREF (Py_None);
-        return Py_None;
-    }
-
-    mdict = PyModule_GetDict (traceback_module);
-    func = PyDict_GetItemString (mdict, "extract_stack");
-    traceback = PyObject_CallFunction (func, "zi", NULL, 1);
-    tuple = PyList_GetItem (traceback, 0);
-
-    if (tuple == NULL || !PyTuple_Check (tuple))
-    {
-        g_warning ("traceback tuple is null!");
-    }
-    else
-    {
-        filename = PyTuple_GetItem (tuple, 0);
-        lineno = PyTuple_GetItem (tuple, 1);
-        funcname = PyTuple_GetItem (tuple, 2);
-
-        if (message == NULL)
-            xed_debug (XED_DEBUG_PLUGINS,
-                         PyString_AsString (filename),
-                         PyInt_AsLong (lineno),
-                         PyString_AsString (funcname));
-        else
-            xed_debug_message (XED_DEBUG_PLUGINS,
-                                 PyString_AsString (filename),
-                                 PyInt_AsLong (lineno),
-                                 PyString_AsString (funcname),
-                                 "%s",
-                                 message);
-    }
-    Py_DECREF (traceback);
-    Py_DECREF (traceback_module);
-
-    Py_INCREF (Py_None);
-    return Py_None;
-}
-%%
-override xed_statusbar_flash_message kwargs
-static PyObject *
-_wrap_xed_statusbar_flash_message(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "context_id", "message", NULL };
-    int context_id;
-    char *message;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"is:XedStatusbar.flash_message", kwlist, &context_id, &message))
-        return NULL;
-   
-    xed_statusbar_flash_message(XED_STATUSBAR(self->obj), context_id, "%s", message);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%

plugin-loaders/python/bindings/xedcommands.defs

@@ -1,45 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From ../../xed/xed-commands.h
-
-(define-function load_uri
-  (c-name "xed_commands_load_uri")
-  (return-type "none")
-  (parameters
-    '("XedWindow*" "window")
-    '("const-gchar*" "uri")
-    '("const-XedEncoding*" "encoding")
-    '("gint" "line_pos")
-  )
-)
-
-(define-function load_uris
-  (c-name "xed_commands_load_uris")
-  (return-type "gint")
-  (parameters
-    '("XedWindow*" "window")
-    '("const-GSList*" "uris")
-    '("const-XedEncoding*" "encoding")
-    '("gint" "line_pos")
-  )
-)
-
-(define-function save_document
-  (c-name "xed_commands_save_document")
-  (return-type "none")
-  (parameters
-    '("XedWindow*" "window")
-    '("XedDocument*" "document")
-  )
-)
-
-(define-function save_all_documents
-  (c-name "xed_commands_save_all_documents")
-  (return-type "none")
-  (parameters
-    '("XedWindow*" "window")
-  )
-)

plugin-loaders/python/bindings/xedcommands.override

@@ -1,122 +0,0 @@
-%%
-headers
-#define NO_IMPORT_PYGOBJECT
-#define NO_IMPORT_PYGTK
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-#include "xed-commands.h"
-#include "xed-window.h"
-
-void pyxedcommands_register_classes (PyObject *d);
-void pyxedcommands_add_constants (PyObject *module, const gchar *strip_prefix);
-
-%%
-modulename xed.commands
-%%
-import xed.Window as PyXedWindow_Type
-import xed.Document as PyXedDocument_Type
-%%
-ignore-glob
-  _*
-%%
-override xed_commands_load_uri kwargs 
-static PyObject *
-_wrap_xed_commands_load_uri (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "window", "uri", "encoding", "line_pos", NULL };
-	PyGObject *window;
-	char *uri;
-	int line_pos = 0;
-	PyObject *py_encoding = NULL;
-	XedEncoding *encoding = NULL;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!s|Oi:load_uri", 
-	                                  kwlist, &PyXedWindow_Type, 
-	                                  &window, &uri, &py_encoding, 
-	                                  &line_pos))
-		return NULL;
-    
-	if (py_encoding != NULL && py_encoding != Py_None)
-	{
-		if (pyg_boxed_check (py_encoding, XED_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, XedEncoding);
-		else
-		{
-			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a XedEncoding");
-			return NULL;
-		}
-	}
-
-	xed_commands_load_uri (XED_WINDOW (window->obj), uri, encoding, 
-	                        line_pos);
-	Py_INCREF (Py_None);
-	return Py_None;
-}
-%%
-override xed_commands_load_uris kwargs 
-static PyObject *
-_wrap_xed_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "window", "uris", "encoding", "line_pos", NULL };
-	PyGObject *window;
-	GSList *uris = NULL;
-	int line_pos = 0;
-	PyObject *py_encoding = NULL;
-	PyObject *list;
-	PyObject *item;
-	XedEncoding *encoding = NULL;
-	int len;
-	int i;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!O|Oi:load_uri", 
-	                                  kwlist, &PyXedWindow_Type, 
-	                                  &window, &list, &py_encoding, 
-	                                  &line_pos))
-		return NULL;
-    
-	if (py_encoding != NULL && py_encoding != Py_None)
-	{
-		if (pyg_boxed_check (py_encoding, XED_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, XedEncoding);
-		else {
-			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a XedEncoding");
-			return NULL;
-		}
-	}
-
-	if (!PySequence_Check (list))
-	{
-		PyErr_SetString (PyExc_TypeError, 
-		                 "second argument must be a sequence");
-		return NULL;
-	}
-
-	len = PySequence_Length (list);
-
-	for (i = 0; i < len; i++)
-	{
-		item = PySequence_GetItem (list, i);
-		Py_DECREF (item);
-
-		if (!PyString_Check (item))
-		{
-			PyErr_SetString (PyExc_TypeError,
-					 "sequence item not a string");
-			g_slist_free (uris);
-			return NULL;
-		}
-
-		uris = g_slist_prepend (uris, PyString_AsString (item));
-	}
-
-	uris = g_slist_reverse (uris);
-	xed_commands_load_uris (XED_WINDOW (window->obj), uris, 
-	                          encoding, line_pos);
-	g_slist_free (uris);
-
-	Py_INCREF (Py_None);
-	return Py_None;
-}

plugin-loaders/python/bindings/xedmessage.override

@@ -1,556 +0,0 @@
-%%
-headers
-
-#include <xed/xed-message-bus.h>
-#include <xed/xed-message.h>
-
-static GType
-_helper_wrap_get_gtype_from_pytype (PyObject *pytype)
-{
-    PyTypeObject *type = (PyTypeObject *)pytype;
-    
-    if (type == &PyList_Type || type == &PyTuple_Type)
-    	return G_TYPE_STRV;
-
-    return pyg_type_from_object (pytype);
-}
-
-static gchar *
-_helper_wrap_get_string (PyObject *obj)
-{
-	PyObject *str;
-	gchar *result;
-	
-	str = PyObject_Str (obj);
-	
-	if (!str)
-		return NULL;
-	
-	result = g_strdup (PyString_AsString (str));
-	Py_DECREF (str);
-	
-	return result;
-}
-
-static int
-_helper_wrap_list_to_gvalue (GValue *gvalue, PyObject *pyvalue)
-{
-	int num;
-	gchar **lst;
-	gint i;
-	
-	num = PySequence_Size (pyvalue);
-	lst = g_new0 (gchar *, num + 1);
-	
-	for (i = 0; i < num; i++)
-	{
-		lst[i] = _helper_wrap_get_string (PySequence_GetItem (pyvalue, i));
-		
-		if (lst[i] == NULL)
-		{
-			g_strfreev (lst);
-			return 1;
-		}
-	}
-	
-	g_value_set_boxed (gvalue, lst);
-	g_strfreev (lst);
-	
-	return 0;
-}
-
-static int
-_helper_wrap_get_gvalue_from_pyobject (GValue *gvalue, PyObject *pyvalue)
-{
-	if (pyvalue->ob_type == &PyList_Type || pyvalue->ob_type == &PyTuple_Type)
-		return _helper_wrap_list_to_gvalue (gvalue, pyvalue);
-
-	return pyg_value_from_pyobject(gvalue, pyvalue);
-}
-
-static int
-_helper_wrap_message_set_value(XedMessage *message, PyObject *pykey, PyObject *pyvalue)
-{
-    gchar *key;
-    GType gtype;
-    GValue value = {0,};
-
-    key = _helper_wrap_get_string(pykey);
-    
-    if (key == NULL)
-        return 0;
-
-    gtype = xed_message_get_key_type(message, key);
-    
-    if (gtype == 0) {
-        PyErr_SetString(PyExc_TypeError, "invalid key");
-        g_free (key);
-        return 0;
-    }
-
-    g_value_init(&value, gtype);
-    
-    if (_helper_wrap_get_gvalue_from_pyobject (&value, pyvalue)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "value is of the wrong type for this key");
-        g_free (key);
-        return 0;
-    }
-
-    xed_message_set_value(message, key, &value);
-    g_value_unset(&value);
-    g_free (key);
-    
-    return 1;
-}
-
-typedef void (*ParsePairFunc)(PyObject *key, PyObject *value, gpointer user_data);
-
-static void
-_helper_parse_pairs_dict (PyObject *dict, ParsePairFunc func, gpointer user_data)
-{
-    if (!dict)
-        return;
-    
-    PyObject *key, *value;
-    Py_ssize_t i = 0;
-    
-    while (PyDict_Next(dict, &i, &key, &value))
-    {
-        func(key, value, user_data);
-    }
-}
-
-static void
-_helper_parse_pairs(PyObject *args, PyObject *kwargs, ParsePairFunc func, gpointer user_data)
-{
-    guint len;
-    guint i;
-    
-    len = PyTuple_Size(args);
-    
-    for (i = 0; i < len; ++i)
-    {
-    	PyObject *d = PyTuple_GetItem(args, i);
-    	
-    	if (PyDict_Check(d))
-            _helper_parse_pairs_dict(d, func, user_data);
-    }
-  
-    _helper_parse_pairs_dict(kwargs, func, user_data);  
-}
-
-static void
-_helper_message_set(PyObject *key, PyObject *value, XedMessage *message)
-{
-    _helper_wrap_message_set_value(message, key, value);
-}
-
-static void
-_helper_message_set_values(XedMessage *message, PyObject *args, PyObject *kwargs)
-{
-    _helper_parse_pairs(args, kwargs, (ParsePairFunc)_helper_message_set, message);
-}
-
-static XedMessage *
-_helper_wrap_create_message(XedMessageBus *bus, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *pydict;
-    
-    if (!PyArg_ParseTuple(args, "OO|O:XedMessage.create", &pypath, &pymethod, &pydict))
-        return NULL;
-    
-    gchar *object_path = _helper_wrap_get_string(pypath);
-    gchar *method = _helper_wrap_get_string(pymethod);
-    
-    XedMessageType *message_type = xed_message_bus_lookup (bus, object_path, method);
-    XedMessage *message;
-     
-    if (message_type)
-    {
-        message = xed_message_type_instantiate(message_type, NULL);
-        _helper_message_set_values(message, args, kwargs);
-    }
-    else
-    {
-    	PyErr_SetString(PyExc_StandardError, "Message type does not exist");
-        message = NULL;
-    }
-    
-    g_free(object_path);
-    g_free(method);
-    
-    return message;
-}
-
-typedef struct {
-    PyObject *func;
-    PyObject *data;
-} PyXedCustomNotify;
-
-static void 
-pyxed_custom_destroy_notify(gpointer user_data)
-{
-    PyXedCustomNotify *cunote = user_data;
-    PyGILState_STATE state;
-    
-    g_return_if_fail(user_data);
-    state = pyg_gil_state_ensure();
-    Py_XDECREF(cunote->func);
-    Py_XDECREF(cunote->data);
-    pyg_gil_state_release(state);
-    
-    g_free(cunote);
-}
-%%
-ignore-glob
-  *_get_type
-  xed_message_type_foreach
-  xed_message_type_instantiate_valist
-  xed_message_type_new_valist
-  xed_message_get_valist
-  xed_message_set_valist
-  xed_message_set_valuesv
-  xed_message_bus_disconnect_by_func
-  xed_message_bus_block_by_func
-  xed_message_bus_unblock_by_func
-%%
-override xed_message_type_new kwargs
-
-typedef struct
-{
-    XedMessageType *message_type;
-    PyObject *optional;
-} MessageTypeSetInfo;
-
-static void
-_message_type_set(PyObject *key, PyObject *value, MessageTypeSetInfo *info)
-{
-    GType gtype;
-    
-    gchar *k = _helper_wrap_get_string(key);
-
-    if (!k)
-        return;
-
-    gtype = _helper_wrap_get_gtype_from_pytype(value);
-    
-    gboolean optional = info->optional && PySequence_Contains(info->optional, key);
-    
-    xed_message_type_set(info->message_type, optional, k, gtype, NULL);
-    g_free(k);
-}
-
-static int
-_wrap_xed_message_type_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *optional = NULL, *pydict;
-    
-    if (!PyArg_ParseTuple(args, "OO|OO:XedMessageType.new", &pypath, &pymethod, &optional, &pydict))
-        return -1;
-    
-    XedMessageType *message_type = XED_MESSAGE_TYPE(g_object_new(pyg_type_from_object((PyObject *) self), NULL));
-    
-    MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
-    _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
-    
-    self->obj = (GObject *)message_type;    
-    pygobject_register_wrapper((PyObject *) self);
-    
-    return 0;
-}
-%%
-override xed_message_type_instantiate kwargs
-static PyObject *
-_wrap_xed_message_type_instantiate(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    XedMessageType *message_type = XED_MESSAGE_TYPE (self->obj);
-    XedMessage *message = xed_message_type_instantiate(message_type, NULL);
-    
-    _helper_message_set_values(message, args, kwargs);
-    
-    return pygobject_new((GObject *)message);
-}
-%%
-override xed_message_get args
-static PyObject *
-_wrap_xed_message_get(PyGObject *self, PyObject *args)
-{
-    guint len, i;
-    PyObject *ret;
-
-    len = PyTuple_Size(args);
-    
-    ret = PyTuple_New(len);
-    
-    for (i = 0; i < len; i++) {
-        GValue value = { 0, };
-        PyObject *py_key = PyTuple_GetItem(args, i);
-        gchar *key = _helper_wrap_get_string(py_key);
-        
-        if (!key) {
-	    PyErr_SetString(PyExc_TypeError, "keys must be strings");
-	    Py_DECREF(ret);
-	    return NULL;
-	}
-	
-	xed_message_get_value (XED_MESSAGE (self->obj), key, &value);
-	g_free (key);
-
-	PyTuple_SetItem(ret, i, pyg_value_as_pyobject(&value, TRUE));
-	g_value_unset(&value);
-    }
-    
-    return ret;
-}
-%%
-override xed_message_get_value kwargs
-static PyObject *
-_wrap_xed_message_get_value(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "key", NULL };
-    const gchar *key;
-    PyObject *ret;
-    GValue value = { 0, };
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XedMessage.get_value", kwlist, &key))
-        return NULL;
-
-    xed_message_get_value(XED_MESSAGE(self->obj), key, &value);
-    ret = pyg_value_as_pyobject(&value, TRUE);
-    g_value_unset(&value);
-    
-    return ret;
-}
-%%
-override xed_message_set_value kwargs
-static PyObject *
-_wrap_xed_message_set_value(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "key", "value", NULL };
-    PyObject *pykey, *pyvalue;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO:XedMessage.set_value", kwlist, &pykey, &pyvalue))
-        return NULL;
-    
-    if (!_helper_wrap_message_set_value(XED_MESSAGE(self->obj), pykey, pyvalue))
-        return NULL;
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xed_message_set kwargs
-static PyObject *
-_wrap_xed_message_set (PyGObject *self, PyObject *args, PyObject *kwargs) {
-    _helper_message_set_values(XED_MESSAGE(self->obj), args, kwargs);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xed_message_bus_new
-static int
-_wrap_xed_message_bus_new(PyGObject *self)
-{
-    pygobject_construct (self, NULL);
-    
-    if (!self->obj) {
-        PyErr_SetString (PyExc_RuntimeError, "could not create xed.MessageBus object");
-        return -1;
-    }
-
-    return 0;
-}
-%%
-new-constructor XED_TYPE_MESSAGE_BUS
-%%
-override xed_message_bus_register kwargs
-static PyObject *
-_wrap_xed_message_bus_register(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *optional = NULL, *pydict;
-    XedMessageBus *bus = XED_MESSAGE_BUS(self->obj);
-
-    if (!PyArg_ParseTuple(args, "OO|OO:XedMessageBus.register", &pypath, &pymethod, &optional, &pydict))
-        return NULL;
-    
-    gchar *object_path = _helper_wrap_get_string(pypath);
-    gchar *method = _helper_wrap_get_string(pymethod);
-    
-    XedMessageType *message_type = xed_message_bus_register(bus, object_path, method, 0, NULL);
-    
-    g_free(object_path);
-    g_free(method);
-    
-    if (!message_type)
-    {
-    	PyErr_SetString(PyExc_StandardError, "Message type already exists");
-    	return NULL;
-    }
-    
-    MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
-    _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
-    
-    return pyg_boxed_new(XED_TYPE_MESSAGE_TYPE, message_type, TRUE, TRUE);
-}
-%%
-override xed_message_bus_connect kwargs
-static void
-pyxed_message_bus_connect_cb(XedMessageBus *bus, XedMessage *message, gpointer data)
-{
-    PyGILState_STATE state;
-    PyXedCustomNotify *cunote = data;
-    PyObject *pybus, *pymessage, *retobj;
-
-    g_assert(cunote->func);
-
-    state = pyg_gil_state_ensure();
-
-    pybus = pygobject_new((GObject *)bus);
-    pymessage = pygobject_new((GObject *)message);
-
-    if (cunote->data) {
-        retobj = PyEval_CallFunction(cunote->func, "(NNO)", pybus, pymessage, cunote->data);
-    } else {
-        retobj = PyEval_CallFunction(cunote->func, "(NN)", pybus, pymessage);
-    }
-
-    if (PyErr_Occurred()) {
-        PyErr_Print();
-    }
-
-    Py_XDECREF(retobj);
-
-    pyg_gil_state_release(state);
-}
-
-static PyObject *
-_wrap_xed_message_bus_connect(PyGObject *self, PyObject *args, PyObject *kwargs) 
-{
-    static char *kwlist[] = { "domain", "name", "func", "data", NULL };
-    PyObject *pyfunc, *pyarg = NULL;
-    const gchar *domain;
-    const gchar *name;
-    PyXedCustomNotify *cunote;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "ssO|O:XedMessageBus.connect",
-				     kwlist, &domain, &name, &pyfunc, &pyarg))
-        return NULL;
-
-    if (!PyCallable_Check(pyfunc)) {
-        PyErr_SetString(PyExc_TypeError, "func must be a callable object");
-        return NULL;
-    }
-    cunote = g_new(PyXedCustomNotify, 1);
-    Py_INCREF(pyfunc);
-    cunote->func = pyfunc;
-    Py_XINCREF(pyarg);
-    cunote->data = pyarg;
-
-    guint id = xed_message_bus_connect(XED_MESSAGE_BUS(self->obj),
-                                         domain,
-                                         name,
-                                         pyxed_message_bus_connect_cb,
-                                         (gpointer)cunote,
-                                         pyxed_custom_destroy_notify);
-    return PyLong_FromUnsignedLong(id);
-}
-%%
-override xed_message_bus_send kwargs
-static PyObject *
-_wrap_xed_message_bus_send(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    /* create a new message object */
-    XedMessage *message;
-    XedMessageBus *bus = XED_MESSAGE_BUS(self->obj);
-    message = _helper_wrap_create_message(bus, args, kwargs);
-    
-    if (!message)
-        return NULL;
-    
-    xed_message_bus_send_message(bus, message);
-    g_object_unref (message);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xed_message_bus_send_sync kwargs
-static PyObject *
-_wrap_xed_message_bus_send_sync(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    /* create a new message object */
-    XedMessage *message;
-    XedMessageBus *bus = XED_MESSAGE_BUS(self->obj);
-    
-    message = _helper_wrap_create_message(bus, args, kwargs);
-    
-    if (!message)
-        return NULL;
-    
-    xed_message_bus_send_message_sync(bus, message);
-    return pygobject_new((GObject *)message);
-}
-%%
-override-slot XedMessage.tp_getattro
-static PyObject *
-_wrap_xed_message_tp_getattro(PyObject *self, PyObject *attrname)
-{
-	XedMessage *message = XED_MESSAGE(((PyGObject *)self)->obj);
-	XedMessageType *type;
-
-	gchar *name = _helper_wrap_get_string (attrname);
-	gboolean exists;
-	gboolean intype;
-	PyObject *ret;
-	
-	if (name == NULL)
-	{
-		PyErr_SetString(PyExc_TypeError, "attr name somehow not a string");
-		return NULL;
-	}
-	
-	g_object_get (message, "type", &type, NULL);
-	intype = xed_message_type_lookup (type, name) != G_TYPE_INVALID;
-	xed_message_type_unref (type);
-	
-	exists = xed_message_has_key (message, name);
-	
-	if (!intype)
-	{
-		ret = PyObject_GenericGetAttr(self, attrname);
-	}
-	else if (exists)
-	{
-		GValue value = { 0, };
-		xed_message_get_value (message, name, &value);
-		ret = pyg_value_as_pyobject(&value, TRUE);
-		g_value_unset (&value);
-	}
-	else
-	{
-		Py_INCREF(Py_None);
-		ret = Py_None;
-	}
-
-	g_free (name);
-	return ret;
-}
-%%
-override-slot XedMessage.tp_setattro
-static int
-_wrap_xed_message_tp_setattro(PyObject *self, PyObject *attrname, PyObject *value)
-{
-	XedMessage *message = XED_MESSAGE(((PyGObject *)self)->obj);
-
-	if (!_helper_wrap_message_set_value(message, attrname, value))
-	{
-		return PyObject_GenericSetAttr(self, attrname, value);
-	}
-	else
-	{
-		return 1;
-	}
-}

plugin-loaders/python/bindings/xedplugin.override

@@ -1,193 +0,0 @@
-%%
-headers
-#include <xed/xed-plugin.h>
-#include <xed/xed-window.h>
-%%
-override xed_plugin_activate kwargs
-static PyObject *
-_wrap_xed_plugin_activate(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	gpointer klass, klass2;
-	static char *kwlist[] = { "window", NULL };
-	PyGObject *window;
-	PyObject *cls = (PyObject *)(((PyObject *)self)->ob_type);
-	
-	if (!PyArg_ParseTupleAndKeywords (args, 
-					  kwargs,
-					  "O!:XedPlugin.activate", 
-					  kwlist,
-					  &PyXedWindow_Type, 
-					  &window))
-		return NULL;
-
-	klass = g_type_class_ref (pyg_type_from_object (cls));
-	
-	if (XED_IS_PLUGIN_PYTHON_CLASS (klass))
-	{
-		klass2 = g_type_class_peek_parent (klass);
-		g_type_class_unref (klass);
-		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
-	}
-
-	if (XED_PLUGIN_CLASS (klass)->activate)
-		XED_PLUGIN_CLASS (klass)->activate (XED_PLUGIN (self->obj), 
-						      XED_WINDOW (window->obj));
-	else {
-		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method XedPlugin.activate not implemented");
-		g_type_class_unref (klass);
-		return NULL;
-	}
-
-	g_type_class_unref (klass);
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-%%
-override xed_plugin_deactivate kwargs
-static PyObject *
-_wrap_xed_plugin_deactivate(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	gpointer klass, klass2;
-	static char *kwlist[] = {"window", NULL};
-	PyGObject *window;
-	PyObject *cls = (PyObject *)(((PyObject *)self)->ob_type);
-
-	if (!PyArg_ParseTupleAndKeywords (args, 
-					  kwargs,
-					  "O!:XedPlugin.deactivate", 
-					  kwlist,
-					  &PyXedWindow_Type, 
-					  &window))
-		return NULL;
-
-	klass = g_type_class_ref (pyg_type_from_object (cls));
-
-	if (XED_IS_PLUGIN_PYTHON_CLASS (klass))
-	{
-		klass2 = g_type_class_peek_parent (klass);
-		g_type_class_unref (klass);
-		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
-	}
-	
-	if (XED_PLUGIN_CLASS (klass)->deactivate)
-		XED_PLUGIN_CLASS (klass)->deactivate (XED_PLUGIN (self->obj), 
-							XED_WINDOW (window->obj));
-	else {
-		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method XedPlugin.deactivate not implemented");
-		g_type_class_unref (klass);
-		return NULL;
-	}
-
-	g_type_class_unref (klass);
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-%%
-override xed_plugin_update_ui kwargs
-static PyObject *
-_wrap_xed_plugin_update_ui (PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	gpointer klass, klass2;
-	static char *kwlist[] = {"window", NULL};
-	PyGObject *window;
-	PyObject *cls = (PyObject *)(((PyObject *)self)->ob_type);
-
-	if (!PyArg_ParseTupleAndKeywords (args, 
-					  kwargs,
-					  "O!:XedPlugin.update_ui", 
-					  kwlist,
-					  &PyXedWindow_Type, 
-					  &window))
-		return NULL;
-
-	klass = g_type_class_ref (pyg_type_from_object (cls));
-
-	if (XED_IS_PLUGIN_PYTHON_CLASS (klass))
-	{
-		klass2 = g_type_class_peek_parent (klass);
-		g_type_class_unref (klass);
-		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
-	}
-	
-	if (XED_PLUGIN_CLASS (klass)->update_ui)
-		XED_PLUGIN_CLASS (klass)->update_ui (XED_PLUGIN (self->obj), 
-						       XED_WINDOW (window->obj));
-	else {
-		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method XedPlugin.update_ui not implemented");
-		g_type_class_unref (klass);
-		return NULL;
-	}
-
-	g_type_class_unref (klass);
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-%%
-override xed_plugin_is_configurable
-static PyObject *
-_wrap_xed_plugin_is_configurable (PyGObject *self)
-{
-	int ret;
-	gpointer klass, klass2;
-	PyObject *cls = (PyObject *)(((PyObject *)self)->ob_type);
-
-	klass = g_type_class_ref (pyg_type_from_object (cls));
-
-	if (XED_IS_PLUGIN_PYTHON_CLASS (klass))
-	{
-		klass2 = g_type_class_peek_parent (klass);
-		g_type_class_unref (klass);
-		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
-	}
-	
-	if (XED_PLUGIN_CLASS (klass)->is_configurable)
-		ret = XED_PLUGIN_CLASS (klass)->is_configurable (XED_PLUGIN (self->obj));
-	else {
-		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method XedPlugin.is_configurable not implemented");
-		g_type_class_unref (klass);
-		return NULL;
-	}
-
-	g_type_class_unref (klass);
-	return PyBool_FromLong (ret);
-}
-
-%%
-override xed_plugin_configure_dialog
-static PyObject *
-_wrap_xed_plugin_create_configure_dialog (PyGObject *self)
-{
-	GtkWidget *ret;
-	gpointer klass, klass2;
-	PyObject *cls = (PyObject *)(((PyObject *)self)->ob_type);
-
-	klass = g_type_class_ref(pyg_type_from_object (cls));
-
-	if (XED_IS_PLUGIN_PYTHON_CLASS (klass))
-	{
-		klass2 = g_type_class_peek_parent (klass);
-		g_type_class_unref (klass);
-		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
-	}
-	
-	if (XED_PLUGIN_CLASS (klass)->create_configure_dialog)
-		ret = XED_PLUGIN_CLASS (klass)->create_configure_dialog (XED_PLUGIN (self->obj));
-	else {
-		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method XedPlugin.create_configure_dialog not implemented");
-		g_type_class_unref (klass);
-		return NULL;
-	}
-
-	g_type_class_unref (klass);
-
-	/* pygobject_new handles NULL checking */
-	return pygobject_new ((GObject *)ret);
-}

plugin-loaders/python/bindings/xedutils.defs

@@ -1,67 +0,0 @@
-;; -*- scheme -*-
-
-;; From ../../xed/xed-utils.h
-
-(define-function uri_has_writable_scheme
-  (c-name "xed_utils_uri_has_writable_scheme")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "uri")
-  )
-)
-
-(define-function uri_has_file_scheme
-  (c-name "xed_utils_uri_has_file_scheme")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "uri")
-  )
-)
-
-(define-function uri_exists
-  (c-name "xed_utils_uri_exists")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "text_uri")
-  )
-)
-
-(define-function uri_is_valid
-  (c-name "xed_utils_is_valid_uri")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "uri")
-  )
-)
-
-(define-function uri_get_dirname
-  (c-name "xed_utils_uri_get_dirname")
-  (return-type "gchar*")
-  (parameters
-    '("const-char*" "uri")
-  )
-)
-
-(define-function menu_position_under_widget
-  (c-name "xed_utils_menu_position_under_widget")
-  (return-type "none")
-  (parameters
-    '("GtkMenu*" "menu")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gboolean*" "push_in")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-function menu_position_under_tree_view
-  (c-name "xed_utils_menu_position_under_tree_view")
-  (return-type "none")
-  (parameters
-    '("GtkMenu*" "menu")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gboolean*" "push_in")
-    '("gpointer" "user_data")
-  )
-)

plugin-loaders/python/bindings/xedutils.override

@@ -1,85 +0,0 @@
-%%
-headers
-#define NO_IMPORT_PYGOBJECT
-#define NO_IMPORT_PYGTK
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-#include "xed-utils.h"
-
-void pyxedutils_register_classes (PyObject *d);
-void pyxedutils_add_constants (PyObject *module, const gchar *strip_prefix);
-
-%%
-modulename xed.utils
-%%
-import gtk.Widget as PyGtkWidget_Type
-import gtk.TreeView as PyGtkTreeView_Type
-import gtk.Menu as PyGtkMenu_Type
-%%
-ignore-glob
-  _*
-%%
-override xed_utils_menu_position_under_widget kwargs
-static PyObject *
-_wrap_xed_utils_menu_position_under_widget (PyObject *self,
-					      PyObject *args,
-					      PyObject *kwargs)
-{
-	static char *kwlist[] = { "menu", "widget", NULL };
-	PyObject *py_menu, *py_widget;
-	GtkMenu *menu;
-	GtkWidget *widget;
-	gint x, y;
-	gboolean push_in;
-	PyObject *tuple;
-	
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-					  "O!O!", kwlist,
-					  &PyGtkMenu_Type, &py_menu,
-					  &PyGtkWidget_Type, &py_widget))
-		return NULL;
-	
-	menu   = GTK_MENU (pygobject_get (py_menu));
-	widget = GTK_WIDGET (pygobject_get (py_widget));
-
-	xed_utils_menu_position_under_widget (menu, &x, &y, &push_in, widget);
-
-	tuple = PyTuple_New (3);
-	PyTuple_SetItem (tuple, 0, PyInt_FromLong (x));
-	PyTuple_SetItem (tuple, 1, PyInt_FromLong (y));
-	PyTuple_SetItem (tuple, 2, PyBool_FromLong (push_in));
-	return tuple;
-}
-%%
-override xed_utils_menu_position_under_tree_view kwargs
-static PyObject *
-_wrap_xed_utils_menu_position_under_tree_view (PyObject *self,
-					         PyObject *args,
-					         PyObject *kwargs)
-{
-	static char *kwlist[] = { "menu", "tree_view", NULL };
-	PyObject *py_menu, *py_view;
-	GtkMenu *menu;
-	GtkTreeView *view;
-	gint x, y;
-	gboolean push_in;
-	PyObject *tuple;
-	
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-					  "O!O!", kwlist,
-					  &PyGtkMenu_Type, &py_menu,
-					  &PyGtkTreeView_Type, &py_view))
-		return NULL;
-	
-	menu = GTK_MENU (pygobject_get (py_menu));
-	view = GTK_TREE_VIEW (pygobject_get (py_view));
-
-	xed_utils_menu_position_under_widget (menu, &x, &y, &push_in, view);
-
-	tuple = PyTuple_New (3);
-	PyTuple_SetItem (tuple, 0, PyInt_FromLong (x));
-	PyTuple_SetItem (tuple, 1, PyInt_FromLong (y));
-	PyTuple_SetItem (tuple, 2, PyBool_FromLong (push_in));
-	return tuple;
-}

plugin-loaders/python/xed-plugin-loader-python.c

@@ -1,719 +0,0 @@
-/*
- * xed-plugin-loader-python.c
- * This file is part of xed
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#include "xed-plugin-loader-python.h"
-#include "xed-plugin-python.h"
-#include <xed/xed-object-module.h>
-
-#define NO_IMPORT_PYGOBJECT
-#define NO_IMPORT_PYGTK
-
-#include <Python.h>
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-#include <signal.h>
-#include "config.h"
-
-#if PY_VERSION_HEX < 0x02050000
-typedef int Py_ssize_t;
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#endif
-
-#define XED_PLUGIN_LOADER_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), XED_TYPE_PLUGIN_LOADER_PYTHON, XedPluginLoaderPythonPrivate))
-
-struct _XedPluginLoaderPythonPrivate
-{
-	GHashTable *loaded_plugins;
-	guint idle_gc;
-	gboolean init_failed;
-};
-
-typedef struct
-{
-	PyObject *type;
-	PyObject *instance;
-	gchar    *path;
-} PythonInfo;
-
-static void xed_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
-
-/* Exported by pyxed module */
-void pyxed_register_classes (PyObject *d);
-void pyxed_add_constants (PyObject *module, const gchar *strip_prefix);
-extern PyMethodDef pyxed_functions[];
-
-/* Exported by pyxedutils module */
-void pyxedutils_register_classes (PyObject *d);
-extern PyMethodDef pyxedutils_functions[];
-
-/* Exported by pyxedcommands module */
-void pyxedcommands_register_classes (PyObject *d);
-extern PyMethodDef pyxedcommands_functions[];
-
-/* We retreive this to check for correct class hierarchy */
-static PyTypeObject *PyXedPlugin_Type;
-
-XED_PLUGIN_LOADER_REGISTER_TYPE (XedPluginLoaderPython, xed_plugin_loader_python, G_TYPE_OBJECT, xed_plugin_loader_iface_init);
-
-
-static PyObject *
-find_python_plugin_type (XedPluginInfo *info,
-			 PyObject        *pymodule)
-{
-	PyObject *locals, *key, *value;
-	Py_ssize_t pos = 0;
-	
-	locals = PyModule_GetDict (pymodule);
-
-	while (PyDict_Next (locals, &pos, &key, &value))
-	{
-		if (!PyType_Check(value))
-			continue;
-
-		if (PyObject_IsSubclass (value, (PyObject*) PyXedPlugin_Type))
-			return value;
-	}
-	
-	g_warning ("No XedPlugin derivative found in Python plugin '%s'",
-		   xed_plugin_info_get_name (info));
-	return NULL;
-}
-
-static XedPlugin *
-new_plugin_from_info (XedPluginLoaderPython *loader,
-		      XedPluginInfo         *info)
-{
-	PythonInfo *pyinfo;
-	PyTypeObject *pytype;
-	PyObject *pyobject;
-	PyGObject *pygobject;
-	XedPlugin *instance;
-	PyObject *emptyarg;
-
-	pyinfo = (PythonInfo *)g_hash_table_lookup (loader->priv->loaded_plugins, info);
-	
-	if (pyinfo == NULL)
-		return NULL;
-	
-	pytype = (PyTypeObject *)pyinfo->type;
-	
-	if (pytype->tp_new == NULL)
-		return NULL;
-
-	emptyarg = PyTuple_New(0);
-	pyobject = pytype->tp_new (pytype, emptyarg, NULL);
-	Py_DECREF (emptyarg);
-	
-	if (pyobject == NULL)
-	{
-		g_error ("Could not create instance for %s.", xed_plugin_info_get_name (info));
-		return NULL;
-	}
-
-	pygobject = (PyGObject *)pyobject;
-	
-	if (pygobject->obj != NULL)
-	{
-		Py_DECREF (pyobject);
-		g_error ("Could not create instance for %s (GObject already initialized).", xed_plugin_info_get_name (info));
-		return NULL;
-	}
-	
-	pygobject_construct (pygobject,
-			     "install-dir", pyinfo->path,
-			     "data-dir-name", xed_plugin_info_get_module_name (info),
-			     NULL);
-	
-	if (pygobject->obj == NULL)
-	{
-		g_error ("Could not create instance for %s (GObject not constructed).", xed_plugin_info_get_name (info));
-		Py_DECREF (pyobject);
-
-		return NULL;
-	}
-
-	/* now call tp_init manually */
-	if (PyType_IsSubtype (pyobject->ob_type, pytype) && 
-	    pyobject->ob_type->tp_init != NULL)
-	{
-		emptyarg = PyTuple_New(0);
-		pyobject->ob_type->tp_init (pyobject, emptyarg, NULL);
-		Py_DECREF (emptyarg);
-	}
-
-	instance = XED_PLUGIN (pygobject->obj);
-	pyinfo->instance = (PyObject *)pygobject;
-
-	/* make sure to register the python instance for the XedPluginPython
-	   object to it can wrap the virtual xed plugin funcs back to python */
-	_xed_plugin_python_set_instance (XED_PLUGIN_PYTHON (instance), (PyObject *)pygobject);
-	
-	/* we return a reference here because the other is owned by python */
-	return XED_PLUGIN (g_object_ref (instance));
-}
-
-static XedPlugin *
-add_python_info (XedPluginLoaderPython *loader,
-		 XedPluginInfo         *info,
-		 PyObject		 *module,
-		 const gchar             *path,
-		 PyObject                *type)
-{
-	PythonInfo *pyinfo;
-	
-	pyinfo = g_new (PythonInfo, 1);
-	pyinfo->path = g_strdup (path);
-	pyinfo->type = type;
-
-	Py_INCREF (pyinfo->type);
-	
-	g_hash_table_insert (loader->priv->loaded_plugins, info, pyinfo);
-	
-	return new_plugin_from_info (loader, info);
-}
-
-static const gchar *
-xed_plugin_loader_iface_get_id (void)
-{
-	return "Python";
-}
-
-static XedPlugin *
-xed_plugin_loader_iface_load (XedPluginLoader *loader,
-				XedPluginInfo   *info,
-				const gchar       *path)
-{
-	XedPluginLoaderPython *pyloader = XED_PLUGIN_LOADER_PYTHON (loader);
-	PyObject *main_module, *main_locals, *pytype;
-	PyObject *pymodule, *fromlist;
-	gchar *module_name;
-	XedPlugin *result;
-	
-	if (pyloader->priv->init_failed)
-	{
-		g_warning ("Cannot load python plugin Python '%s' since xed was"
-		           "not able to initialize the Python interpreter.",
-		           xed_plugin_info_get_name (info));
-		return NULL;
-	}
-	
-	/* see if py definition for the plugin is already loaded */
-	result = new_plugin_from_info (pyloader, info);
-	
-	if (result != NULL)
-		return result;
-	
-	main_module = PyImport_AddModule ("xed.plugins");
-	if (main_module == NULL)
-	{
-		g_warning ("Could not get xed.plugins.");
-		return NULL;
-	}
-	
-	/* If we have a special path, we register it */
-	if (path != NULL)
-	{
-		PyObject *sys_path = PySys_GetObject ("path");
-		PyObject *pypath = PyString_FromString (path);
-
-		if (PySequence_Contains (sys_path, pypath) == 0)
-			PyList_Insert (sys_path, 0, pypath);
-
-		Py_DECREF (pypath);
-	}
-	
-	main_locals = PyModule_GetDict (main_module);
-	
-	/* we need a fromlist to be able to import modules with a '.' in the
-	   name. */
-	fromlist = PyTuple_New(0);
-	module_name = g_strdup (xed_plugin_info_get_module_name (info));
-	
-	pymodule = PyImport_ImportModuleEx (module_name, 
-					    main_locals, 
-					    main_locals, 
-					    fromlist);
-	
-	Py_DECREF(fromlist);
-
-	if (!pymodule)
-	{
-		g_free (module_name);
-		PyErr_Print ();
-		return NULL;
-	}
-
-	PyDict_SetItemString (main_locals, module_name, pymodule);
-	g_free (module_name);
-	
-	pytype = find_python_plugin_type (info, pymodule);
-	
-	if (pytype)
-		return add_python_info (pyloader, info, pymodule, path, pytype);
-
-	return NULL;
-}
-
-static void
-xed_plugin_loader_iface_unload (XedPluginLoader *loader,
-				  XedPluginInfo   *info)
-{
-	XedPluginLoaderPython *pyloader = XED_PLUGIN_LOADER_PYTHON (loader);
-	PythonInfo *pyinfo;
-	PyGILState_STATE state;
-	
-	pyinfo = (PythonInfo *)g_hash_table_lookup (pyloader->priv->loaded_plugins, info);
-	
-	if (!pyinfo)
-		return;
-	
-	state = pyg_gil_state_ensure ();
-	Py_XDECREF (pyinfo->instance);
-	pyg_gil_state_release (state);
-	
-	pyinfo->instance = NULL;
-}
-
-static gboolean
-run_gc (XedPluginLoaderPython *loader)
-{
-	while (PyGC_Collect ())
-		;
-
-	loader->priv->idle_gc = 0;
-	return FALSE;
-}
-
-static void
-xed_plugin_loader_iface_garbage_collect (XedPluginLoader *loader)
-{
-	XedPluginLoaderPython *pyloader;
-	
-	if (!Py_IsInitialized())
-		return;
-
-	pyloader = XED_PLUGIN_LOADER_PYTHON (loader);
-
-	/*
-	 * We both run the GC right now and we schedule
-	 * a further collection in the main loop.
-	 */
-
-	while (PyGC_Collect ())
-		;
-
-	if (pyloader->priv->idle_gc == 0)
-		pyloader->priv->idle_gc = g_idle_add ((GSourceFunc)run_gc, pyloader);
-}
-
-static void
-xed_plugin_loader_iface_init (gpointer g_iface, 
-				gpointer iface_data)
-{
-	XedPluginLoaderInterface *iface = (XedPluginLoaderInterface *)g_iface;
-	
-	iface->get_id = xed_plugin_loader_iface_get_id;
-	iface->load = xed_plugin_loader_iface_load;
-	iface->unload = xed_plugin_loader_iface_unload;
-	iface->garbage_collect = xed_plugin_loader_iface_garbage_collect;
-}
-
-static void
-xed_python_shutdown (XedPluginLoaderPython *loader)
-{
-	if (!Py_IsInitialized ())
-		return;
-
-	if (loader->priv->idle_gc != 0)
-	{
-		g_source_remove (loader->priv->idle_gc);
-		loader->priv->idle_gc = 0;
-	}
-
-	while (PyGC_Collect ())
-		;	
-
-	Py_Finalize ();
-}
-
-
-/* C equivalent of
- *    import pygtk
- *    pygtk.require ("2.0")
- */
-static gboolean
-xed_check_pygtk2 (void)
-{
-	PyObject *pygtk, *mdict, *require;
-
-	/* pygtk.require("2.0") */
-	pygtk = PyImport_ImportModule ("pygtk");
-	if (pygtk == NULL)
-	{
-		g_warning ("Error initializing Python interpreter: could not import pygtk.");
-		return FALSE;
-	}
-
-	mdict = PyModule_GetDict (pygtk);
-	require = PyDict_GetItemString (mdict, "require");
-	PyObject_CallObject (require,
-			     Py_BuildValue ("(S)", PyString_FromString ("2.0")));
-	if (PyErr_Occurred())
-	{
-		g_warning ("Error initializing Python interpreter: pygtk 2 is required.");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Note: the following two functions are needed because
- * init_pyobject and init_pygtk which are *macros* which in case
- * case of error set the PyErr and then make the calling
- * function return behind our back.
- * It's up to the caller to check the result with PyErr_Occurred()
- */
-static void
-xed_init_pygobject (void)
-{
-	init_pygobject_check (2, 11, 5); /* FIXME: get from config */
-}
-
-static void
-xed_init_pygtk (void)
-{
-	PyObject *gtk, *mdict, *version, *required_version;
-
-	init_pygtk ();
-
-	/* there isn't init_pygtk_check(), do the version
-	 * check ourselves */
-	gtk = PyImport_ImportModule("gtk");
-	mdict = PyModule_GetDict(gtk);
-	version = PyDict_GetItemString (mdict, "pygtk_version");
-	if (!version)
-	{
-		PyErr_SetString (PyExc_ImportError,
-				 "PyGObject version too old");
-		return;
-	}
-
-	required_version = Py_BuildValue ("(iii)", 2, 4, 0); /* FIXME */
-
-	if (PyObject_Compare (version, required_version) == -1)
-	{
-		PyErr_SetString (PyExc_ImportError,
-				 "PyGObject version too old");
-		Py_DECREF (required_version);
-		return;
-	}
-
-	Py_DECREF (required_version);
-}
-
-static void
-old_gtksourceview_init (void)
-{
-	PyErr_SetString(PyExc_ImportError,
-			"gtksourceview module not allowed, use gtksourceview2");
-}
-
-static void
-xed_init_pygtksourceview (void)
-{
-	PyObject *gtksourceview, *mdict, *version, *required_version;
-
-	gtksourceview = PyImport_ImportModule("gtksourceview2");
-	if (gtksourceview == NULL)
-	{
-		PyErr_SetString (PyExc_ImportError,
-				 "could not import gtksourceview");
-		return;
-	}
-
-	mdict = PyModule_GetDict (gtksourceview);
-	version = PyDict_GetItemString (mdict, "pygtksourceview2_version");
-	if (!version)
-	{
-		PyErr_SetString (PyExc_ImportError,
-				 "PyGtkSourceView version too old");
-		return;
-	}
-
-	required_version = Py_BuildValue ("(iii)", 0, 8, 0); /* FIXME */
-
-	if (PyObject_Compare (version, required_version) == -1)
-	{
-		PyErr_SetString (PyExc_ImportError,
-				 "PyGtkSourceView version too old");
-		Py_DECREF (required_version);
-		return;
-	}
-
-	Py_DECREF (required_version);
-
-	/* Create a dummy 'gtksourceview' module to prevent
-	 * loading of the old 'gtksourceview' modules that
-	 * has conflicting symbols with the gtksourceview2 module.
-	 * Raise an exception when trying to import it.
-	 */
-	PyImport_AppendInittab ("gtksourceview", old_gtksourceview_init);
-}
-
-static gboolean
-xed_python_init (XedPluginLoaderPython *loader)
-{
-	PyObject *mdict, *tuple;
-	PyObject *xed, *xedutils, *xedcommands, *xedplugins;
-	PyObject *gettext, *install, *gettext_args;
-	//char *argv[] = { "xed", NULL };
-	char *argv[] = { XED_PLUGINS_LIBS_DIR, NULL };
-#ifdef HAVE_SIGACTION
-	gint res;
-	struct sigaction old_sigint;
-#endif
-
-	if (loader->priv->init_failed)
-	{
-		/* We already failed to initialized Python, don't need to
-		 * retry again */
-		return FALSE;
-	}
-	
-	if (Py_IsInitialized ())
-	{
-		/* Python has already been successfully initialized */
-		return TRUE;
-	}
-
-	/* We are trying to initialize Python for the first time,
-	   set init_failed to FALSE only if the entire initialization process
-	   ends with success */
-	loader->priv->init_failed = TRUE;
-
-	/* Hack to make python not overwrite SIGINT: this is needed to avoid
-	 * the crash reported on bug #326191 */
-
-	/* CHECK: can't we use Py_InitializeEx instead of Py_Initialize in order
-          to avoid to manage signal handlers ? - Paolo (Dec. 31, 2006) */
-
-#ifdef HAVE_SIGACTION
-	/* Save old handler */
-	res = sigaction (SIGINT, NULL, &old_sigint);  
-	if (res != 0)
-	{
-		g_warning ("Error initializing Python interpreter: cannot get "
-		           "handler to SIGINT signal (%s)",
-		           g_strerror (errno));
-
-		return FALSE;
-	}
-#endif
-
-	/* Python initialization */
-	Py_Initialize ();
-
-#ifdef HAVE_SIGACTION
-	/* Restore old handler */
-	res = sigaction (SIGINT, &old_sigint, NULL);
-	if (res != 0)
-	{
-		g_warning ("Error initializing Python interpreter: cannot restore "
-		           "handler to SIGINT signal (%s).",
-		           g_strerror (errno));
-
-		goto python_init_error;
-	}
-#endif
-
-	PySys_SetArgv (1, argv);
-
-	if (!xed_check_pygtk2 ())
-	{
-		/* Warning message already printed in check_pygtk2 */
-		goto python_init_error;
-	}
-
-	/* import gobject */	
-	xed_init_pygobject ();
-	if (PyErr_Occurred ())
-	{
-		g_warning ("Error initializing Python interpreter: could not import pygobject.");
-
-		goto python_init_error;		
-	}
-
-	/* import gtk */
-	xed_init_pygtk ();
-	if (PyErr_Occurred ())
-	{
-		g_warning ("Error initializing Python interpreter: could not import pygtk.");
-
-		goto python_init_error;
-	}
-	
-	/* import gtksourceview */
-	xed_init_pygtksourceview ();
-	if (PyErr_Occurred ())
-	{
-		PyErr_Print ();
-
-		g_warning ("Error initializing Python interpreter: could not import pygtksourceview.");
-
-		goto python_init_error;
-	}	
-	
-	/* import xed */
-	xed = Py_InitModule ("xed", pyxed_functions);
-	mdict = PyModule_GetDict (xed);
-
-	pyxed_register_classes (mdict);
-	pyxed_add_constants (xed, "XED_");
-
-	/* xed version */
-	tuple = Py_BuildValue("(iii)", 
-			      XED_MAJOR_VERSION,
-			      XED_MINOR_VERSION,
-			      XED_MICRO_VERSION);
-	PyDict_SetItemString(mdict, "version", tuple);
-	Py_DECREF(tuple);
-	
-	/* Retrieve the Python type for xed.Plugin */
-	PyXedPlugin_Type = (PyTypeObject *) PyDict_GetItemString (mdict, "Plugin"); 
-	if (PyXedPlugin_Type == NULL)
-	{
-		PyErr_Print ();
-
-		goto python_init_error;
-	}
-
-	/* import xed.utils */
-	xedutils = Py_InitModule ("xed.utils", pyxedutils_functions);
-	PyDict_SetItemString (mdict, "utils", xedutils);
-
-	/* import xed.commands */
-	xedcommands = Py_InitModule ("xed.commands", pyxedcommands_functions);
-	PyDict_SetItemString (mdict, "commands", xedcommands);
-
-	/* initialize empty xed.plugins module */
-	xedplugins = Py_InitModule ("xed.plugins", NULL);
-	PyDict_SetItemString (mdict, "plugins", xedplugins);
-
-	mdict = PyModule_GetDict (xedutils);
-	pyxedutils_register_classes (mdict);
-	
-	mdict = PyModule_GetDict (xedcommands);
-	pyxedcommands_register_classes (mdict);
-
-	/* i18n support */
-	gettext = PyImport_ImportModule ("gettext");
-	if (gettext == NULL)
-	{
-		g_warning ("Error initializing Python interpreter: could not import gettext.");
-
-		goto python_init_error;
-	}
-
-	mdict = PyModule_GetDict (gettext);
-	install = PyDict_GetItemString (mdict, "install");
-	gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, XED_LOCALEDIR);
-	PyObject_CallObject (install, gettext_args);
-	Py_DECREF (gettext_args);
-	
-	/* Python has been successfully initialized */
-	loader->priv->init_failed = FALSE;
-	
-	return TRUE;
-	
-python_init_error:
-
-	g_warning ("Please check the installation of all the Python related packages required "
-	           "by xed and try again.");
-
-	PyErr_Clear ();
-
-	xed_python_shutdown (loader);
-
-	return FALSE;
-}
-
-static void
-xed_plugin_loader_python_finalize (GObject *object)
-{
-	XedPluginLoaderPython *pyloader = XED_PLUGIN_LOADER_PYTHON (object);
-	
-	g_hash_table_destroy (pyloader->priv->loaded_plugins);
-	xed_python_shutdown (pyloader);
-
-	G_OBJECT_CLASS (xed_plugin_loader_python_parent_class)->finalize (object);
-}
-
-static void
-xed_plugin_loader_python_class_init (XedPluginLoaderPythonClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	
-	object_class->finalize = xed_plugin_loader_python_finalize;
-
-	g_type_class_add_private (object_class, sizeof (XedPluginLoaderPythonPrivate));
-}
-
-static void
-xed_plugin_loader_python_class_finalize (XedPluginLoaderPythonClass *klass)
-{
-}
-
-static void
-destroy_python_info (PythonInfo *info)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	Py_XDECREF (info->type);	
-	pyg_gil_state_release (state);
-	
-	g_free (info->path);
-	g_free (info);
-}
-
-static void
-xed_plugin_loader_python_init (XedPluginLoaderPython *self)
-{
-	self->priv = XED_PLUGIN_LOADER_PYTHON_GET_PRIVATE (self);
-	
-	/* initialize python interpreter */
-	xed_python_init (self);
-
-	/* loaded_plugins maps XedPluginInfo to a PythonInfo */
-	self->priv->loaded_plugins = g_hash_table_new_full (g_direct_hash,
-						            g_direct_equal,
-						            NULL,
-						            (GDestroyNotify)destroy_python_info);
-}
-
-XedPluginLoaderPython *
-xed_plugin_loader_python_new ()
-{
-	GObject *loader = g_object_new (XED_TYPE_PLUGIN_LOADER_PYTHON, NULL);
-
-	return XED_PLUGIN_LOADER_PYTHON (loader);
-}
-

plugin-loaders/python/xed-plugin-loader-python.h

@@ -1,61 +0,0 @@
-/*
- * xed-plugin-loader-python.h
- * This file is part of xed
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#ifndef __XED_PLUGIN_LOADER_PYTHON_H__
-#define __XED_PLUGIN_LOADER_PYTHON_H__
-
-#include <xed/xed-plugin-loader.h>
-
-G_BEGIN_DECLS
-
-#define XED_TYPE_PLUGIN_LOADER_PYTHON		(xed_plugin_loader_python_get_type ())
-#define XED_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_PLUGIN_LOADER_PYTHON, XedPluginLoaderPython))
-#define XED_PLUGIN_LOADER_PYTHON_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_PLUGIN_LOADER_PYTHON, XedPluginLoaderPython const))
-#define XED_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_PLUGIN_LOADER_PYTHON, XedPluginLoaderPythonClass))
-#define XED_IS_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_PLUGIN_LOADER_PYTHON))
-#define XED_IS_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_PLUGIN_LOADER_PYTHON))
-#define XED_PLUGIN_LOADER_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_PLUGIN_LOADER_PYTHON, XedPluginLoaderPythonClass))
-
-typedef struct _XedPluginLoaderPython		XedPluginLoaderPython;
-typedef struct _XedPluginLoaderPythonClass		XedPluginLoaderPythonClass;
-typedef struct _XedPluginLoaderPythonPrivate	XedPluginLoaderPythonPrivate;
-
-struct _XedPluginLoaderPython {
-	GObject parent;
-	
-	XedPluginLoaderPythonPrivate *priv;
-};
-
-struct _XedPluginLoaderPythonClass {
-	GObjectClass parent_class;
-};
-
-GType xed_plugin_loader_python_get_type (void) G_GNUC_CONST;
-XedPluginLoaderPython *xed_plugin_loader_python_new(void);
-
-/* All the loaders must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin_loader (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __XED_PLUGIN_LOADER_PYTHON_H__ */
-

plugin-loaders/python/xed-plugin-python.c

@@ -1,281 +0,0 @@
-/*
- * xed-plugin-python.c
- * This file is part of xed
- *
- * Copyright (C) 2005 Raphael Slinckx
- * Copyright (C) 2008 Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#include <config.h>
-
-#include "xed-plugin-python.h"
-
-#include <xed/xed-plugin.h>
-#include <xed/xed-debug.h>
-#include <pygobject.h>
-#include <string.h>
-
-#define XED_PLUGIN_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_PLUGIN_PYTHON, XedPluginPythonPrivate))
-
-static GObjectClass *parent_class;
-
-struct _XedPluginPythonPrivate 
-{
-	PyObject *instance;
-};
-
-static void	 xed_plugin_python_class_init		(XedPluginPythonClass *klass);
-static void	 xed_plugin_python_init 		(XedPluginPython      *plugin);
-
-G_DEFINE_TYPE (XedPluginPython, xed_plugin_python, XED_TYPE_PLUGIN)
-
-static PyObject *
-call_python_method (XedPluginPythonPrivate *priv,
-		    XedWindow		     *window,
-		    gchar		     *method)
-{
-	PyObject *py_ret = NULL;
-
-	g_return_val_if_fail (PyObject_HasAttrString (priv->instance, method), NULL);
-
-	if (window == NULL)
-	{
-		py_ret = PyObject_CallMethod (priv->instance,
-					      method,
-					      NULL);
-	}
-	else
-	{
-		py_ret = PyObject_CallMethod (priv->instance,
-					      method,
-					      "(N)",
-					      pygobject_new (G_OBJECT (window)));
-	}
-	
-	if (!py_ret)
-		PyErr_Print ();
-
-	return py_ret;
-}
-
-static gboolean
-check_py_object_is_gtk_widget (PyObject *py_obj)
-{
-	static PyTypeObject *_PyGtkWidget_Type = NULL;
-
-	if (_PyGtkWidget_Type == NULL)
-	{
-		PyObject *module;
-
-	    	if ((module = PyImport_ImportModule ("gtk")))
-	    	{
-			PyObject *moddict = PyModule_GetDict (module);
-			_PyGtkWidget_Type = (PyTypeObject *) PyDict_GetItemString (moddict, "Widget");
-	    	}
-
-		if (_PyGtkWidget_Type == NULL)
-		{
-			PyErr_SetString(PyExc_TypeError, "could not find Python gtk widget type");
-			PyErr_Print();
-
-			return FALSE;
-		}
-	}
-
-	return PyObject_TypeCheck (py_obj, _PyGtkWidget_Type) ? TRUE : FALSE;
-}
-
-static void
-impl_update_ui (XedPlugin *plugin,
-		XedWindow *window)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	XedPluginPythonPrivate *priv = XED_PLUGIN_PYTHON(plugin)->priv;
-	
-	if (PyObject_HasAttrString (priv->instance, "update_ui"))
-	{		
-		PyObject *py_ret = call_python_method (priv, window, "update_ui");
-		
-		if (py_ret)
-		{
-			Py_XDECREF (py_ret);
-		}
-	}
-	else
-		XED_PLUGIN_CLASS (parent_class)->update_ui (plugin, window);
-
-	pyg_gil_state_release (state);
-}
-
-static void
-impl_deactivate (XedPlugin *plugin,
-		 XedWindow *window)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	XedPluginPythonPrivate *priv = XED_PLUGIN_PYTHON(plugin)->priv;
-	
-	if (PyObject_HasAttrString (priv->instance, "deactivate"))
-	{		
-		PyObject *py_ret = call_python_method (priv, window, "deactivate");
-		
-		if (py_ret)
-		{
-			Py_XDECREF (py_ret);
-		}
-	}
-	else
-		XED_PLUGIN_CLASS (parent_class)->deactivate (plugin, window);
-
-	pyg_gil_state_release (state);
-}
-
-static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	XedPluginPythonPrivate *priv = XED_PLUGIN_PYTHON(plugin)->priv;
-		
-	if (PyObject_HasAttrString (priv->instance, "activate"))
-	{
-		PyObject *py_ret = call_python_method (priv, window, "activate");
-
-		if (py_ret)
-		{
-			Py_XDECREF (py_ret);
-		}
-	}
-	else
-		XED_PLUGIN_CLASS (parent_class)->activate (plugin, window);
-	
-	pyg_gil_state_release (state);
-}
-
-static GtkWidget *
-impl_create_configure_dialog (XedPlugin *plugin)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	XedPluginPythonPrivate *priv = XED_PLUGIN_PYTHON(plugin)->priv;
-	GtkWidget *ret = NULL;
-	
-	if (PyObject_HasAttrString (priv->instance, "create_configure_dialog"))
-	{
-		PyObject *py_ret = call_python_method (priv, NULL, "create_configure_dialog");
-	
-		if (py_ret)
-		{
-			if (check_py_object_is_gtk_widget (py_ret))
-			{
-				ret = GTK_WIDGET (pygobject_get (py_ret));
-				g_object_ref (ret);
-			}
-			else
-			{
-				PyErr_SetString(PyExc_TypeError, "return value for create_configure_dialog is not a GtkWidget");
-				PyErr_Print();
-			}
-			
-			Py_DECREF (py_ret);
-		}
-	}
-	else
-		ret = XED_PLUGIN_CLASS (parent_class)->create_configure_dialog (plugin);
- 
-	pyg_gil_state_release (state);
-	
-	return ret;
-}
-
-static gboolean
-impl_is_configurable (XedPlugin *plugin)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	XedPluginPythonPrivate *priv = XED_PLUGIN_PYTHON(plugin)->priv;
-	PyObject *dict = priv->instance->ob_type->tp_dict;	
-	gboolean result;
-	
-	if (dict == NULL)
-		result = FALSE;
-	else if (!PyDict_Check(dict))
-		result = FALSE;
-	else 
-		result = PyDict_GetItemString(dict, "create_configure_dialog") != NULL;
-
-	pyg_gil_state_release (state);
-	
-	return result;
-}
-
-void
-_xed_plugin_python_set_instance (XedPluginPython *plugin, 
-				  PyObject 	    *instance)
-{
-	PyGILState_STATE state = pyg_gil_state_ensure ();
-	
-	/* we don't increment the instance here because we are the instance,
-	   when it dies, we also die */
-	plugin->priv->instance = instance;
-	pyg_gil_state_release (state);
-}
-
-PyObject *
-_xed_plugin_python_get_instance (XedPluginPython *plugin)
-{
-	return plugin->priv->instance;
-}
-
-static void
-xed_plugin_python_init (XedPluginPython *plugin)
-{
-	plugin->priv = XED_PLUGIN_PYTHON_GET_PRIVATE(plugin);
-
-	xed_debug_message (DEBUG_PLUGINS, "Creating Python plugin instance");
-	plugin->priv->instance = 0;
-}
-
-static void
-xed_plugin_python_finalize (GObject *object)
-{
-	PyGILState_STATE state;
-	
-	xed_debug_message (DEBUG_PLUGINS, "Finalizing Python plugin instance");
-
-	state = pyg_gil_state_ensure ();
-	Py_XDECREF (XED_PLUGIN_PYTHON(object)->priv->instance);
-	pyg_gil_state_release (state);
-	
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-xed_plugin_python_class_init (XedPluginPythonClass *klass)
-{
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	g_type_class_add_private (klass, sizeof (XedPluginPythonPrivate));
-	G_OBJECT_CLASS (klass)->finalize = xed_plugin_python_finalize;
-
-	plugin_class->activate = impl_activate;
-	plugin_class->deactivate = impl_deactivate;
-	plugin_class->update_ui = impl_update_ui;
-	plugin_class->create_configure_dialog = impl_create_configure_dialog;
-	plugin_class->is_configurable = impl_is_configurable;
-}
-

plugin-loaders/python/xed-plugin-python.h

@@ -1,88 +0,0 @@
-/*
- * xed-plugin-python.h
- * This file is part of xed
- *
- * Copyright (C) 2005 - Raphael Slinckx
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#ifndef __XED_PLUGIN_PYTHON_H__
-#define __XED_PLUGIN_PYTHON_H__
-
-#define NO_IMPORT_PYGOBJECT
-
-#include <glib-object.h>
-#include <pygobject.h>
-
-#include <xed/xed-plugin.h>
-
-G_BEGIN_DECLS
-
-/*
- * Type checking and casting macros
- */
-#define XED_TYPE_PLUGIN_PYTHON		(xed_plugin_python_get_type())
-#define XED_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj), XED_TYPE_PLUGIN_PYTHON, XedPluginPython))
-#define XED_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), XED_TYPE_PLUGIN_PYTHON, XedPluginPythonClass))
-#define XED_IS_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj), XED_TYPE_PLUGIN_PYTHON))
-#define XED_IS_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_PLUGIN_PYTHON))
-#define XED_PLUGIN_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), XED_TYPE_PLUGIN_PYTHON, XedPluginPythonClass))
-
-/* Private structure type */
-typedef struct _XedPluginPythonPrivate XedPluginPythonPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _XedPluginPython XedPluginPython;
-
-struct _XedPluginPython 
-{
-	XedPlugin parent;
-	
-	/*< private > */
-	XedPluginPythonPrivate *priv;
-};
-
-/*
- * Class definition
- */
-typedef struct _XedPluginPythonClass XedPluginPythonClass;
-
-struct _XedPluginPythonClass 
-{
-	XedPluginClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType	 xed_plugin_python_get_type 		(void) G_GNUC_CONST;
-
-
-/* 
- * Private methods
- */
-void	  _xed_plugin_python_set_instance	(XedPluginPython *plugin, 
-						 PyObject 	   *instance);
-PyObject *_xed_plugin_python_get_instance	(XedPluginPython *plugin);
-
-G_END_DECLS
-
-#endif  /* __XED_PLUGIN_PYTHON_H__ */
-

plugins/Makefile.am

@@ -1,26 +0,0 @@
-DIST_SUBDIRS =	\
-	changecase 	\
-	docinfo 	\
-	filebrowser \
-	modelines	\
-	sort 		\
-	spell 		\
-	taglist 	\
-	time		\
-	trailsave
-
-SUBDIRS = 		\
-	changecase	\
-	docinfo		\
-	filebrowser	\
-	modelines	\
-	sort		\
-	taglist		\
-	time		\
-	trailsave
-
-if ENABLE_ENCHANT
-SUBDIRS      += spell
-endif
-
--include $(top_srcdir)/git.mk

plugins/bracket-complete/bracket-complete/bracketcompletion.plugin

@@ -0,0 +1,105 @@
+[Plugin]
+Loader=python3
+Module=bracketcompletion
+IAge=3
+Name[ar]=إكمال الأقواس
+Name[be]=Дапаўненне дужак
+Name[bs]=Zatvaranje zagrada
+Name[ca]=Compleció dels claudàtors
+Name[ca@valencia]=Compleció dels claudàtors
+Name[cs]=Doplňování závorek
+Name[da]=Klammefuldførelse
+Name[de]=Klammern schließen
+Name[el]=Συμπλήρωση αγκύλων
+Name[en_GB]=Bracket Completion
+Name[eo]=Krampo-kompletigo
+Name[es]=Completar paréntesis
+Name[et]=Sulgude lõpetamine
+Name[eu]=Parentesien osaketa
+Name[fi]=Sulkuparin täsmäys
+Name[fr]=Complétion de parenthèses
+Name[fur]=Completament parentesis
+Name[gl]=Completar parénteses
+Name[he]=התאמת סוגריים
+Name[hr]=Dovršavanje zagrada
+Name[hu]=Zárójel-kiegészítés
+Name[id]=Penyelesaian Tanda Kurung
+Name[it]=Completamento parentesi
+Name[ja]=カッコの補完
+Name[kk]=Жақшаларды толықтыру
+Name[ko]=각괄호 일치
+Name[lt]=Skliaustų užbaigimas
+Name[lv]=Iekavu noslēgšana
+Name[nl]=Haakjes-voltooiing
+Name[oc]=Complecion de parentèsis
+Name[pl]=Uzupełnianie nawiasów
+Name[pt]=Conclusão de chavetas
+Name[pt_BR]=Fechamento de parênteses
+Name[ro]=Completare paranteze
+Name[ru]=Дополнение скобок
+Name[sk]=Dopĺňanie pravých zátvoriek
+Name[sl]=Dopolnjevanje oklepajev
+Name[sr]=Допуњавање заграда
+Name[sr@latin]=Dopunjavanje zagrada
+Name[sv]=Parenteskomplettering
+Name[te]=బ్రాకెట్ ముగింపు
+Name[th]=การเติมเต็มคู่วงเล็บ
+Name[tr]=Parantez Tamamlama
+Name[zh_CN]=括号补全
+Name[zh_TW]=括號補完
+Name=Bracket Completion
+Description[ar]=يغلق الأقواس آليا.
+Description[as]=বন্ধনী নিজেই যোগ কৰে ।
+Description[be]=Аўтаматычна дадае канцавыя дужкі.
+Description[be@latin]=Aŭtamatyčna dadaje kancavyja dužki.
+Description[bs]=Automatski dodaj zatvorene zagrade.
+Description[ca]=Afegeix claudàtors de tancada automàticament.
+Description[ca@valencia]=Afig claudàtors de tancada automàticament.
+Description[cs]=Automaticky přidává zavírací závorky.
+Description[da]=Tilføjer automatisk afsluttende klammer.
+Description[de]=Fügt automatisch schließende Klammern hinzu.
+Description[dz]=ཁ་བསྡམ་གུག་ཤད་ཚུ་ རང་བཞིན་གྱིས་ཁ་སྐོང་རྐྱབ་ཨིན།
+Description[el]=Συμπληρώνει αυτόματα τις αγκύλες.
+Description[en_CA]=Automatically adds closing brackets.
+Description[en_GB]=Automatically adds closing brackets.
+Description[eo]=Aŭtomate aldoni fermantajn krampojn.
+Description[es]=Añadir automáticamente cierres de paréntesis.
+Description[eu]=Automatikoki gehitzen ditu itxierako parentesiak.
+Description[fi]=Lisää suluille pääte automaattisesti.
+Description[fr]=Ajouter automatiquement les parenthèses fermantes.
+Description[fur]=Al zonte in automatic lis parentesis sieradis.
+Description[gl]=Engadir automaticamente peches de parénteses.
+Description[gu]=બંધ કરતા કૌંસો ઓપોઆપ ઉમેરાય છે.
+Description[he]=הוספת סוגר לסגירה.
+Description[hr]=Automatski zatvara zagrade.
+Description[hu]=Automatikusan hozzáadja a záró zárójeleket.
+Description[id]=Otomatis menambah kurung tutup.
+Description[it]=Aggiunge automaticamente le parentesi di chiusura
+Description[ja]=終わり括弧を自動的に追加します
+Description[kk]=Жабатын жақшаны автоматты түрде қосады.
+Description[ko]=자동으로 닫는 각괄호를 추가합니다.
+Description[lt]=Automatiškai prideda užveriančius skliaustus.
+Description[lv]=Automātiski pievieno aizverošās iekavas.
+Description[mr]=स्वयं बंद करण्याजोगी ब्रॅकेट समावेष करा.
+Description[nl]=Voegt automatisch ‘haakjes sluiten’ toe.
+Description[oc]=Apondre automaticament las parentèsis tampantas.
+Description[or]=ବନ୍ଦହୋଇଥିବା ବନ୍ଧନିଗୁଡ଼ିକୁ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଯୋଗକରନ୍ତୁ।
+Description[pl]=Automatycznie dodaje nawiasy zamykające.
+Description[pt]=Adiciona automaticamente fecho de chavetas.
+Description[pt_BR]=Fecha parênteses automaticamente.
+Description[ro]=Adaugă automat paranteze închise.
+Description[ru]=Автоматическое добавление закрывающей скобки.
+Description[sk]=Automatické pridávanie pravých zátvoriek.
+Description[sl]=Samodejno doda zaklepaje
+Description[sr]=Сам додаје затварајуће заграде.
+Description[sr@latin]=Sam dodaje zatvarajuće zagrade.
+Description[sv]=Lägger automatiskt till avslutande parenteser.
+Description[th]=เติมวงเล็บปิดโดยอัตโนมัติ
+Description[tr]=Parantez kapanışını kendiliğinden ekler.
+Description[vi]=Tự động thêm dấu ngoặc đóng.
+Description[zh_CN]=自动添加闭合括号。
+Description[zh_TW]=自動加入關閉用括號。
+Description=Automatically adds closing brackets.
+Authors=Hrutvik Suthar <steve@istique.net>
+Copyright=Copyright @ 2020 Hrutvik Suthar
+Version=1.0

plugins/bracket-complete/bracket-complete/bracketcompletion.py

@@ -0,0 +1,318 @@
+# -*- coding: utf-8 -*-
+#
+#  bracketcompletion.py - Bracket completion plugin for Xed
+#
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
+
+import gi
+gi.require_version('Peas', '1.0')
+#gi.require_version('Xed', '3.0')
+from gi.repository import GObject, Gdk, Xed
+
+common_brackets = {
+    '(' : ')',
+    '[' : ']',
+    '{' : '}',
+    '"' : '"',
+    "'" : "'",
+}
+
+close_brackets = {
+    ')' : '(',
+    ']' : '[',
+    '}' : '{',
+}
+
+language_brackets = {
+    'changelog': { '<' : '>' },
+    'html': { '<' : '>' },
+    'ruby': { '|' : '|' },
+    'sh': { '`' : '`' },
+    'xml': { '<' : '>' },
+    'php': { '<' : '>' },
+}
+
+
+class BracketCompletionPlugin(GObject.Object, Xed.ViewActivatable):
+    __gtype_name__ = "BracketCompletion"
+
+    view = GObject.Property(type=Xed.View)
+
+    def __init__(self):
+        GObject.Object.__init__(self)
+
+    def do_activate(self):
+        self._doc = self.view.get_buffer()
+        self._last_iter = None
+        self._stack = []
+        self._relocate_marks = True
+        self.update_language()
+
+        # Add the markers to the buffer
+        insert = self._doc.get_iter_at_mark(self._doc.get_insert())
+        self._mark_begin = self._doc.create_mark(None, insert, True)
+        self._mark_end = self._doc.create_mark(None, insert, False)
+
+        self._handlers = [
+            None,
+            None,
+            self.view.connect('notify::editable', self.on_notify_editable),
+            self._doc.connect('notify::language', self.on_notify_language),
+            None,
+        ]
+        self.update_active()
+
+    def do_deactivate(self):
+        if self._handlers[0]:
+            self.view.disconnect(self._handlers[0])
+            self.view.disconnect(self._handlers[1])
+            self._doc.disconnect(self._handlers[4])
+        self.view.disconnect(self._handlers[2])
+        self._doc.disconnect(self._handlers[3])
+        self._doc.delete_mark(self._mark_begin)
+        self._doc.delete_mark(self._mark_end)
+
+    def update_active(self):
+        # Don't activate the feature if the buffer isn't editable or if
+        # there are no brackets for the language
+        active = self.view.get_editable() and \
+                 self._brackets is not None
+
+        if active and self._handlers[0] is None:
+            self._handlers[0] = self.view.connect('event-after',
+                                                   self.on_event_after)
+            self._handlers[1] = self.view.connect('key-press-event',
+                                                   self.on_key_press_event)
+            self._handlers[4] = self._doc.connect('delete-range',
+                                                  self.on_delete_range)
+        elif not active and self._handlers[0] is not None:
+            self.view.disconnect(self._handlers[0])
+            self._handlers[0] = None
+            self.view.disconnect(self._handlers[1])
+            self._handlers[1] = None
+            self._doc.disconnect(self._handlers[4])
+            self._handlers[4] = None
+
+    def update_language(self):
+        lang = self._doc.get_language()
+        if lang is None:
+            self._brackets = None
+            return
+
+        lang_id = lang.get_id()
+        if lang_id in language_brackets:
+            self._brackets = language_brackets[lang_id]
+            # we populate the language-specific brackets with common ones lazily
+            self._brackets.update(common_brackets)
+        else:
+            self._brackets = common_brackets
+
+        # get the corresponding keyvals
+        self._bracket_keyvals = set()
+        for b in self._brackets:
+            kv = Gdk.unicode_to_keyval(ord(b[-1]))
+            if (kv):
+                self._bracket_keyvals.add(kv)
+        for b in close_brackets:
+            kv = Gdk.unicode_to_keyval(ord(b[-1]))
+            if (kv):
+                self._bracket_keyvals.add(kv)
+
+    def get_current_token(self):
+        end = self._doc.get_iter_at_mark(self._doc.get_insert())
+        start = end.copy()
+        word = None
+
+        if end.ends_word() or (end.inside_word() and not end.starts_word()):
+            start.backward_word_start()
+            word = self._doc.get_text(start, end)
+
+        if not word and start.backward_char():
+            word = start.get_char()
+            if word.isspace():
+                word = None
+
+        if word:
+            return word, start, end
+        else:
+            return None, None, None
+
+    def get_next_token(self):
+        start = self._doc.get_iter_at_mark(self._doc.get_insert())
+        end = start.copy()
+        word = None
+
+        if start.ends_word() or (start.inside_word() and not start.starts_word()):
+            end.forward_word_end()
+            word = self._doc.get_text(start, end)
+
+        if not word:
+            word = start.get_char()
+            if word.isspace():
+                word = None
+
+        if word:
+            return word, start, end
+        else:
+            return None, None, None
+
+    def compute_indentation(self, cur):
+        """
+        Compute indentation at the given iterator line
+        view : gtk.TextView
+        cur : gtk.TextIter
+        """
+        start = self._doc.get_iter_at_line(cur.get_line())
+        end = start.copy()
+
+        c = end.get_char()
+        while c.isspace() and c not in ('\n', '\r') and end.compare(cur) < 0:
+            if not end.forward_char():
+                break
+            c = end.get_char()
+
+        if start.equal(end):
+            return ''
+        return start.get_slice(end)
+
+    def on_notify_language(self, view, pspec):
+        self.update_language()
+        self.update_active()
+
+    def on_notify_editable(self, view, pspec):
+        self.update_active()
+
+    def on_key_press_event(self, view, event):
+        if event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.MOD1_MASK):
+            return False
+
+        if event.keyval in (Gdk.KEY_Left, Gdk.KEY_Right):
+            self._stack = []
+
+        if event.keyval == Gdk.KEY_BackSpace:
+            self._stack = []
+
+            if self._last_iter == None:
+                return False
+
+            iter1 = self._doc.get_iter_at_mark(self._doc.get_insert())
+            iter1.backward_char()
+            self._doc.begin_user_action()
+            self._doc.delete(iter1, self._last_iter)
+            self._doc.end_user_action()
+            self._last_iter = None
+            return True
+
+        if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter) and \
+           view.get_auto_indent() and self._last_iter != None:
+            # This code has barely been adapted from gtksourceview.c
+            # Note: it might break IM!
+
+            mark = self._doc.get_insert()
+            iter1 = self._doc.get_iter_at_mark(mark)
+
+            indent = self.compute_indentation(iter1)
+            indent = "\n" + indent
+
+            # Insert new line and auto-indent.
+            self._doc.begin_user_action()
+            self._doc.insert(iter1, indent)
+            self._doc.insert(iter1, indent)
+            self._doc.end_user_action()
+
+            # Leave the cursor where we want it to be
+            iter1.backward_chars(len(indent))
+            self._doc.place_cursor(iter1)
+            self.view.scroll_mark_onscreen(mark)
+
+            self._last_iter = None
+            return True
+
+        self._last_iter = None
+        return False
+
+    def on_event_after(self, view, event):
+        if event.type != Gdk.EventType.KEY_PRESS or \
+           event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.MOD1_MASK) or \
+           event.keyval not in self._bracket_keyvals:
+            return
+
+        # Check if the insert mark is in the range of mark_begin to mark_end
+        # if not we free the stack
+        insert = self._doc.get_insert()
+        iter_begin = self._doc.get_iter_at_mark(self._mark_begin)
+        iter_end = self._doc.get_iter_at_mark(self._mark_end)
+        insert_iter = self._doc.get_iter_at_mark(insert)
+        if not iter_begin.equal(iter_end):
+            if not insert_iter.in_range(iter_begin, iter_end):
+                self._stack = []
+                self._relocate_marks = True
+
+        # Check if the word is not in our brackets
+        word, start, end = self.get_current_token()
+
+        if word not in self._brackets and word not in close_brackets:
+            return
+
+        # If we didn't insert brackets yet we insert them in the insert mark iter
+        if self._relocate_marks == True:
+            insert_iter = self._doc.get_iter_at_mark(insert)
+            self._doc.move_mark(self._mark_begin, insert_iter)
+            self._doc.move_mark(self._mark_end, insert_iter)
+            self._relocate_marks = False
+
+        # Depending on having close bracket or a open bracket we get the opposed
+        # bracket
+        bracket = None
+        bracket2 = None
+
+        if word not in close_brackets:
+            self._stack.append(word)
+            bracket = self._brackets[word]
+        else:
+            bracket2 = close_brackets[word]
+
+        word2, _, _ = self.get_next_token()
+
+        # Check to skip the closing bracket
+        # Example: word = ) and word2 = )
+        if word == word2:
+            if bracket2 != None and self._stack != [] and \
+              self._stack[len(self._stack) - 1] == bracket2:
+                self._stack.pop()
+                self._doc.handler_block(self._handlers[4])
+                self._doc.delete(start, end)
+                self._doc.handler_unblock(self._handlers[4])
+                end.forward_char()
+                self._doc.place_cursor(end)
+            return
+
+        # Insert the closing bracket
+        if bracket != None:
+            self._doc.begin_user_action()
+            self._doc.insert(end, bracket)
+            self._doc.end_user_action()
+
+            # Leave the cursor when we want it to be
+            self._last_iter = end.copy()
+            end.backward_chars(len(bracket))
+            self._doc.place_cursor(end)
+
+    def on_delete_range(self, doc, start, end):
+        self._stack = []
+
+# ex:ts=4:et:

plugins/bracket-complete/meson.build

@@ -0,0 +1,4 @@
+install_subdir(
+    'bracket-complete',
+    install_dir: pluginslibdir
+)

plugins/changecase/Makefile.am

@@ -1,34 +0,0 @@
-# changecase plugin
-plugindir = $(XED_PLUGINS_LIBS_DIR)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	$(XED_CFLAGS) 				\
-	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)
-
-plugin_LTLIBRARIES = libchangecase.la
-
-libchangecase_la_SOURCES = \
-	xed-changecase-plugin.h	\
-	xed-changecase-plugin.c
-
-libchangecase_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libchangecase_la_LIBADD = $(XED_LIBS)
-
-uidir = $(XED_PLUGINS_DATA_DIR)/changecase
-ui_DATA =
-
-plugin_in_files = changecase.xed-plugin.desktop.in
-
-%.xed-plugin: %.xed-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
-
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
-
--include $(top_srcdir)/git.mk

plugins/changecase/changecase.xed-plugin.desktop.in

@@ -1,8 +0,0 @@
-[Xed Plugin]
-Module=changecase
-IAge=2
-_Name=Change Case
-_Description=Changes the case of selected text.
-Authors=Paolo Borelli <pborelli@katamail.com>
-Copyright=Copyright © 2004-2005 Paolo Borelli
-Website=http://www.mate-desktop.org

plugins/changecase/xed-changecase-plugin.c

@@ -1,395 +0,0 @@
-/*
- * xed-changecase-plugin.c
- * 
- * Copyright (C) 2004-2005 - Paolo Borelli
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "xed-changecase-plugin.h"
-
-#include <glib/gi18n-lib.h>
-#include <gmodule.h>
-
-#include <xed/xed-debug.h>
-
-#define WINDOW_DATA_KEY "XedChangecasePluginWindowData"
-
-XED_PLUGIN_REGISTER_TYPE(XedChangecasePlugin, xed_changecase_plugin)
-
-typedef enum {
-	TO_UPPER_CASE,
-	TO_LOWER_CASE,
-	INVERT_CASE,
-	TO_TITLE_CASE,
-} ChangeCaseChoice;
-
-static void
-do_upper_case (GtkTextBuffer *buffer,
-               GtkTextIter   *start,
-               GtkTextIter   *end)
-{
-	GString *s = g_string_new (NULL);
-
-	while (!gtk_text_iter_is_end (start) &&
-	       !gtk_text_iter_equal (start, end))
-	{
-		gunichar c, nc;
-
-		c = gtk_text_iter_get_char (start);
-		nc = g_unichar_toupper (c);
-		g_string_append_unichar (s, nc);
-
-		gtk_text_iter_forward_char (start);
-	}
-
-	gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
-	gtk_text_buffer_insert_at_cursor (buffer, s->str, s->len);
-
-	g_string_free (s, TRUE);
-}
-
-static void
-do_lower_case (GtkTextBuffer *buffer,
-               GtkTextIter   *start,
-               GtkTextIter   *end)
-{
-	GString *s = g_string_new (NULL);
-
-	while (!gtk_text_iter_is_end (start) &&
-	       !gtk_text_iter_equal (start, end))
-	{
-		gunichar c, nc;
-
-		c = gtk_text_iter_get_char (start);
-		nc = g_unichar_tolower (c);
-		g_string_append_unichar (s, nc);
-
-		gtk_text_iter_forward_char (start);
-	}
-
-	gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
-	gtk_text_buffer_insert_at_cursor (buffer, s->str, s->len);
-
-	g_string_free (s, TRUE);
-}
-
-static void
-do_invert_case (GtkTextBuffer *buffer,
-                GtkTextIter   *start,
-                GtkTextIter   *end)
-{
-	GString *s = g_string_new (NULL);
-
-	while (!gtk_text_iter_is_end (start) &&
-	       !gtk_text_iter_equal (start, end))
-	{
-		gunichar c, nc;
-
-		c = gtk_text_iter_get_char (start);
-		if (g_unichar_islower (c))
-			nc = g_unichar_toupper (c);
-		else
-			nc = g_unichar_tolower (c);
-		g_string_append_unichar (s, nc);
-
-		gtk_text_iter_forward_char (start);
-	}
-
-	gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
-	gtk_text_buffer_insert_at_cursor (buffer, s->str, s->len);
-
-	g_string_free (s, TRUE);
-}
-
-static void
-do_title_case (GtkTextBuffer *buffer,
-               GtkTextIter   *start,
-               GtkTextIter   *end)
-{
-	GString *s = g_string_new (NULL);
-
-	while (!gtk_text_iter_is_end (start) &&
-	       !gtk_text_iter_equal (start, end))
-	{
-		gunichar c, nc;
-
-		c = gtk_text_iter_get_char (start);
-		if (gtk_text_iter_starts_word (start))
-			nc = g_unichar_totitle (c);
-		else
-			nc = g_unichar_tolower (c);
-		g_string_append_unichar (s, nc);
-
-		gtk_text_iter_forward_char (start);
-	}
-
-	gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
-	gtk_text_buffer_insert_at_cursor (buffer, s->str, s->len);
-
-	g_string_free (s, TRUE);
-}
-
-static void
-change_case (XedWindow      *window,
-             ChangeCaseChoice  choice)
-{
-	XedDocument *doc;
-	GtkTextIter start, end;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	doc = xed_window_get_active_document (window);
-	g_return_if_fail (doc != NULL);
-
-	if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc),
-						   &start, &end))
-	{
-		return;
-	}
-
-	gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (doc));
-
-	switch (choice)
-	{
-	case TO_UPPER_CASE:
-		do_upper_case (GTK_TEXT_BUFFER (doc), &start, &end);
-		break;
-	case TO_LOWER_CASE:
-		do_lower_case (GTK_TEXT_BUFFER (doc), &start, &end);
-		break;
-	case INVERT_CASE:
-		do_invert_case (GTK_TEXT_BUFFER (doc), &start, &end);
-		break;
-	case TO_TITLE_CASE:
-		do_title_case (GTK_TEXT_BUFFER (doc), &start, &end);
-		break;
-	default:
-		g_return_if_reached ();
-	}
-
-	gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (doc));
-}
-
-static void
-upper_case_cb (GtkAction   *action,
-               XedWindow *window)
-{
-	change_case (window, TO_UPPER_CASE);
-}
-
-static void
-lower_case_cb (GtkAction   *action,
-               XedWindow *window)
-{
-	change_case (window, TO_LOWER_CASE);
-}
-
-static void
-invert_case_cb (GtkAction   *action,
-                XedWindow *window)
-{
-	change_case (window, INVERT_CASE);
-}
-
-static void
-title_case_cb (GtkAction   *action,
-               XedWindow *window)
-{
-	change_case (window, TO_TITLE_CASE);
-}
-
-static const GtkActionEntry action_entries[] =
-{
-	{ "ChangeCase", NULL, N_("C_hange Case") },
-	{ "UpperCase", NULL, N_("All _Upper Case"), NULL,
-	  N_("Change selected text to upper case"),
-	  G_CALLBACK (upper_case_cb) },
-	{ "LowerCase", NULL, N_("All _Lower Case"), NULL,
-	  N_("Change selected text to lower case"),
-	  G_CALLBACK (lower_case_cb) },
-	{ "InvertCase", NULL, N_("_Invert Case"), NULL,
-	  N_("Invert the case of selected text"),
-	  G_CALLBACK (invert_case_cb) },
-	{ "TitleCase", NULL, N_("_Title Case"), NULL,
-	  N_("Capitalize the first letter of each selected word"),
-	  G_CALLBACK (title_case_cb) }
-};
-
-const gchar submenu[] =
-"<ui>"
-"  <menubar name='MenuBar'>"
-"    <menu name='EditMenu' action='Edit'>"
-"      <placeholder name='EditOps_6'>"
-"        <menu action='ChangeCase'>"
-"          <menuitem action='UpperCase'/>"
-"          <menuitem action='LowerCase'/>"
-"          <menuitem action='InvertCase'/>"
-"          <menuitem action='TitleCase'/>"
-"        </menu>"
-"      </placeholder>"
-"    </menu>"
-"  </menubar>"
-"</ui>";
-
-static void
-xed_changecase_plugin_init (XedChangecasePlugin *plugin)
-{
-	xed_debug_message (DEBUG_PLUGINS, "XedChangecasePlugin initializing");
-}
-
-static void
-xed_changecase_plugin_finalize (GObject *object)
-{
-	G_OBJECT_CLASS (xed_changecase_plugin_parent_class)->finalize (object);
-
-	xed_debug_message (DEBUG_PLUGINS, "XedChangecasePlugin finalizing");
-}
-
-typedef struct
-{
-	GtkActionGroup *action_group;
-	guint           ui_id;
-} WindowData;
-
-static void
-free_window_data (WindowData *data)
-{
-	g_return_if_fail (data != NULL);
-
-	g_slice_free (WindowData, data);
-}
-
-static void
-update_ui_real (XedWindow  *window,
-		WindowData   *data)
-{
-	GtkTextView *view;
-	GtkAction *action;
-	gboolean sensitive = FALSE;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	view = GTK_TEXT_VIEW (xed_window_get_active_view (window));
-
-	if (view != NULL)
-	{
-		GtkTextBuffer *buffer;
-
-		buffer = gtk_text_view_get_buffer (view);
-		sensitive = (gtk_text_view_get_editable (view) &&
-			     gtk_text_buffer_get_has_selection (buffer));
-	}
-
-	action = gtk_action_group_get_action (data->action_group,
-					      "ChangeCase");
-	gtk_action_set_sensitive (action, sensitive);
-}
-
-static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
-{
-	GtkUIManager *manager;
-	WindowData *data;
-	GError *error = NULL;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	data = g_slice_new (WindowData);
-
-	manager = xed_window_get_ui_manager (window);
-
-	data->action_group = gtk_action_group_new ("XedChangecasePluginActions");
-	gtk_action_group_set_translation_domain (data->action_group, 
-						 GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (data->action_group,
-				      action_entries,
-				      G_N_ELEMENTS (action_entries), 
-				      window);
-
-	gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
-
-	data->ui_id = gtk_ui_manager_add_ui_from_string (manager,
-							 submenu,
-							 -1,
-							 &error);
-	if (data->ui_id == 0)
-	{
-		g_warning ("%s", error->message);
-		free_window_data (data);
-		return;
-	}
-
-	g_object_set_data_full (G_OBJECT (window), 
-				WINDOW_DATA_KEY, 
-				data,
-				(GDestroyNotify) free_window_data);
-
-	update_ui_real (window, data);
-}
-
-static void
-impl_deactivate	(XedPlugin *plugin,
-		 XedWindow *window)
-{
-	GtkUIManager *manager;
-	WindowData *data;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	manager = xed_window_get_ui_manager (window);
-
-	data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-
-	gtk_ui_manager_remove_ui (manager, data->ui_id);
-	gtk_ui_manager_remove_action_group (manager, data->action_group);
-
-	g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);	
-}
-
-static void
-impl_update_ui (XedPlugin *plugin,
-		XedWindow *window)
-{
-	WindowData *data;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-
-	update_ui_real (window, data);
-}
-
-static void
-xed_changecase_plugin_class_init (XedChangecasePluginClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
-
-	object_class->finalize = xed_changecase_plugin_finalize;
-
-	plugin_class->activate = impl_activate;
-	plugin_class->deactivate = impl_deactivate;
-	plugin_class->update_ui = impl_update_ui;
-}

plugins/changecase/xed-changecase-plugin.h

@@ -1,72 +0,0 @@
-/*
- * xed-changecase-plugin.h
- * 
- * Copyright (C) 2004-2005 - Paolo Borelli
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
- */
-
-#ifndef __XED_CHANGECASE_PLUGIN_H__
-#define __XED_CHANGECASE_PLUGIN_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <xed/xed-plugin.h>
-
-G_BEGIN_DECLS
-
-/*
- * Type checking and casting macros
- */
-#define XED_TYPE_CHANGECASE_PLUGIN		(xed_changecase_plugin_get_type ())
-#define XED_CHANGECASE_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_CHANGECASE_PLUGIN, XedChangecasePlugin))
-#define XED_CHANGECASE_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_CHANGECASE_PLUGIN, XedChangecasePluginClass))
-#define XED_IS_CHANGECASE_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_CHANGECASE_PLUGIN))
-#define XED_IS_CHANGECASE_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_CHANGECASE_PLUGIN))
-#define XED_CHANGECASE_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_CHANGECASE_PLUGIN, XedChangecasePluginClass))
-
-/*
- * Main object structure
- */
-typedef struct _XedChangecasePlugin		XedChangecasePlugin;
-
-struct _XedChangecasePlugin
-{
-	XedPlugin parent_instance;
-};
-
-/*
- * Class definition
- */
-typedef struct _XedChangecasePluginClass	XedChangecasePluginClass;
-
-struct _XedChangecasePluginClass
-{
-	XedPluginClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType	xed_changecase_plugin_get_type		(void) G_GNUC_CONST;
-
-/* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule *module);
-
-G_END_DECLS
-
-#endif /* __XED_CHANGECASE_PLUGIN_H__ */

plugins/docinfo/Makefile.am

@@ -1,34 +0,0 @@
-# docinfo plugin
-plugindir = $(XED_PLUGINS_LIBS_DIR)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	$(XED_CFLAGS) 				\
-	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)
-
-plugin_LTLIBRARIES = libdocinfo.la
-
-libdocinfo_la_SOURCES = \
-	xed-docinfo-plugin.h	\
-	xed-docinfo-plugin.c
-
-libdocinfo_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libdocinfo_la_LIBADD  = $(XED_LIBS)
-
-uidir = $(XED_PLUGINS_DATA_DIR)/docinfo
-ui_DATA = docinfo.ui
-
-plugin_in_files = docinfo.xed-plugin.desktop.in
-
-%.xed-plugin: %.xed-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
-
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
-
--include $(top_srcdir)/git.mk

plugins/docinfo/docinfo.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Module=docinfo
 IAge=2
 _Name=Document Statistics

plugins/docinfo/meson.build

@@ -0,0 +1,37 @@
+docinfo_sources = [
+	'xed-docinfo-plugin.h',
+	'xed-docinfo-plugin.c'
+]
+
+docinfo_deps = [
+    config_h,
+    glib,
+    gmodule,
+    gtksourceview,
+    libpeas,
+    pango
+]
+
+library('docinfo',
+    docinfo_sources,
+    dependencies: docinfo_deps,
+    include_directories: include_dirs,
+    link_with: libxed,
+    install_rpath: join_paths(prefix, libdir, 'xed'),
+    install: true,
+    install_dir: join_paths(libdir, 'xed', 'plugins')
+)
+
+install_data(
+    'docinfo.ui',
+    install_dir: join_paths(pluginsdatadir, 'docinfo')
+)
+
+docinfo_desktop = custom_target(
+    'docinfo_desktop',
+    input: 'docinfo.plugin.desktop.in',
+    output: 'docinfo.plugin',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: pluginslibdir,
+)

plugins/docinfo/xed-docinfo-plugin.c

@@ -1,13 +1,13 @@
 /*
  * xed-docinfo-plugin.c
- * 
- * Copyright (C) 2002-2005 Paolo Maggi 
+ *
+ * Copyright (C) 2002-2005 Paolo Maggi
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -17,565 +17,542 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "xed-docinfo-plugin.h"
-
 #include <string.h> /* For strlen (...) */
-
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <pango/pango-break.h>
 #include <gmodule.h>
 
+#include <xed/xed-window.h>
+#include <xed/xed-window-activatable.h>
 #include <xed/xed-debug.h>
 #include <xed/xed-utils.h>
 
-#define WINDOW_DATA_KEY "XedDocInfoWindowData"
+#include "xed-docinfo-plugin.h"
+
 #define MENU_PATH "/MenuBar/ToolsMenu/ToolsOps_2"
 
-XED_PLUGIN_REGISTER_TYPE(XedDocInfoPlugin, xed_docinfo_plugin)
-
-typedef struct
+struct _XedDocInfoPluginPrivate
 {
-	GtkWidget *dialog;
-	GtkWidget *file_name_label;
-	GtkWidget *lines_label;
-	GtkWidget *words_label;
-	GtkWidget *chars_label;
-	GtkWidget *chars_ns_label;
-	GtkWidget *bytes_label;
-	GtkWidget *selection_vbox;
-	GtkWidget *selected_lines_label;
-	GtkWidget *selected_words_label;
-	GtkWidget *selected_chars_label;
-	GtkWidget *selected_chars_ns_label;
-	GtkWidget *selected_bytes_label;
-} DocInfoDialog;
+    XedWindow *window;
 
-typedef struct
+    GtkActionGroup *action_group;
+    guint ui_id;
+
+    GtkWidget *dialog;
+    GtkWidget *file_name_label;
+    GtkWidget *lines_label;
+    GtkWidget *words_label;
+    GtkWidget *chars_label;
+    GtkWidget *chars_ns_label;
+    GtkWidget *bytes_label;
+    GtkWidget *selection_vbox;
+    GtkWidget *selected_lines_label;
+    GtkWidget *selected_words_label;
+    GtkWidget *selected_chars_label;
+    GtkWidget *selected_chars_ns_label;
+    GtkWidget *selected_bytes_label;
+};
+
+enum
 {
-	XedPlugin *plugin;
+    PROP_0,
+    PROP_WINDOW
+};
 
-	GtkActionGroup *ui_action_group;
-	guint ui_id;
+static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
 
-	DocInfoDialog *dialog;
-} WindowData;
-
-static void docinfo_dialog_response_cb (GtkDialog   *widget,
-					gint	    res_id,
-					XedWindow *window);
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedDocInfoPlugin,
+                                xed_docinfo_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedDocInfoPlugin))
 
 static void
-docinfo_dialog_destroy_cb (GObject  *obj,
-			   WindowData *data)
-{
-	xed_debug (DEBUG_PLUGINS);
-
-	if (data != NULL)
-	{
-		g_free (data->dialog);
-		data->dialog = NULL;
-	}
-}
-
-static DocInfoDialog *
-get_docinfo_dialog (XedWindow *window,
-		    WindowData	*data)
-{
-	DocInfoDialog *dialog;
-	gchar *data_dir;
-	gchar *ui_file;
-	GtkWidget *content;
-	GtkWidget *error_widget;
-	gboolean ret;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	dialog = g_new (DocInfoDialog, 1);
-
-	data_dir = xed_plugin_get_data_dir (data->plugin);
-	ui_file = g_build_filename (data_dir, "docinfo.ui", NULL);
-	ret = xed_utils_get_ui_objects (ui_file,
-					  NULL,
-					  &error_widget,
-					  "dialog", &dialog->dialog,
-					  "docinfo_dialog_content", &content,
-					  "file_name_label", &dialog->file_name_label,
-					  "words_label", &dialog->words_label,
-					  "bytes_label", &dialog->bytes_label,
-					  "lines_label", &dialog->lines_label,
-					  "chars_label", &dialog->chars_label,
-					  "chars_ns_label", &dialog->chars_ns_label,
-					  "selection_vbox", &dialog->selection_vbox,
-					  "selected_words_label", &dialog->selected_words_label,
-					  "selected_bytes_label", &dialog->selected_bytes_label,
-					  "selected_lines_label", &dialog->selected_lines_label,
-					  "selected_chars_label", &dialog->selected_chars_label,
-					  "selected_chars_ns_label", &dialog->selected_chars_ns_label,
-					  NULL);
-
-	g_free (data_dir);
-	g_free (ui_file);
-
-	if (!ret)
-	{
-		const gchar *err_message;
-
-		err_message = gtk_label_get_label (GTK_LABEL (error_widget));
-		xed_warning (GTK_WINDOW (window), "%s", err_message);
-
-		g_free (dialog);
-		gtk_widget_destroy (error_widget);
-
-		return NULL;
-	}
-
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog->dialog),
-					 GTK_RESPONSE_OK);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-				      GTK_WINDOW (window));
-	
-	g_signal_connect (dialog->dialog,
-			  "destroy",
-			  G_CALLBACK (docinfo_dialog_destroy_cb),
-			  data);
-
-	g_signal_connect (dialog->dialog,
-			  "response",
-			  G_CALLBACK (docinfo_dialog_response_cb),
-			  window);
-
-	return dialog;
-}
-
-static void 
 calculate_info (XedDocument *doc,
-		GtkTextIter   *start,
-		GtkTextIter   *end, 
-		gint          *chars,
-		gint          *words,
-		gint          *white_chars,
-		gint          *bytes)
-{	
-	gchar *text;
+                GtkTextIter *start,
+                GtkTextIter *end,
+                gint        *chars,
+                gint        *words,
+                gint        *white_chars,
+                gint        *bytes)
+{
+    gchar *text;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	text = gtk_text_buffer_get_slice (GTK_TEXT_BUFFER (doc),
-					  start,
-					  end,
-					  TRUE);
+    text = gtk_text_buffer_get_slice (GTK_TEXT_BUFFER (doc), start, end, TRUE);
 
-	*chars = g_utf8_strlen (text, -1);
-	*bytes = strlen (text);
+    *chars = g_utf8_strlen (text, -1);
+    *bytes = strlen (text);
 
-	if (*chars > 0)
-	{
-		PangoLogAttr *attrs;
-		gint i;
+    if (*chars > 0)
+    {
+        PangoLogAttr *attrs;
+        gint i;
 
-		attrs = g_new0 (PangoLogAttr, *chars + 1);
+        attrs = g_new0 (PangoLogAttr, *chars + 1);
 
-		pango_get_log_attrs (text,
-				     -1,
-				     0,
-				     pango_language_from_string ("C"),
-				     attrs,
-				     *chars + 1);
+        pango_get_log_attrs (text, -1, 0, pango_language_from_string ("C"), attrs, *chars + 1);
 
-		for (i = 0; i < (*chars); i++)
-		{
-			if (attrs[i].is_white)
-				++(*white_chars);
+        for (i = 0; i < (*chars); i++)
+        {
+            if (attrs[i].is_white)
+            {
+                ++(*white_chars);
+            }
 
-			if (attrs[i].is_word_start)
-				++(*words);
-		}
+            if (attrs[i].is_word_start)
+            {
+                ++(*words);
+            }
+        }
 
-		g_free (attrs);
-	}
-	else
-	{
-		*white_chars = 0;
-		*words = 0;
-	}
+        g_free (attrs);
+    }
+    else
+    {
+        *white_chars = 0;
+        *words = 0;
+    }
 
-	g_free (text);
+    g_free (text);
 }
 
 static void
-docinfo_real (XedDocument *doc,
-	      DocInfoDialog *dialog)
+update_document_info (XedDocInfoPlugin *plugin,
+                      XedDocument *doc)
 {
-	GtkTextIter start, end;
-	gint words = 0;
-	gint chars = 0;
-	gint white_chars = 0;
-	gint lines = 0;
-	gint bytes = 0;
-	gchar *tmp_str;
-	gchar *doc_name;
+    XedDocInfoPluginPrivate *priv;
+    GtkTextIter start, end;
+    gint words = 0;
+    gint chars = 0;
+    gint white_chars = 0;
+    gint lines = 0;
+    gint bytes = 0;
+    gchar *tmp_str;
+    gchar *doc_name;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc),
-				    &start,
-				    &end);
+    priv = plugin->priv;
 
-	lines = gtk_text_buffer_get_line_count (GTK_TEXT_BUFFER (doc));
+    gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc), &start, &end);
 
-	calculate_info (doc,
-			&start, &end,
-			&chars, &words, &white_chars, &bytes);
+    lines = gtk_text_buffer_get_line_count (GTK_TEXT_BUFFER (doc));
 
-	if (chars == 0)
-		lines = 0;
+    calculate_info (doc, &start, &end, &chars, &words, &white_chars, &bytes);
 
-	xed_debug_message (DEBUG_PLUGINS, "Chars: %d", chars);
-	xed_debug_message (DEBUG_PLUGINS, "Lines: %d", lines);
-	xed_debug_message (DEBUG_PLUGINS, "Words: %d", words);
-	xed_debug_message (DEBUG_PLUGINS, "Chars non-space: %d", chars - white_chars);
-	xed_debug_message (DEBUG_PLUGINS, "Bytes: %d", bytes);
+    if (chars == 0)
+    {
+        lines = 0;
+    }
 
-	doc_name = xed_document_get_short_name_for_display (doc);
-	tmp_str = g_strdup_printf ("<span weight=\"bold\">%s</span>", doc_name);
-	gtk_label_set_markup (GTK_LABEL (dialog->file_name_label), tmp_str);
-	g_free (doc_name);
-	g_free (tmp_str);
+    xed_debug_message (DEBUG_PLUGINS, "Chars: %d", chars);
+    xed_debug_message (DEBUG_PLUGINS, "Lines: %d", lines);
+    xed_debug_message (DEBUG_PLUGINS, "Words: %d", words);
+    xed_debug_message (DEBUG_PLUGINS, "Chars non-space: %d", chars - white_chars);
+    xed_debug_message (DEBUG_PLUGINS, "Bytes: %d", bytes);
 
-	tmp_str = g_strdup_printf("%d", lines);
-	gtk_label_set_text (GTK_LABEL (dialog->lines_label), tmp_str);
-	g_free (tmp_str);
+    doc_name = xed_document_get_short_name_for_display (doc);
+    tmp_str = g_strdup_printf ("<span weight=\"bold\">%s</span>", doc_name);
+    gtk_label_set_markup (GTK_LABEL (priv->file_name_label), tmp_str);
+    g_free (doc_name);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", words);
-	gtk_label_set_text (GTK_LABEL (dialog->words_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", lines);
+    gtk_label_set_text (GTK_LABEL (priv->lines_label), tmp_str);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", chars);
-	gtk_label_set_text (GTK_LABEL (dialog->chars_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", words);
+    gtk_label_set_text (GTK_LABEL (priv->words_label), tmp_str);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", chars - white_chars);
-	gtk_label_set_text (GTK_LABEL (dialog->chars_ns_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", chars);
+    gtk_label_set_text (GTK_LABEL (priv->chars_label), tmp_str);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", bytes);
-	gtk_label_set_text (GTK_LABEL (dialog->bytes_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", chars - white_chars);
+    gtk_label_set_text (GTK_LABEL (priv->chars_ns_label), tmp_str);
+    g_free (tmp_str);
+
+    tmp_str = g_strdup_printf("%d", bytes);
+    gtk_label_set_text (GTK_LABEL (priv->bytes_label), tmp_str);
+    g_free (tmp_str);
 }
 
 static void
-selectioninfo_real (XedDocument *doc,
-		    DocInfoDialog *dialog)
+update_selection_info (XedDocInfoPlugin *plugin,
+                       XedDocument *doc)
 {
-	gboolean sel;
-	GtkTextIter start, end;
-	gint words = 0;
-	gint chars = 0;
-	gint white_chars = 0;
-	gint lines = 0;
-	gint bytes = 0;
-	gchar *tmp_str;
+    XedDocInfoPluginPrivate *priv;
+    gboolean sel;
+    GtkTextIter start, end;
+    gint words = 0;
+    gint chars = 0;
+    gint white_chars = 0;
+    gint lines = 0;
+    gint bytes = 0;
+    gchar *tmp_str;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	sel = gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc),
-						    &start,
-						    &end);
+    priv = plugin->priv;
 
-	if (sel)
-	{
-		lines = gtk_text_iter_get_line (&end) - gtk_text_iter_get_line (&start) + 1;
-	
-		calculate_info (doc,
-				&start, &end,
-				&chars, &words, &white_chars, &bytes);
+    sel = gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start, &end);
 
-		xed_debug_message (DEBUG_PLUGINS, "Selected chars: %d", chars);
-		xed_debug_message (DEBUG_PLUGINS, "Selected lines: %d", lines);
-		xed_debug_message (DEBUG_PLUGINS, "Selected words: %d", words);
-		xed_debug_message (DEBUG_PLUGINS, "Selected chars non-space: %d", chars - white_chars);
-		xed_debug_message (DEBUG_PLUGINS, "Selected bytes: %d", bytes);
+    if (sel)
+    {
+        lines = gtk_text_iter_get_line (&end) - gtk_text_iter_get_line (&start) + 1;
 
-		gtk_widget_set_sensitive (dialog->selection_vbox, TRUE);
-	}
-	else
-	{
-		gtk_widget_set_sensitive (dialog->selection_vbox, FALSE);
+        calculate_info (doc, &start, &end, &chars, &words, &white_chars, &bytes);
 
-		xed_debug_message (DEBUG_PLUGINS, "Selection empty");
-	}
+        xed_debug_message (DEBUG_PLUGINS, "Selected chars: %d", chars);
+        xed_debug_message (DEBUG_PLUGINS, "Selected lines: %d", lines);
+        xed_debug_message (DEBUG_PLUGINS, "Selected words: %d", words);
+        xed_debug_message (DEBUG_PLUGINS, "Selected chars non-space: %d", chars - white_chars);
+        xed_debug_message (DEBUG_PLUGINS, "Selected bytes: %d", bytes);
 
-	if (chars == 0)
-		lines = 0;
+        gtk_widget_set_sensitive (priv->selection_vbox, TRUE);
+    }
+    else
+    {
+        gtk_widget_set_sensitive (priv->selection_vbox, FALSE);
 
-	tmp_str = g_strdup_printf("%d", lines);
-	gtk_label_set_text (GTK_LABEL (dialog->selected_lines_label), tmp_str);
-	g_free (tmp_str);
+        xed_debug_message (DEBUG_PLUGINS, "Selection empty");
+    }
 
-	tmp_str = g_strdup_printf("%d", words);
-	gtk_label_set_text (GTK_LABEL (dialog->selected_words_label), tmp_str);
-	g_free (tmp_str);
+    if (chars == 0)
+    {
+        lines = 0;
+    }
 
-	tmp_str = g_strdup_printf("%d", chars);
-	gtk_label_set_text (GTK_LABEL (dialog->selected_chars_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", lines);
+    gtk_label_set_text (GTK_LABEL (priv->selected_lines_label), tmp_str);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", chars - white_chars);
-	gtk_label_set_text (GTK_LABEL (dialog->selected_chars_ns_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", words);
+    gtk_label_set_text (GTK_LABEL (priv->selected_words_label), tmp_str);
+    g_free (tmp_str);
 
-	tmp_str = g_strdup_printf("%d", bytes);
-	gtk_label_set_text (GTK_LABEL (dialog->selected_bytes_label), tmp_str);
-	g_free (tmp_str);
+    tmp_str = g_strdup_printf("%d", chars);
+    gtk_label_set_text (GTK_LABEL (priv->selected_chars_label), tmp_str);
+    g_free (tmp_str);
+
+    tmp_str = g_strdup_printf("%d", chars - white_chars);
+    gtk_label_set_text (GTK_LABEL (priv->selected_chars_ns_label), tmp_str);
+    g_free (tmp_str);
+
+    tmp_str = g_strdup_printf("%d", bytes);
+    gtk_label_set_text (GTK_LABEL (priv->selected_bytes_label), tmp_str);
+    g_free (tmp_str);
 }
 
 static void
-docinfo_cb (GtkAction	*action,
-	    XedWindow *window)
+docinfo_dialog_response_cb (GtkDialog        *widget,
+                            gint              res_id,
+                            XedDocInfoPlugin *plugin)
 {
-	XedDocument *doc;
-	WindowData *data;
+    XedDocInfoPluginPrivate *priv;
 
-	xed_debug (DEBUG_PLUGINS);
+    priv = plugin->priv;
 
-	data = (WindowData *) g_object_get_data (G_OBJECT (window),
-						 WINDOW_DATA_KEY);
+    switch (res_id)
+    {
+        case GTK_RESPONSE_CLOSE:
+        {
+            xed_debug_message (DEBUG_PLUGINS, "GTK_RESPONSE_CLOSE");
+            gtk_widget_destroy (priv->dialog);
+            break;
+        }
 
-	doc = xed_window_get_active_document (window);
-	g_return_if_fail (doc != NULL);
+        case GTK_RESPONSE_OK:
+        {
+            XedDocument *doc;
 
-	if (data->dialog != NULL)
-	{
-		gtk_window_present (GTK_WINDOW (data->dialog->dialog));
-		gtk_widget_grab_focus (GTK_WIDGET (data->dialog->dialog));
-	}
-	else
-	{
-		DocInfoDialog *dialog;
+            xed_debug_message (DEBUG_PLUGINS, "GTK_RESPONSE_OK");
 
-		dialog = get_docinfo_dialog (window, data);
-		g_return_if_fail (dialog != NULL);
-		
-		data->dialog = dialog;
+            doc = xed_window_get_active_document (priv->window);
 
-		gtk_widget_show (GTK_WIDGET (dialog->dialog));
-	}
-	
-	docinfo_real (doc, 
-		      data->dialog);	
-	selectioninfo_real (doc, 
-			    data->dialog);
+            update_document_info (plugin, doc);
+            update_selection_info (plugin, doc);
+            break;
+        }
+    }
 }
 
 static void
-docinfo_dialog_response_cb (GtkDialog	*widget,
-			    gint	res_id,
-			    XedWindow *window)
+create_docinfo_dialog (XedDocInfoPlugin *plugin)
 {
-	WindowData *data;
+    XedDocInfoPluginPrivate *priv;
+    gchar *data_dir;
+    gchar *ui_file;
+    GtkWidget *content;
+    GtkWidget *error_widget;
+    gboolean ret;
 
-	xed_debug (DEBUG_PLUGINS);
-	
-	data = (WindowData *) g_object_get_data (G_OBJECT (window),
-						 WINDOW_DATA_KEY);
+    xed_debug (DEBUG_PLUGINS);
 
-	switch (res_id)
-	{
-		case GTK_RESPONSE_CLOSE:
-		{
-			xed_debug_message (DEBUG_PLUGINS, "GTK_RESPONSE_CLOSE");
-			gtk_widget_destroy (data->dialog->dialog);
+    priv = plugin->priv;
 
-			break;
-		}
+    data_dir = peas_extension_base_get_data_dir (PEAS_EXTENSION_BASE (plugin));
+    ui_file = g_build_filename (data_dir, "docinfo.ui", NULL);
+    ret = xed_utils_get_ui_objects (ui_file,
+                                    NULL,
+                                    &error_widget,
+                                    "dialog", &priv->dialog,
+                                    "docinfo_dialog_content", &content,
+                                    "file_name_label", &priv->file_name_label,
+                                    "words_label", &priv->words_label,
+                                    "bytes_label", &priv->bytes_label,
+                                    "lines_label", &priv->lines_label,
+                                    "chars_label", &priv->chars_label,
+                                    "chars_ns_label", &priv->chars_ns_label,
+                                    "selection_vbox", &priv->selection_vbox,
+                                    "selected_words_label", &priv->selected_words_label,
+                                    "selected_bytes_label", &priv->selected_bytes_label,
+                                    "selected_lines_label", &priv->selected_lines_label,
+                                    "selected_chars_label", &priv->selected_chars_label,
+                                    "selected_chars_ns_label", &priv->selected_chars_ns_label,
+                                    NULL);
 
-		case GTK_RESPONSE_OK:
-		{
-			XedDocument *doc;
-			
-			xed_debug_message (DEBUG_PLUGINS, "GTK_RESPONSE_OK");
-			
-			doc = xed_window_get_active_document (window);
-			g_return_if_fail (doc != NULL);
-			
-			docinfo_real (doc,
-				      data->dialog);
+    g_free (data_dir);
+    g_free (ui_file);
 
-			selectioninfo_real (doc,
-					    data->dialog);
-			
-			break;
-		}
-	}
+    if (!ret)
+    {
+        const gchar *err_message;
+
+        err_message = gtk_label_get_label (GTK_LABEL (error_widget));
+        xed_warning (GTK_WINDOW (priv->window), "%s", err_message);
+
+        gtk_widget_destroy (error_widget);
+
+        return;
+    }
+
+    gtk_dialog_set_default_response (GTK_DIALOG (priv->dialog), GTK_RESPONSE_OK);
+    gtk_window_set_transient_for (GTK_WINDOW (priv->dialog), GTK_WINDOW (priv->window));
+
+    g_signal_connect (priv->dialog, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &priv->dialog);
+    g_signal_connect (priv->dialog, "response",
+                      G_CALLBACK (docinfo_dialog_response_cb), plugin);
+}
+
+static void
+docinfo_cb (GtkAction        *action,
+            XedDocInfoPlugin *plugin)
+{
+    XedDocInfoPluginPrivate *priv;
+    XedDocument *doc;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = plugin->priv;
+
+    doc = xed_window_get_active_document (priv->window);
+
+    if (priv->dialog != NULL)
+    {
+        gtk_window_present (GTK_WINDOW (priv->dialog));
+        gtk_widget_grab_focus (GTK_WIDGET (priv->dialog));
+    }
+    else
+    {
+        create_docinfo_dialog (plugin);
+        gtk_widget_show (GTK_WIDGET (priv->dialog));
+    }
+
+    update_document_info (plugin, doc);
+    update_selection_info (plugin, doc);
 }
 
 static const GtkActionEntry action_entries[] =
 {
-	{ "DocumentStatistics",
-	  NULL,
-	  N_("_Document Statistics"),
-	  NULL,
-	  N_("Get statistical information on the current document"),
-	  G_CALLBACK (docinfo_cb) }
+    { "DocumentStatistics",
+      NULL,
+      N_("_Document Statistics"),
+      NULL,
+      N_("Get statistical information on the current document"),
+      G_CALLBACK (docinfo_cb) }
 };
 
-static void
-free_window_data (WindowData *data)
-{
-	g_return_if_fail (data != NULL);
-	
-	xed_debug (DEBUG_PLUGINS);
-
-	g_object_unref (data->plugin);
-
-	g_object_unref (data->ui_action_group);
-	
-	if (data->dialog != NULL)
-	{
-		gtk_widget_destroy (data->dialog->dialog);
-	}
-	
-	g_free (data);
-}
-
-static void
-update_ui_real (XedWindow  *window,
-		WindowData   *data)
-{
-	XedView *view;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	view = xed_window_get_active_view (window);
-
-	gtk_action_group_set_sensitive (data->ui_action_group,
-					(view != NULL));
-					
-	if (data->dialog != NULL)
-	{
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog->dialog),
-						   GTK_RESPONSE_OK,
-						   (view != NULL));
-	}
-}
-
 static void
 xed_docinfo_plugin_init (XedDocInfoPlugin *plugin)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin initializing");
+    xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin initializing");
+    plugin->priv = xed_docinfo_plugin_get_instance_private (plugin);
+}
+
+static void
+xed_docinfo_plugin_dispose (GObject *object)
+{
+    XedDocInfoPlugin *plugin = XED_DOCINFO_PLUGIN (object);
+
+    xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin dispose");
+
+    g_clear_object (&plugin->priv->action_group);
+    g_clear_object (&plugin->priv->window);
+
+    G_OBJECT_CLASS (xed_docinfo_plugin_parent_class)->dispose (object);
 }
 
 static void
 xed_docinfo_plugin_finalize (GObject *object)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin finalizing");
 
-	G_OBJECT_CLASS (xed_docinfo_plugin_parent_class)->finalize (object);
+    G_OBJECT_CLASS (xed_docinfo_plugin_parent_class)->finalize (object);
 }
 
 static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
+xed_docinfo_plugin_set_property (GObject      *object,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
 {
-	GtkUIManager *manager;
-	WindowData *data;
-	
-	xed_debug (DEBUG_PLUGINS);
+    XedDocInfoPlugin *plugin = XED_DOCINFO_PLUGIN (object);
 
-	data = g_new (WindowData, 1);
-
-	data->plugin = g_object_ref (plugin);
-	data->dialog = NULL;
-	data->ui_action_group = gtk_action_group_new ("XedDocInfoPluginActions");
-	
-	gtk_action_group_set_translation_domain (data->ui_action_group, 
-						 GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (data->ui_action_group,
-				      action_entries,
-				      G_N_ELEMENTS (action_entries),
-				      window);
-
-	manager = xed_window_get_ui_manager (window);
-	gtk_ui_manager_insert_action_group (manager,
-					    data->ui_action_group,
-					    -1);
-
-	data->ui_id = gtk_ui_manager_new_merge_id (manager);
-
-	g_object_set_data_full (G_OBJECT (window), 
-				WINDOW_DATA_KEY, 
-				data,
-				(GDestroyNotify) free_window_data);
-
-	gtk_ui_manager_add_ui (manager, 
-			       data->ui_id, 
-			       MENU_PATH,
-			       "DocumentStatistics", 
-			       "DocumentStatistics",
-			       GTK_UI_MANAGER_MENUITEM, 
-			       FALSE);
-
-	update_ui_real (window,
-			data);
+    switch (prop_id)
+    {
+        case PROP_WINDOW:
+            plugin->priv->window = XED_WINDOW (g_value_dup_object (value));
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
 }
 
 static void
-impl_deactivate	(XedPlugin *plugin,
-		 XedWindow *window)
+xed_docinfo_plugin_get_property (GObject    *object,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
 {
-	GtkUIManager *manager;
-	WindowData *data;
+    XedDocInfoPlugin *plugin = XED_DOCINFO_PLUGIN (object);
 
-	xed_debug (DEBUG_PLUGINS);
-
-	manager = xed_window_get_ui_manager (window);
-
-	data = (WindowData *) g_object_get_data (G_OBJECT (window),
-						 WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-
-	gtk_ui_manager_remove_ui (manager,
-				  data->ui_id);
-	gtk_ui_manager_remove_action_group (manager,
-					    data->ui_action_group);
-
-	g_object_set_data (G_OBJECT (window),
-			   WINDOW_DATA_KEY,
-			   NULL);
+    switch (prop_id)
+   {
+        case PROP_WINDOW:
+            g_value_set_object (value, plugin->priv->window);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+   }
 }
 
 static void
-impl_update_ui (XedPlugin *plugin,
-		XedWindow *window)
+update_ui (XedDocInfoPlugin *plugin)
 {
-	WindowData *data;
+    XedDocInfoPluginPrivate *priv;
+    XedView *view;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	data = (WindowData *) g_object_get_data (G_OBJECT (window),
-						 WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
+    priv = plugin->priv;
 
-	update_ui_real (window,
-			data);
+    view = xed_window_get_active_view (priv->window);
+
+    gtk_action_group_set_sensitive (priv->action_group, (view != NULL));
+
+    if (priv->dialog != NULL)
+    {
+        gtk_dialog_set_response_sensitive (GTK_DIALOG (priv->dialog), GTK_RESPONSE_OK, (view != NULL));
+    }
+}
+
+static void
+xed_docinfo_plugin_activate (XedWindowActivatable *activatable)
+{
+    XedDocInfoPluginPrivate *priv;
+    GtkUIManager *manager;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_DOCINFO_PLUGIN (activatable)->priv;
+    manager = xed_window_get_ui_manager (priv->window);
+
+    priv->action_group = gtk_action_group_new ("XedDocinfoPluginActions");
+    gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE);
+    gtk_action_group_add_actions (priv->action_group, action_entries, G_N_ELEMENTS (action_entries), activatable);
+
+    gtk_ui_manager_insert_action_group (manager, priv->action_group, -1);
+
+    priv->ui_id = gtk_ui_manager_new_merge_id (manager);
+
+    gtk_ui_manager_add_ui (manager,
+                           priv->ui_id,
+                           MENU_PATH,
+                           "DocumentStatistics",
+                           "DocumentStatistics",
+                           GTK_UI_MANAGER_MENUITEM,
+                           FALSE);
+
+    update_ui (XED_DOCINFO_PLUGIN (activatable));
+}
+
+static void
+xed_docinfo_plugin_deactivate (XedWindowActivatable *activatable)
+{
+    XedDocInfoPluginPrivate *priv;
+    GtkUIManager *manager;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_DOCINFO_PLUGIN (activatable)->priv;
+    manager = xed_window_get_ui_manager (priv->window);
+
+    gtk_ui_manager_remove_ui (manager, priv->ui_id);
+    gtk_ui_manager_remove_action_group (manager, priv->action_group);
+}
+
+static void
+xed_docinfo_plugin_update_state (XedWindowActivatable *activatable)
+{
+    xed_debug (DEBUG_PLUGINS);
+
+    update_ui (XED_DOCINFO_PLUGIN (activatable));
 }
 
 static void
 xed_docinfo_plugin_class_init (XedDocInfoPluginClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->finalize = xed_docinfo_plugin_finalize;
+    object_class->dispose = xed_docinfo_plugin_dispose;
+    object_class->finalize = xed_docinfo_plugin_finalize;
+    object_class->set_property = xed_docinfo_plugin_set_property;
+    object_class->get_property = xed_docinfo_plugin_get_property;
 
-	plugin_class->activate = impl_activate;
-	plugin_class->deactivate = impl_deactivate;
-	plugin_class->update_ui = impl_update_ui;
+    g_object_class_override_property (object_class, PROP_WINDOW, "window");
+}
+
+static void
+xed_window_activatable_iface_init (XedWindowActivatableInterface *iface)
+{
+    iface->activate = xed_docinfo_plugin_activate;
+    iface->deactivate = xed_docinfo_plugin_deactivate;
+    iface->update_state = xed_docinfo_plugin_update_state;
+}
+
+static void
+xed_docinfo_plugin_class_finalize (XedDocInfoPluginClass *klass)
+{
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+    xed_docinfo_plugin_register_type (G_TYPE_MODULE (module));
+
+    peas_object_module_register_extension_type (module,
+                                                XED_TYPE_WINDOW_ACTIVATABLE,
+                                                XED_TYPE_DOCINFO_PLUGIN);
 }

plugins/docinfo/xed-docinfo-plugin.h

@@ -1,7 +1,7 @@
 /*
  * xed-docinfo-plugin.h
- * 
- * Copyright (C) 2002-2005 Paolo Maggi 
+ *
+ * Copyright (C) 2002-2005 Paolo Maggi
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,50 +25,39 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <xed/xed-plugin.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
 
 G_BEGIN_DECLS
 
-/*
- * Type checking and casting macros
- */
-#define XED_TYPE_DOCINFO_PLUGIN		(xed_docinfo_plugin_get_type ())
-#define XED_DOCINFO_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPlugin))
-#define XED_DOCINFO_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginClass))
-#define XED_IS_DOCINFO_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_DOCINFO_PLUGIN))
-#define XED_IS_DOCINFO_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_DOCINFO_PLUGIN))
-#define XED_DOCINFO_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginClass))
+#define XED_TYPE_DOCINFO_PLUGIN         (xed_docinfo_plugin_get_type ())
+#define XED_DOCINFO_PLUGIN(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPlugin))
+#define XED_DOCINFO_PLUGIN_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginClass))
+#define XED_IS_DOCINFO_PLUGIN(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_DOCINFO_PLUGIN))
+#define XED_IS_DOCINFO_PLUGIN_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_DOCINFO_PLUGIN))
+#define XED_DOCINFO_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginClass))
 
-/* Private structure type */
-typedef struct _XedDocInfoPluginPrivate	XedDocInfoPluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _XedDocInfoPlugin		XedDocInfoPlugin;
+typedef struct _XedDocInfoPlugin        XedDocInfoPlugin;
+typedef struct _XedDocInfoPluginPrivate XedDocInfoPluginPrivate;
+typedef struct _XedDocInfoPluginClass   XedDocInfoPluginClass;
 
 struct _XedDocInfoPlugin
 {
-	XedPlugin parent_instance;
+    PeasExtensionBase parent;
+
+    XedDocInfoPluginPrivate *priv;
 };
 
-/*
- * Class definition
- */
-typedef struct _XedDocInfoPluginClass	XedDocInfoPluginClass;
+typedef struct _XedDocInfoPluginClass   XedDocInfoPluginClass;
 
 struct _XedDocInfoPluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
-/*
- * Public methods
- */
-GType	xed_docinfo_plugin_get_type		(void) G_GNUC_CONST;
+GType xed_docinfo_plugin_get_type     (void) G_GNUC_CONST;
 
-/* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule *module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 

plugins/filebrowser/Makefile.am

@@ -1,94 +0,0 @@
-# filebrowser
-
-plugindir = $(XED_PLUGINS_LIBS_DIR)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	$(XED_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)
-
-BUILT_SOURCES = \
-	xed-file-browser-enum-types.h		\
-	xed-file-browser-enum-types.c		\
-	xed-file-browser-marshal.h 		\
-	xed-file-browser-marshal.c
-
-plugin_LTLIBRARIES = libfilebrowser.la
-
-NOINST_H_FILES = \
-	xed-file-bookmarks-store.h 		\
-	xed-file-browser-store.h 		\
-	xed-file-browser-view.h 		\
-	xed-file-browser-widget.h 		\
-	xed-file-browser-error.h		\
-	xed-file-browser-utils.h		\
-	xed-file-browser-plugin.h		\
-	xed-file-browser-messages.h
-
-libfilebrowser_la_SOURCES = \
-	$(BUILT_SOURCES) 			\
-	xed-file-bookmarks-store.c 		\
-	xed-file-browser-store.c 		\
-	xed-file-browser-view.c 		\
-	xed-file-browser-widget.c 		\
-	xed-file-browser-utils.c 		\
-	xed-file-browser-plugin.c		\
-	xed-file-browser-messages.c		\
-	$(NOINST_H_FILES)
-
-libfilebrowser_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libfilebrowser_la_LIBADD = $(XED_LIBS)
-
-# UI files (if you use ui for your plugin, list those files here)
-uidir = $(XED_PLUGINS_DATA_DIR)/filebrowser
-ui_DATA = xed-file-browser-widget-ui.xml
-
-plugin_in_files = filebrowser.xed-plugin.desktop.in
-
-%.xed-plugin: %.xed-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-xed-file-browser-enum-types.h: xed-file-browser-enum-types.h.template $(NOINST_H_FILES) $(GLIB_MKENUMS)
-	(cd $(srcdir) && $(GLIB_MKENUMS) --template xed-file-browser-enum-types.h.template $(NOINST_H_FILES)) > $@
-
-xed-file-browser-enum-types.c: xed-file-browser-enum-types.c.template xed-file-browser-enum-register.c.template $(NOINST_H_FILES) $(GLIB_MKENUMS)
-	$(AM_V_GEN) (cd $(srcdir) && \
-	$(GLIB_MKENUMS) --template xed-file-browser-enum-types.c.template $(NOINST_H_FILES) && \
-	$(GLIB_MKENUMS) --template xed-file-browser-enum-register.c.template $(NOINST_H_FILES)) > $@
-
-xed-file-browser-marshal.h: xed-file-browser-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=xed_file_browser_marshal > $@
-
-xed-file-browser-marshal.c: xed-file-browser-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) echo "#include \"xed-file-browser-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=xed_file_browser_marshal >> $@
-
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-filebrowser_gschema_in = org.x.editor.plugins.filebrowser.gschema.xml.in
-gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
-	$(ui_DATA)					\
-	$(plugin_in_files)				\
-	$(filebrowser_gschema_in)			\
-	xed-file-browser-enum-types.h.template	\
-	xed-file-browser-enum-types.c.template	\
-	xed-file-browser-enum-register.c.template	\
-	xed-file-browser-marshal.list
-
-CLEANFILES = \
-	$(plugin_DATA)		\
-	$(gsettings_SCHEMAS_in)		\
-	$(gsettings_SCHEMAS)		\
-	$(BUILT_SOURCES)
-
-DISTCLEANFILES = \
-	$(plugin_DATA)		\
-	$(gsettings_SCHEMAS_in)		\
-	$(gsettings_SCHEMAS)		\
-	$(BUILT_SOURCES)
-
--include $(top_srcdir)/git.mk

plugins/filebrowser/filebrowser.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Loader=C
 Module=filebrowser
 IAge=2
@@ -7,4 +7,3 @@ _Description=Easy file access from the side pane
 Icon=system-file-manager
 Authors=Jesse van den Kieboom <jesse@icecrew.nl>
 Copyright=Copyright © 2006 Jesse van den Kieboom
-Website=http://www.mate-desktop.org

plugins/filebrowser/meson.build

@@ -0,0 +1,73 @@
+filebrowser_headers = [
+    'xed-file-bookmarks-store.h',
+    'xed-file-browser-store.h',
+    'xed-file-browser-view.h',
+    'xed-file-browser-widget.h',
+    'xed-file-browser-error.h',
+    'xed-file-browser-utils.h',
+    'xed-file-browser-plugin.h',
+    'xed-file-browser-messages.h'
+]
+
+filebrowser_lib_sources = [
+    'xed-file-bookmarks-store.c',
+    'xed-file-browser-store.c',
+    'xed-file-browser-view.c',
+    'xed-file-browser-widget.c',
+    'xed-file-browser-utils.c',
+    'xed-file-browser-plugin.c',
+    'xed-file-browser-messages.c'
+]
+
+filebrowser_enums = gnome.mkenums_simple(
+    'xed-file-browser-enum-types',
+    sources : filebrowser_headers,
+    identifier_prefix : 'XedFileBrowser',
+    symbol_prefix : 'xed_file_browser'
+)
+
+filebrowser_marshal = gnome.genmarshal(
+    'xed-file-browser-marshal',
+    sources: 'xed-file-browser-marshal.list',
+    prefix: 'xed_file_browser_marshal'
+)
+
+filebrowser_deps = [
+    config_h,
+    gio,
+    glib,
+    gmodule,
+    gtk,
+    gtksourceview,
+    libpeas
+]
+
+library(
+    'filebrowser',
+    filebrowser_headers + filebrowser_lib_sources + filebrowser_enums + filebrowser_marshal,
+    link_with: libxed,
+    dependencies: filebrowser_deps,
+    include_directories: include_dirs,
+    install_rpath: join_paths(prefix, libdir, 'xed'),
+    install: true,
+    install_dir: join_paths(libdir, 'xed', 'plugins')
+)
+
+install_data(
+    'xed-file-browser-widget-ui.xml',
+    install_dir: join_paths(pluginsdatadir, 'filebrowser')
+)
+
+filebrowser_desktop = custom_target(
+    'filebrowser_desktop',
+    input: 'filebrowser.plugin.desktop.in',
+    output: 'filebrowser.plugin',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: pluginslibdir,
+)
+
+install_data(
+    'org.x.editor.plugins.filebrowser.gschema.xml',
+    install_dir: schema_dir
+)

plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml

@@ -16,6 +16,11 @@
       <summary>File Browser Filter Pattern</summary>
       <description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</description>
     </key>
+    <key name="terminal-command" type="s">
+      <default>'x-terminal-emulator'</default>
+      <summary>Terminal Command</summary>
+      <description>The terminal command when using the "Open terminal here" command.</description>
+    </key>
     <child name="on-load" schema="org.x.editor.plugins.filebrowser.on-load"/>
   </schema>
   <schema id="org.x.editor.plugins.filebrowser.on-load" path="/org/x/editor/plugins/filebrowser/on-load/">

plugins/filebrowser/xed-file-bookmarks-store.h

@@ -1,5 +1,5 @@
 /*
- * xed-file-bookmarks-store.h - Xed plugin providing easy file access 
+ * xed-file-bookmarks-store.h - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -25,66 +25,66 @@
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
-#define XED_TYPE_FILE_BOOKMARKS_STORE			(xed_file_bookmarks_store_get_type ())
-#define XED_FILE_BOOKMARKS_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStore))
-#define XED_FILE_BOOKMARKS_STORE_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStore const))
-#define XED_FILE_BOOKMARKS_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStoreClass))
-#define XED_IS_FILE_BOOKMARKS_STORE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BOOKMARKS_STORE))
-#define XED_IS_FILE_BOOKMARKS_STORE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BOOKMARKS_STORE))
-#define XED_FILE_BOOKMARKS_STORE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStoreClass))
+#define XED_TYPE_FILE_BOOKMARKS_STORE               (xed_file_bookmarks_store_get_type ())
+#define XED_FILE_BOOKMARKS_STORE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStore))
+#define XED_FILE_BOOKMARKS_STORE_CONST(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStore const))
+#define XED_FILE_BOOKMARKS_STORE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStoreClass))
+#define XED_IS_FILE_BOOKMARKS_STORE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BOOKMARKS_STORE))
+#define XED_IS_FILE_BOOKMARKS_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BOOKMARKS_STORE))
+#define XED_FILE_BOOKMARKS_STORE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BOOKMARKS_STORE, XedFileBookmarksStoreClass))
 
 typedef struct _XedFileBookmarksStore        XedFileBookmarksStore;
 typedef struct _XedFileBookmarksStoreClass   XedFileBookmarksStoreClass;
 typedef struct _XedFileBookmarksStorePrivate XedFileBookmarksStorePrivate;
 
-enum 
+enum
 {
-	XED_FILE_BOOKMARKS_STORE_COLUMN_ICON = 0,
-	XED_FILE_BOOKMARKS_STORE_COLUMN_NAME,
-	XED_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
-	XED_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
-	XED_FILE_BOOKMARKS_STORE_N_COLUMNS
+    XED_FILE_BOOKMARKS_STORE_COLUMN_ICON = 0,
+    XED_FILE_BOOKMARKS_STORE_COLUMN_NAME,
+    XED_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
+    XED_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
+    XED_FILE_BOOKMARKS_STORE_N_COLUMNS
 };
 
-enum 
+enum
 {
-	XED_FILE_BOOKMARKS_STORE_NONE            	= 0,
-	XED_FILE_BOOKMARKS_STORE_IS_SEPARATOR   	= 1 << 0,  /* Separator item */
-	XED_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR 	= 1 << 1,  /* Special user dir */
-	XED_FILE_BOOKMARKS_STORE_IS_HOME         	= 1 << 2,  /* The special Home user directory */
-	XED_FILE_BOOKMARKS_STORE_IS_DESKTOP      	= 1 << 3,  /* The special Desktop user directory */
-	XED_FILE_BOOKMARKS_STORE_IS_DOCUMENTS    	= 1 << 4,  /* The special Documents user directory */
-	XED_FILE_BOOKMARKS_STORE_IS_FS        	= 1 << 5,  /* A mount object */
-	XED_FILE_BOOKMARKS_STORE_IS_MOUNT        	= 1 << 6,  /* A mount object */
-	XED_FILE_BOOKMARKS_STORE_IS_VOLUME        	= 1 << 7,  /* A volume object */
-	XED_FILE_BOOKMARKS_STORE_IS_DRIVE        	= 1 << 8,  /* A drive object */
-	XED_FILE_BOOKMARKS_STORE_IS_ROOT         	= 1 << 9,  /* The root file system (file:///) */
-	XED_FILE_BOOKMARKS_STORE_IS_BOOKMARK     	= 1 << 10,  /* A gtk bookmark */
-	XED_FILE_BOOKMARKS_STORE_IS_REMOTE_BOOKMARK	= 1 << 11, /* A remote gtk bookmark */
-	XED_FILE_BOOKMARKS_STORE_IS_LOCAL_BOOKMARK	= 1 << 12  /* A local gtk bookmark */
+    XED_FILE_BOOKMARKS_STORE_NONE               = 0,
+    XED_FILE_BOOKMARKS_STORE_IS_SEPARATOR       = 1 << 0,  /* Separator item */
+    XED_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR     = 1 << 1,  /* Special user dir */
+    XED_FILE_BOOKMARKS_STORE_IS_HOME            = 1 << 2,  /* The special Home user directory */
+    XED_FILE_BOOKMARKS_STORE_IS_DESKTOP         = 1 << 3,  /* The special Desktop user directory */
+    XED_FILE_BOOKMARKS_STORE_IS_DOCUMENTS       = 1 << 4,  /* The special Documents user directory */
+    XED_FILE_BOOKMARKS_STORE_IS_FS          = 1 << 5,  /* A mount object */
+    XED_FILE_BOOKMARKS_STORE_IS_MOUNT           = 1 << 6,  /* A mount object */
+    XED_FILE_BOOKMARKS_STORE_IS_VOLUME          = 1 << 7,  /* A volume object */
+    XED_FILE_BOOKMARKS_STORE_IS_DRIVE           = 1 << 8,  /* A drive object */
+    XED_FILE_BOOKMARKS_STORE_IS_ROOT            = 1 << 9,  /* The root file system (file:///) */
+    XED_FILE_BOOKMARKS_STORE_IS_BOOKMARK        = 1 << 10,  /* A gtk bookmark */
+    XED_FILE_BOOKMARKS_STORE_IS_REMOTE_BOOKMARK = 1 << 11, /* A remote gtk bookmark */
+    XED_FILE_BOOKMARKS_STORE_IS_LOCAL_BOOKMARK  = 1 << 12  /* A local gtk bookmark */
 };
 
-struct _XedFileBookmarksStore 
+struct _XedFileBookmarksStore
 {
-	GtkTreeStore parent;
+    GtkTreeStore parent;
 
-	XedFileBookmarksStorePrivate *priv;
+    XedFileBookmarksStorePrivate *priv;
 };
 
-struct _XedFileBookmarksStoreClass 
+struct _XedFileBookmarksStoreClass
 {
-	GtkTreeStoreClass parent_class;
+    GtkTreeStoreClass parent_class;
 };
 
-GType xed_file_bookmarks_store_get_type               (void) G_GNUC_CONST;
-GType xed_file_bookmarks_store_register_type          (GTypeModule * module);
+GType xed_file_bookmarks_store_get_type (void) G_GNUC_CONST;
+void _xed_file_bookmarks_store_register_type (GTypeModule *type_module);
 
 XedFileBookmarksStore *xed_file_bookmarks_store_new (void);
-gchar *xed_file_bookmarks_store_get_uri               (XedFileBookmarksStore * model,
-					                 GtkTreeIter * iter);
-void xed_file_bookmarks_store_refresh                 (XedFileBookmarksStore * model);
+GFile *xed_file_bookmarks_store_get_location (XedFileBookmarksStore * model,
+                                              GtkTreeIter * iter);
+void xed_file_bookmarks_store_refresh (XedFileBookmarksStore * model);
 
 G_END_DECLS
-#endif				/* __XED_FILE_BOOKMARKS_STORE_H__ */
+#endif              /* __XED_FILE_BOOKMARKS_STORE_H__ */
 
 // ex:ts=8:noet:

plugins/filebrowser/xed-file-browser-enum-register.c.template

@@ -1,20 +0,0 @@
-/*** BEGIN file-header ***/
-void
-xed_file_browser_enum_and_flag_register_type (GTypeModule * module)
-{
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-	/* Enumerations from "@filename@" */
-	
-/*** END file-production ***/
-
-/*** BEGIN enumeration-production ***/
-	register_@enum_name@ (module);
-
-/*** END enumeration-production ***/
-
-/*** BEGIN file-tail ***/
-}
-
-/*** END file-tail ***/

plugins/filebrowser/xed-file-browser-enum-types.c.template

@@ -1,45 +0,0 @@
-/*** BEGIN file-header ***/
-#include "xed-file-browser-enum-types.h"
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-#include "@filename@"
-
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-static GType @enum_name@_type = 0;
-
-static GType
-register_@enum_name@ (GTypeModule *module)
-{
-	static const G@Type@Value values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
-		{ @VALUENAME@,
-		  "@VALUENAME@",
-		  "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
-		{ 0, NULL, NULL }
-	};
-
-	@enum_name@_type =
-		g_type_module_register_@type@ (module,
-		                               "@EnumName@",
-		                               values);
-
-	return @enum_name@_type;
-}
-
-GType
-@enum_name@_get_type (void)
-{
-	return @enum_name@_type;
-}
-
-/*** END value-tail ***/

plugins/filebrowser/xed-file-browser-enum-types.h.template

@@ -1,29 +0,0 @@
-/*** BEGIN file-header ***/
-#ifndef __XED_FILE_BROWSER_ENUM_TYPES_H__
-#define __XED_FILE_BROWSER_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* Enumerations from "@filename@" */
-
-/*** END file-production ***/
-
-/*** BEGIN enumeration-production ***/
-#define XED_TYPE_@ENUMSHORT@	(@enum_name@_get_type())
-GType @enum_name@_get_type	(void) G_GNUC_CONST;
-
-/*** END enumeration-production ***/
-
-/*** BEGIN file-tail ***/
-void xed_file_browser_enum_and_flag_register_type (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __XED_FILE_BROWSER_ENUM_TYPES_H__ */
-/*** END file-tail ***/
-

plugins/filebrowser/xed-file-browser-marshal.list

@@ -1,5 +1,5 @@
 VOID:UINT,STRING
-VOID:STRING,STRING
-BOOL:OBJECT,POINTER
-BOOL:POINTER
-BOOL:VOID
+VOID:OBJECT,OBJECT
+BOOLEAN:OBJECT,POINTER
+BOOLEAN:POINTER
+BOOLEAN:VOID

plugins/filebrowser/xed-file-browser-plugin.h

@@ -1,5 +1,5 @@
 /*
- * xed-file-browser-plugin.h - Xed plugin providing easy file access 
+ * xed-file-browser-plugin.h - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -24,46 +24,48 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <xed/xed-plugin.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
 
 G_BEGIN_DECLS
+
 /*
  * Type checking and casting macros
  */
-#define XED_TYPE_FILE_BROWSER_PLUGIN		(filetree_plugin_get_type ())
-#define XED_FILE_BROWSER_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPlugin))
-#define XED_FILE_BROWSER_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPluginClass))
-#define XED_IS_FILE_BROWSER_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_FILE_BROWSER_PLUGIN))
-#define XED_IS_FILE_BROWSER_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_FILE_BROWSER_PLUGIN))
-#define XED_FILE_BROWSER_GET_CLASS(o)		(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPluginClass))
+#define XED_TYPE_FILE_BROWSER_PLUGIN        (xed_file_browser_plugin_get_type ())
+#define XED_FILE_BROWSER_PLUGIN(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPlugin))
+#define XED_FILE_BROWSER_PLUGIN_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPluginClass))
+#define XED_IS_FILE_BROWSER_PLUGIN(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_FILE_BROWSER_PLUGIN))
+#define XED_IS_FILE_BROWSER_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_FILE_BROWSER_PLUGIN))
+#define XED_FILE_BROWSER_GET_CLASS(o)       (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPluginClass))
 
 /* Private structure type */
 typedef struct _XedFileBrowserPluginPrivate XedFileBrowserPluginPrivate;
 typedef struct _XedFileBrowserPlugin        XedFileBrowserPlugin;
 typedef struct _XedFileBrowserPluginClass   XedFileBrowserPluginClass;
 
-struct _XedFileBrowserPlugin 
+struct _XedFileBrowserPlugin
 {
-	XedPlugin parent_instance;
+    PeasExtensionBase parent_instance;
 
-	/*< private > */
-	XedFileBrowserPluginPrivate *priv;
+    /*< private > */
+    XedFileBrowserPluginPrivate *priv;
 };
 
 
 
-struct _XedFileBrowserPluginClass 
+struct _XedFileBrowserPluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
 /*
  * Public methods
  */
-GType filetree_plugin_get_type              (void) G_GNUC_CONST;
+GType xed_file_browser_plugin_get_type              (void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule * module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 #endif /* __XED_FILE_BROWSER_PLUGIN_H__ */

plugins/filebrowser/xed-file-browser-store.h

@@ -1,5 +1,5 @@
 /*
- * xed-file-browser-store.h - Xed plugin providing easy file access 
+ * xed-file-browser-store.h - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -25,176 +25,164 @@
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
-#define XED_TYPE_FILE_BROWSER_STORE			(xed_file_browser_store_get_type ())
-#define XED_FILE_BROWSER_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStore))
-#define XED_FILE_BROWSER_STORE_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStore const))
-#define XED_FILE_BROWSER_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStoreClass))
-#define XED_IS_FILE_BROWSER_STORE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_STORE))
-#define XED_IS_FILE_BROWSER_STORE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_STORE))
-#define XED_FILE_BROWSER_STORE_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStoreClass))
+#define XED_TYPE_FILE_BROWSER_STORE         (xed_file_browser_store_get_type ())
+#define XED_FILE_BROWSER_STORE(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStore))
+#define XED_FILE_BROWSER_STORE_CONST(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStore const))
+#define XED_FILE_BROWSER_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStoreClass))
+#define XED_IS_FILE_BROWSER_STORE(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_STORE))
+#define XED_IS_FILE_BROWSER_STORE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_STORE))
+#define XED_FILE_BROWSER_STORE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_STORE, XedFileBrowserStoreClass))
 
-typedef enum 
+typedef enum
 {
-	XED_FILE_BROWSER_STORE_COLUMN_ICON = 0,
-	XED_FILE_BROWSER_STORE_COLUMN_NAME,
-	XED_FILE_BROWSER_STORE_COLUMN_URI,
-	XED_FILE_BROWSER_STORE_COLUMN_FLAGS,
-	XED_FILE_BROWSER_STORE_COLUMN_EMBLEM,
-	XED_FILE_BROWSER_STORE_COLUMN_NUM
+    XED_FILE_BROWSER_STORE_COLUMN_ICON = 0,
+    XED_FILE_BROWSER_STORE_COLUMN_NAME,
+    XED_FILE_BROWSER_STORE_COLUMN_LOCATION,
+    XED_FILE_BROWSER_STORE_COLUMN_FLAGS,
+    XED_FILE_BROWSER_STORE_COLUMN_EMBLEM,
+    XED_FILE_BROWSER_STORE_COLUMN_NUM
 } XedFileBrowserStoreColumn;
 
-typedef enum 
+typedef enum
 {
-	XED_FILE_BROWSER_STORE_FLAG_IS_DIRECTORY = 1 << 0,
-	XED_FILE_BROWSER_STORE_FLAG_IS_HIDDEN    = 1 << 1,
-	XED_FILE_BROWSER_STORE_FLAG_IS_TEXT      = 1 << 2,
-	XED_FILE_BROWSER_STORE_FLAG_LOADED       = 1 << 3,
-	XED_FILE_BROWSER_STORE_FLAG_IS_FILTERED  = 1 << 4,
-	XED_FILE_BROWSER_STORE_FLAG_IS_DUMMY     = 1 << 5
+    XED_FILE_BROWSER_STORE_FLAG_IS_DIRECTORY = 1 << 0,
+    XED_FILE_BROWSER_STORE_FLAG_IS_HIDDEN    = 1 << 1,
+    XED_FILE_BROWSER_STORE_FLAG_IS_TEXT      = 1 << 2,
+    XED_FILE_BROWSER_STORE_FLAG_LOADED       = 1 << 3,
+    XED_FILE_BROWSER_STORE_FLAG_IS_FILTERED  = 1 << 4,
+    XED_FILE_BROWSER_STORE_FLAG_IS_DUMMY     = 1 << 5
 } XedFileBrowserStoreFlag;
 
-typedef enum 
+typedef enum
 {
-	XED_FILE_BROWSER_STORE_RESULT_OK,
-	XED_FILE_BROWSER_STORE_RESULT_NO_CHANGE,
-	XED_FILE_BROWSER_STORE_RESULT_ERROR,
-	XED_FILE_BROWSER_STORE_RESULT_NO_TRASH,
-	XED_FILE_BROWSER_STORE_RESULT_MOUNTING,
-	XED_FILE_BROWSER_STORE_RESULT_NUM
+    XED_FILE_BROWSER_STORE_RESULT_OK,
+    XED_FILE_BROWSER_STORE_RESULT_NO_CHANGE,
+    XED_FILE_BROWSER_STORE_RESULT_ERROR,
+    XED_FILE_BROWSER_STORE_RESULT_NO_TRASH,
+    XED_FILE_BROWSER_STORE_RESULT_MOUNTING,
+    XED_FILE_BROWSER_STORE_RESULT_NUM
 } XedFileBrowserStoreResult;
 
-typedef enum 
+typedef enum
 {
-	XED_FILE_BROWSER_STORE_FILTER_MODE_NONE        = 0,
-	XED_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN = 1 << 0,
-	XED_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY = 1 << 1
+    XED_FILE_BROWSER_STORE_FILTER_MODE_NONE        = 0,
+    XED_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN = 1 << 0,
+    XED_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY = 1 << 1
 } XedFileBrowserStoreFilterMode;
 
-#define FILE_IS_DIR(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_IS_DIRECTORY)
-#define FILE_IS_HIDDEN(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_IS_HIDDEN)
-#define FILE_IS_TEXT(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_IS_TEXT)
-#define FILE_LOADED(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_LOADED)
-#define FILE_IS_FILTERED(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_IS_FILTERED)
-#define FILE_IS_DUMMY(flags)	(flags & XED_FILE_BROWSER_STORE_FLAG_IS_DUMMY)
+#define FILE_IS_DIR(flags)  (flags & XED_FILE_BROWSER_STORE_FLAG_IS_DIRECTORY)
+#define FILE_IS_HIDDEN(flags)   (flags & XED_FILE_BROWSER_STORE_FLAG_IS_HIDDEN)
+#define FILE_IS_TEXT(flags) (flags & XED_FILE_BROWSER_STORE_FLAG_IS_TEXT)
+#define FILE_LOADED(flags)  (flags & XED_FILE_BROWSER_STORE_FLAG_LOADED)
+#define FILE_IS_FILTERED(flags) (flags & XED_FILE_BROWSER_STORE_FLAG_IS_FILTERED)
+#define FILE_IS_DUMMY(flags)    (flags & XED_FILE_BROWSER_STORE_FLAG_IS_DUMMY)
 
 typedef struct _XedFileBrowserStore        XedFileBrowserStore;
 typedef struct _XedFileBrowserStoreClass   XedFileBrowserStoreClass;
 typedef struct _XedFileBrowserStorePrivate XedFileBrowserStorePrivate;
 
-typedef gboolean (*XedFileBrowserStoreFilterFunc) (XedFileBrowserStore
-						     * model,
-						     GtkTreeIter * iter,
-						     gpointer user_data);
+typedef gboolean (*XedFileBrowserStoreFilterFunc) (XedFileBrowserStore *model,
+                                                   GtkTreeIter         *iter,
+                                                   gpointer             user_data);
 
-struct _XedFileBrowserStore 
+struct _XedFileBrowserStore
 {
-	GObject parent;
+    GObject parent;
 
-	XedFileBrowserStorePrivate *priv;
+    XedFileBrowserStorePrivate *priv;
 };
 
 struct _XedFileBrowserStoreClass {
-	GObjectClass parent_class;
+    GObjectClass parent_class;
 
-	/* Signals */
-	void (*begin_loading)        (XedFileBrowserStore * model,
-			              GtkTreeIter * iter);
-	void (*end_loading)          (XedFileBrowserStore * model,
-			              GtkTreeIter * iter);
-	void (*error)                (XedFileBrowserStore * model, 
-	                              guint code,
-		                      gchar * message);
-	gboolean (*no_trash)	     (XedFileBrowserStore * model,
-				      GList * files);
-	void (*rename)		     (XedFileBrowserStore * model,
-				      const gchar * olduri,
-				      const gchar * newuri);
-	void (*begin_refresh)	     (XedFileBrowserStore * model);
-	void (*end_refresh)	     (XedFileBrowserStore * model);
-	void (*unload)		     (XedFileBrowserStore * model,
-				      const gchar * uri);
+    /* Signals */
+    void (*begin_loading) (XedFileBrowserStore *model,
+                           GtkTreeIter         *iter);
+    void (*end_loading)   (XedFileBrowserStore *model,
+                           GtkTreeIter         *iter);
+    void (*error)         (XedFileBrowserStore *model,
+                           guint                code,
+                           gchar               *message);
+    gboolean (*no_trash)  (XedFileBrowserStore *model,
+                           GList               *files);
+    void (*rename)        (XedFileBrowserStore *model,
+                           GFile               *oldfile,
+                           GFile               *newfile);
+    void (*begin_refresh) (XedFileBrowserStore *model);
+    void (*end_refresh)   (XedFileBrowserStore *model);
+    void (*unload)        (XedFileBrowserStore *model,
+                           GFile               *location);
 };
 
-GType xed_file_browser_store_get_type               (void) G_GNUC_CONST;
-GType xed_file_browser_store_register_type          (GTypeModule * module);
+GType xed_file_browser_store_get_type (void) G_GNUC_CONST;
+void _xed_file_browser_store_register_type (GTypeModule *type_module);
 
-XedFileBrowserStore *xed_file_browser_store_new   (gchar const *root);
+XedFileBrowserStore *xed_file_browser_store_new (GFile *root);
 
-XedFileBrowserStoreResult
-xed_file_browser_store_set_root_and_virtual_root    (XedFileBrowserStore * model,
-						       gchar const *root,
-			  			       gchar const *virtual_root);
-XedFileBrowserStoreResult
-xed_file_browser_store_set_root                     (XedFileBrowserStore * model,
-				                       gchar const *root);
-XedFileBrowserStoreResult
-xed_file_browser_store_set_virtual_root             (XedFileBrowserStore * model,
-					               GtkTreeIter * iter);
-XedFileBrowserStoreResult
-xed_file_browser_store_set_virtual_root_from_string (XedFileBrowserStore * model, 
-                                                       gchar const *root);
-XedFileBrowserStoreResult
-xed_file_browser_store_set_virtual_root_up          (XedFileBrowserStore * model);
-XedFileBrowserStoreResult
-xed_file_browser_store_set_virtual_root_top         (XedFileBrowserStore * model);
+XedFileBrowserStoreResult xed_file_browser_store_set_root_and_virtual_root (XedFileBrowserStore *model,
+                                                                            GFile               *root,
+                                                                            GFile              *virtual_root);
+XedFileBrowserStoreResult xed_file_browser_store_set_root (XedFileBrowserStore *model,
+                                                           GFile               *root);
+XedFileBrowserStoreResult xed_file_browser_store_set_virtual_root (XedFileBrowserStore *model,
+                                                                   GtkTreeIter         *iter);
+XedFileBrowserStoreResult xed_file_browser_store_set_virtual_root_from_location (XedFileBrowserStore *model,
+                                                                                 GFile               *root);
+XedFileBrowserStoreResult xed_file_browser_store_set_virtual_root_up (XedFileBrowserStore *model);
+XedFileBrowserStoreResult xed_file_browser_store_set_virtual_root_top (XedFileBrowserStore *model);
 
-gboolean
-xed_file_browser_store_get_iter_virtual_root        (XedFileBrowserStore * model, 
-                                                       GtkTreeIter * iter);
-gboolean xed_file_browser_store_get_iter_root       (XedFileBrowserStore * model,
-						       GtkTreeIter * iter);
-gchar * xed_file_browser_store_get_root             (XedFileBrowserStore * model);
-gchar * xed_file_browser_store_get_virtual_root     (XedFileBrowserStore * model);
+gboolean xed_file_browser_store_get_iter_virtual_root (XedFileBrowserStore *model,
+                                                       GtkTreeIter         *iter);
+gboolean xed_file_browser_store_get_iter_root (XedFileBrowserStore *model,
+                                               GtkTreeIter         *iter);
+GFile * xed_file_browser_store_get_root (XedFileBrowserStore *model);
+GFile * xed_file_browser_store_get_virtual_root (XedFileBrowserStore *model);
 
-gboolean xed_file_browser_store_iter_equal          (XedFileBrowserStore * model, 
-                                                       GtkTreeIter * iter1,
-					               GtkTreeIter * iter2);
+gboolean xed_file_browser_store_iter_equal (XedFileBrowserStore *model,
+                                            GtkTreeIter         *iter1,
+                                            GtkTreeIter         *iter2);
 
-void xed_file_browser_store_set_value               (XedFileBrowserStore * tree_model, 
-                                                       GtkTreeIter * iter,
-                                                       gint column, 
-                                                       GValue * value);
+void xed_file_browser_store_set_value (XedFileBrowserStore *tree_model,
+                                       GtkTreeIter         *iter,
+                                       gint                 column,
+                                       GValue              *value);
 
-void _xed_file_browser_store_iter_expanded          (XedFileBrowserStore * model, 
-                                                       GtkTreeIter * iter);
-void _xed_file_browser_store_iter_collapsed         (XedFileBrowserStore * model, 
-                                                       GtkTreeIter * iter);
+void _xed_file_browser_store_iter_expanded (XedFileBrowserStore *model,
+                                            GtkTreeIter         *iter);
+void _xed_file_browser_store_iter_collapsed (XedFileBrowserStore *model,
+                                             GtkTreeIter         *iter);
 
-XedFileBrowserStoreFilterMode
-xed_file_browser_store_get_filter_mode              (XedFileBrowserStore * model);
-void xed_file_browser_store_set_filter_mode         (XedFileBrowserStore * model,
-                                                       XedFileBrowserStoreFilterMode mode);
-void xed_file_browser_store_set_filter_func         (XedFileBrowserStore * model,
-                                                       XedFileBrowserStoreFilterFunc func, 
-                                                       gpointer user_data);
-void xed_file_browser_store_refilter                (XedFileBrowserStore * model);
-XedFileBrowserStoreFilterMode
-xed_file_browser_store_filter_mode_get_default      (void);
+XedFileBrowserStoreFilterMode xed_file_browser_store_get_filter_mode (XedFileBrowserStore *model);
+void xed_file_browser_store_set_filter_mode (XedFileBrowserStore           *model,
+                                             XedFileBrowserStoreFilterMode  mode);
+void xed_file_browser_store_set_filter_func (XedFileBrowserStore           *model,
+                                             XedFileBrowserStoreFilterFunc  func,
+                                             gpointer                       user_data);
+void xed_file_browser_store_refilter (XedFileBrowserStore *model);
+XedFileBrowserStoreFilterMode xed_file_browser_store_filter_mode_get_default (void);
 
-void xed_file_browser_store_refresh                 (XedFileBrowserStore * model);
-gboolean xed_file_browser_store_rename              (XedFileBrowserStore * model,
-                                                       GtkTreeIter * iter,
-                                                       gchar const *new_name,
-                                                       GError ** error);
-XedFileBrowserStoreResult
-xed_file_browser_store_delete                       (XedFileBrowserStore * model,
-                                                       GtkTreeIter * iter, 
-                                                       gboolean trash);
-XedFileBrowserStoreResult
-xed_file_browser_store_delete_all                   (XedFileBrowserStore * model,
-                                                       GList *rows, 
-                                                       gboolean trash);
+void xed_file_browser_store_refresh (XedFileBrowserStore * model);
+gboolean xed_file_browser_store_rename (XedFileBrowserStore *model,
+                                        GtkTreeIter         *iter,
+                                        gchar const         *new_name,
+                                        GError             **error);
+XedFileBrowserStoreResult xed_file_browser_store_delete (XedFileBrowserStore *model,
+                                                         GtkTreeIter         *iter,
+                                                         gboolean             trash);
+XedFileBrowserStoreResult xed_file_browser_store_delete_all (XedFileBrowserStore *model,
+                                                             GList               *rows,
+                                                             gboolean             trash);
 
-gboolean xed_file_browser_store_new_file            (XedFileBrowserStore * model,
-                                                       GtkTreeIter * parent,
-                                                       GtkTreeIter * iter);
-gboolean xed_file_browser_store_new_directory       (XedFileBrowserStore * model,
-                                                       GtkTreeIter * parent,
-                                                       GtkTreeIter * iter);
+gboolean xed_file_browser_store_new_file (XedFileBrowserStore *model,
+                                          GtkTreeIter         *parent,
+                                          GtkTreeIter         *iter);
+gboolean xed_file_browser_store_new_directory (XedFileBrowserStore *model,
+                                               GtkTreeIter         *parent,
+                                               GtkTreeIter         *iter);
 
-void xed_file_browser_store_cancel_mount_operation  (XedFileBrowserStore *store);
+void xed_file_browser_store_cancel_mount_operation (XedFileBrowserStore *store);
 
 G_END_DECLS
-#endif				/* __XED_FILE_BROWSER_STORE_H__ */
+#endif              /* __XED_FILE_BROWSER_STORE_H__ */
 
 // ex:ts=8:noet:

plugins/filebrowser/xed-file-browser-utils.c

@@ -1,5 +1,5 @@
 /*
- * xed-file-bookmarks-store.c - Xed plugin providing easy file access 
+ * xed-file-browser-utils.c - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -19,180 +19,145 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "xed-file-browser-utils.h"
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <xed/xed-utils.h>
 
+#include "xed-file-browser-utils.h"
+
 static GdkPixbuf *
-process_icon_pixbuf (GdkPixbuf * pixbuf,
-		     gchar const * name, 
-		     gint size, 
-		     GError * error)
+process_icon_pixbuf (GdkPixbuf   *pixbuf,
+                     gchar const *name,
+                     gint         size,
+                     GError      *error)
 {
-	GdkPixbuf * scale;
+    GdkPixbuf *scale;
 
-	if (error != NULL) {
-		g_warning ("Could not load theme icon %s: %s",
-			   name,
-			   error->message);
-		g_error_free (error);
-	}
-	
-	if (pixbuf && gdk_pixbuf_get_width (pixbuf) > size) {
-		scale = gdk_pixbuf_scale_simple (pixbuf, 
-		                                 size, 
-		                                 size, 
-		                                 GDK_INTERP_BILINEAR);
-		g_object_unref (pixbuf);
-		pixbuf = scale;
-	}
+    if (error != NULL)
+    {
+        g_warning ("Could not load theme icon %s: %s", name, error->message);
+        g_error_free (error);
+    }
 
-	return pixbuf;
+    if (pixbuf && gdk_pixbuf_get_width (pixbuf) > size)
+    {
+        scale = gdk_pixbuf_scale_simple (pixbuf, size, size, GDK_INTERP_BILINEAR);
+        g_object_unref (pixbuf);
+        pixbuf = scale;
+    }
+
+    return pixbuf;
 }
 
 GdkPixbuf *
-xed_file_browser_utils_pixbuf_from_theme (gchar const * name,
-                                            GtkIconSize size)
+xed_file_browser_utils_pixbuf_from_theme (gchar const *name,
+                                          GtkIconSize  size)
 {
-	gint width;
-	GError *error = NULL;
-	GdkPixbuf *pixbuf;
+    gint width;
+    GError *error = NULL;
+    GdkPixbuf *pixbuf;
 
-	gtk_icon_size_lookup (size, &width, NULL);
+    gtk_icon_size_lookup (size, &width, NULL);
 
-	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), 
-					   name, 
-					   width, 
-					   0, 
-					   &error);
+    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), name, width, 0, &error);
 
-	pixbuf = process_icon_pixbuf (pixbuf, name, width, error);
+    pixbuf = process_icon_pixbuf (pixbuf, name, width, error);
 
-	return pixbuf;
+    return pixbuf;
 }
 
 GdkPixbuf *
-xed_file_browser_utils_pixbuf_from_icon (GIcon * icon,
-                                           GtkIconSize size)
+xed_file_browser_utils_pixbuf_from_icon (GIcon       *icon,
+                                         GtkIconSize  size)
 {
-	GdkPixbuf * ret = NULL;
-	GtkIconTheme *theme;
-	GtkIconInfo *info;
-	gint width;
+    GdkPixbuf *ret = NULL;
+    GtkIconTheme *theme;
+    GtkIconInfo *info;
+    gint width;
 
-	if (!icon)
-		return NULL;
+    if (!icon)
+    {
+        return NULL;
+    }
 
-	theme = gtk_icon_theme_get_default ();
-	gtk_icon_size_lookup (size, &width, NULL);
-	
-	info = gtk_icon_theme_lookup_by_gicon (theme,
-					       icon,
-					       width,
-					       GTK_ICON_LOOKUP_USE_BUILTIN);
+    theme = gtk_icon_theme_get_default ();
+    gtk_icon_size_lookup (size, &width, NULL);
 
-	if (!info)
-		return NULL;
-		
-	ret = gtk_icon_info_load_icon (info, NULL);
-	gtk_icon_info_free (info);
-	
-	return ret;
+    info = gtk_icon_theme_lookup_by_gicon (theme, icon, width, GTK_ICON_LOOKUP_USE_BUILTIN);
+
+    if (!info)
+    {
+        return NULL;
+    }
+
+    ret = gtk_icon_info_load_icon (info, NULL);
+    g_object_unref (info);
+
+    return ret;
 }
 
 GdkPixbuf *
-xed_file_browser_utils_pixbuf_from_file (GFile * file,
-                                           GtkIconSize size)
+xed_file_browser_utils_pixbuf_from_file (GFile       *file,
+                                         GtkIconSize  size)
 {
-	GIcon * icon;
-	GFileInfo * info;
-	GdkPixbuf * ret = NULL;
+    GIcon *icon;
+    GFileInfo *info;
+    GdkPixbuf *ret = NULL;
 
-	info = g_file_query_info (file, 
-				  G_FILE_ATTRIBUTE_STANDARD_ICON, 
-				  G_FILE_QUERY_INFO_NONE,
-				  NULL, 
-				  NULL);
-	
-	if (!info)
-		return NULL;
+    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_ICON, G_FILE_QUERY_INFO_NONE, NULL, NULL);
 
-	icon = g_file_info_get_icon (info);
-	if (icon != NULL)
-		ret = xed_file_browser_utils_pixbuf_from_icon (icon, size);
+    if (!info)
+    {
+        return NULL;
+    }
 
-	g_object_unref (info);
-	
-	return ret;
+    icon = g_file_info_get_icon (info);
+    if (icon != NULL)
+    {
+        ret = xed_file_browser_utils_pixbuf_from_icon (icon, size);
+    }
+
+    g_object_unref (info);
+
+    return ret;
 }
 
 gchar *
-xed_file_browser_utils_file_basename (GFile * file)
+xed_file_browser_utils_file_basename (GFile *file)
 {
-	gchar *uri;
-	gchar *ret;
-	
-	uri = g_file_get_uri (file);
-	ret = xed_file_browser_utils_uri_basename (uri);
-	g_free (uri);
-	
-	return ret;
-}
-
-gchar *
-xed_file_browser_utils_uri_basename (gchar const * uri)
-{
-	return xed_utils_basename_for_display (uri);
+    return xed_utils_basename_for_display (file);
 }
 
 gboolean
-xed_file_browser_utils_confirmation_dialog (XedWindow * window,
-                                              GtkMessageType type,
-                                              gchar const *message,
-		                              gchar const *secondary, 
-		                              gchar const * button_stock, 
-		                              gchar const * button_label)
+xed_file_browser_utils_confirmation_dialog (XedWindow      *window,
+                                            GtkMessageType  type,
+                                            gchar const    *message,
+                                            gchar const    *secondary,
+                                            gchar const    *button_label)
 {
-	GtkWidget *dlg;
-	gint ret;
-	GtkWidget *button;
+    GtkWidget *dlg;
+    gint ret;
 
-	dlg = gtk_message_dialog_new (GTK_WINDOW (window),
-				      GTK_DIALOG_MODAL |
-				      GTK_DIALOG_DESTROY_WITH_PARENT,
-				      type,
-				      GTK_BUTTONS_NONE, "%s", message);
+    dlg = gtk_message_dialog_new (GTK_WINDOW (window),
+                                  GTK_DIALOG_MODAL |
+                                  GTK_DIALOG_DESTROY_WITH_PARENT,
+                                  type,
+                                  GTK_BUTTONS_NONE, "%s", message);
 
-	if (secondary)
-		gtk_message_dialog_format_secondary_text
-		    (GTK_MESSAGE_DIALOG (dlg), "%s", secondary);
+    if (secondary)
+    {
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", secondary);
+    }
 
-	/* Add a cancel button */
-	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-	gtk_widget_show (button);
+    gtk_dialog_add_buttons (GTK_DIALOG (dlg),
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            button_label, GTK_RESPONSE_OK,
+                            NULL);
 
-	gtk_widget_set_can_default (button, TRUE);
-	gtk_dialog_add_action_widget (GTK_DIALOG (dlg),
-                                      button,
-                                      GTK_RESPONSE_CANCEL);
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_CANCEL);
 
-	/* Add custom button */
-	button = gtk_button_new_from_stock (button_stock);
-	
-	if (button_label) {
-		gtk_button_set_use_stock (GTK_BUTTON (button), FALSE);
-		gtk_button_set_label (GTK_BUTTON (button), button_label);
-	}
-	
-	gtk_widget_show (button);
-	gtk_widget_set_can_default (button, TRUE);
-	gtk_dialog_add_action_widget (GTK_DIALOG (dlg),
-                                      button,
-                                      GTK_RESPONSE_OK);
-	
-	ret = gtk_dialog_run (GTK_DIALOG (dlg));
-	gtk_widget_destroy (dlg);
+    ret = gtk_dialog_run (GTK_DIALOG (dlg));
+    gtk_widget_destroy (dlg);
 
-	return (ret == GTK_RESPONSE_OK);
+    return (ret == GTK_RESPONSE_OK);
 }
-
-// ex:ts=8:noet:

plugins/filebrowser/xed-file-browser-utils.h

@@ -4,23 +4,21 @@
 #include <xed/xed-window.h>
 #include <gio/gio.h>
 
-GdkPixbuf *xed_file_browser_utils_pixbuf_from_theme     (gchar const *name,
-                                                           GtkIconSize size);
+GdkPixbuf *xed_file_browser_utils_pixbuf_from_theme (gchar const *name,
+                                                     GtkIconSize  size);
 
-GdkPixbuf *xed_file_browser_utils_pixbuf_from_icon	  (GIcon * icon,
-                                                           GtkIconSize size);
-GdkPixbuf *xed_file_browser_utils_pixbuf_from_file	  (GFile * file,
-                                                           GtkIconSize size);
+GdkPixbuf *xed_file_browser_utils_pixbuf_from_icon (GIcon       *icon,
+                                                    GtkIconSize  size);
+GdkPixbuf *xed_file_browser_utils_pixbuf_from_file (GFile       *file,
+                                                    GtkIconSize  size);
 
-gchar * xed_file_browser_utils_file_basename		  (GFile * file);
-gchar * xed_file_browser_utils_uri_basename             (gchar const * uri);
+gchar * xed_file_browser_utils_file_basename (GFile *file);
 
-gboolean xed_file_browser_utils_confirmation_dialog     (XedWindow * window,
-                                                           GtkMessageType type,
-                                                           gchar const *message,
-		                                           gchar const *secondary, 
-		                                           gchar const * button_stock, 
-		                                           gchar const * button_label);
+gboolean xed_file_browser_utils_confirmation_dialog (XedWindow      *window,
+                                                     GtkMessageType  type,
+                                                     gchar const    *message,
+                                                     gchar const    *secondary,
+                                                     gchar const    *button_label);
 
 #endif /* __XED_FILE_BROWSER_UTILS_H__ */
 

plugins/filebrowser/xed-file-browser-view.h

@@ -1,5 +1,5 @@
 /*
- * xed-file-browser-view.h - Xed plugin providing easy file access 
+ * xed-file-browser-view.h - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -25,60 +25,53 @@
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
-#define XED_TYPE_FILE_BROWSER_VIEW			(xed_file_browser_view_get_type ())
-#define XED_FILE_BROWSER_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserView))
-#define XED_FILE_BROWSER_VIEW_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserView const))
-#define XED_FILE_BROWSER_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserViewClass))
-#define XED_IS_FILE_BROWSER_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_VIEW))
-#define XED_IS_FILE_BROWSER_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_VIEW))
-#define XED_FILE_BROWSER_VIEW_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserViewClass))
+#define XED_TYPE_FILE_BROWSER_VIEW          (xed_file_browser_view_get_type ())
+#define XED_FILE_BROWSER_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserView))
+#define XED_FILE_BROWSER_VIEW_CONST(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserView const))
+#define XED_FILE_BROWSER_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserViewClass))
+#define XED_IS_FILE_BROWSER_VIEW(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_VIEW))
+#define XED_IS_FILE_BROWSER_VIEW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_VIEW))
+#define XED_FILE_BROWSER_VIEW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserViewClass))
 
 typedef struct _XedFileBrowserView        XedFileBrowserView;
 typedef struct _XedFileBrowserViewClass   XedFileBrowserViewClass;
 typedef struct _XedFileBrowserViewPrivate XedFileBrowserViewPrivate;
 
-typedef enum {
-	XED_FILE_BROWSER_VIEW_CLICK_POLICY_DOUBLE,
-	XED_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE	
-} XedFileBrowserViewClickPolicy;
-
-struct _XedFileBrowserView 
+struct _XedFileBrowserView
 {
-	GtkTreeView parent;
+    GtkTreeView parent;
 
-	XedFileBrowserViewPrivate *priv;
+    XedFileBrowserViewPrivate *priv;
 };
 
-struct _XedFileBrowserViewClass 
+struct _XedFileBrowserViewClass
 {
-	GtkTreeViewClass parent_class;
+    GtkTreeViewClass parent_class;
 
-	/* Signals */
-	void (*error) (XedFileBrowserView * filetree, 
-	               guint code,
-		       gchar const *message);
-	void (*file_activated) (XedFileBrowserView * filetree,
-				    GtkTreeIter *iter);
-	void (*directory_activated) (XedFileBrowserView * filetree,
-				    GtkTreeIter *iter);
-	void (*bookmark_activated) (XedFileBrowserView * filetree,
-				    GtkTreeIter *iter);
+    /* Signals */
+    void (*error)               (XedFileBrowserView *filetree,
+                                 guint               code,
+                                 gchar const        *message);
+    void (*file_activated)      (XedFileBrowserView *filetree,
+                                 GtkTreeIter        *iter);
+    void (*directory_activated) (XedFileBrowserView *filetree,
+                                 GtkTreeIter        *iter);
+    void (*bookmark_activated)  (XedFileBrowserView *filetree,
+                                 GtkTreeIter        *iter);
 };
 
-GType xed_file_browser_view_get_type			(void) G_GNUC_CONST;
-GType xed_file_browser_view_register_type		(GTypeModule 			* module);
+GType xed_file_browser_view_get_type (void) G_GNUC_CONST;
+void _xed_file_browser_view_register_type (GTypeModule *type_module);
 
-GtkWidget *xed_file_browser_view_new			(void);
-void xed_file_browser_view_set_model			(XedFileBrowserView 		* tree_view,
-							 GtkTreeModel 			* model);
-void xed_file_browser_view_start_rename		(XedFileBrowserView 		* tree_view, 
-							 GtkTreeIter 			* iter);
-void xed_file_browser_view_set_click_policy		(XedFileBrowserView 		* tree_view,
-							 XedFileBrowserViewClickPolicy  policy);
-void xed_file_browser_view_set_restore_expand_state	(XedFileBrowserView 		* tree_view,
-							 gboolean 			  restore_expand_state);
+GtkWidget *xed_file_browser_view_new (void);
+void xed_file_browser_view_set_model (XedFileBrowserView *tree_view,
+                                      GtkTreeModel       *model);
+void xed_file_browser_view_start_rename (XedFileBrowserView *tree_view,
+                                         GtkTreeIter        *iter);
+void xed_file_browser_view_set_restore_expand_state (XedFileBrowserView *tree_view,
+                                                     gboolean            restore_expand_state);
 
 G_END_DECLS
-#endif				/* __XED_FILE_BROWSER_VIEW_H__ */
+#endif              /* __XED_FILE_BROWSER_VIEW_H__ */
 
 // ex:ts=8:noet:

plugins/filebrowser/xed-file-browser-widget-ui.xml

@@ -1,14 +1,9 @@
 <ui>
   <toolbar name="ToolBar">
-    <placeholder name="Tool_Opt1"/>
+    <toolitem action="DirectoryPrevious"/>
+    <toolitem action="DirectoryNext"/>
     <toolitem action="DirectoryUp"/>
-    <separator/>
-    <toolitem action="DirectoryRefresh"/>
-    <separator/>
     <placeholder name="Tool_Opt2"/>
-    <separator/>
-    <toolitem action="FilterHidden"/>
-    <separator/>
     <placeholder name="Tool_Opt3"/>
   </toolbar>
 

plugins/filebrowser/xed-file-browser-widget.h

@@ -1,5 +1,5 @@
 /*
- * xed-file-browser-widget.h - Xed plugin providing easy file access 
+ * xed-file-browser-widget.h - Xed plugin providing easy file access
  * from the sidepanel
  *
  * Copyright (C) 2006 - Jesse van den Kieboom <jesse@icecrew.nl>
@@ -28,13 +28,13 @@
 #include "xed-file-browser-view.h"
 
 G_BEGIN_DECLS
-#define XED_TYPE_FILE_BROWSER_WIDGET			(xed_file_browser_widget_get_type ())
-#define XED_FILE_BROWSER_WIDGET(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidget))
-#define XED_FILE_BROWSER_WIDGET_CONST(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidget const))
-#define XED_FILE_BROWSER_WIDGET_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidgetClass))
-#define XED_IS_FILE_BROWSER_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_WIDGET))
-#define XED_IS_FILE_BROWSER_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_WIDGET))
-#define XED_FILE_BROWSER_WIDGET_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidgetClass))
+#define XED_TYPE_FILE_BROWSER_WIDGET            (xed_file_browser_widget_get_type ())
+#define XED_FILE_BROWSER_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidget))
+#define XED_FILE_BROWSER_WIDGET_CONST(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidget const))
+#define XED_FILE_BROWSER_WIDGET_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidgetClass))
+#define XED_IS_FILE_BROWSER_WIDGET(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XED_TYPE_FILE_BROWSER_WIDGET))
+#define XED_IS_FILE_BROWSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_FILE_BROWSER_WIDGET))
+#define XED_FILE_BROWSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), XED_TYPE_FILE_BROWSER_WIDGET, XedFileBrowserWidgetClass))
 
 typedef struct _XedFileBrowserWidget        XedFileBrowserWidget;
 typedef struct _XedFileBrowserWidgetClass   XedFileBrowserWidgetClass;
@@ -42,36 +42,36 @@ typedef struct _XedFileBrowserWidgetPrivate XedFileBrowserWidgetPrivate;
 
 typedef
 gboolean (*XedFileBrowserWidgetFilterFunc) (XedFileBrowserWidget * obj,
-					      XedFileBrowserStore *
-					      model, GtkTreeIter * iter,
-					      gpointer user_data);
+                          XedFileBrowserStore *
+                          model, GtkTreeIter * iter,
+                          gpointer user_data);
 
-struct _XedFileBrowserWidget 
+struct _XedFileBrowserWidget
 {
-	GtkBox parent;
+    GtkBox parent;
 
-	XedFileBrowserWidgetPrivate *priv;
+    XedFileBrowserWidgetPrivate *priv;
 };
 
-struct _XedFileBrowserWidgetClass 
+struct _XedFileBrowserWidgetClass
 {
-	GtkBoxClass parent_class;
+    GtkBoxClass parent_class;
 
-	/* Signals */
-	void (*uri_activated)        (XedFileBrowserWidget * widget,
-			              gchar const *uri);
-	void (*error)                (XedFileBrowserWidget * widget, 
-	                              guint code,
-		                      gchar const *message);
-	gboolean (*confirm_delete)   (XedFileBrowserWidget * widget,
-	                              XedFileBrowserStore * model,
-	                              GList *list);
-	gboolean (*confirm_no_trash) (XedFileBrowserWidget * widget,
-	                              GList *list);
+    /* Signals */
+    void (*location_activated)        (XedFileBrowserWidget * widget,
+                                       GFile                *location);
+    void (*error)                (XedFileBrowserWidget * widget,
+                                  guint code,
+                              gchar const *message);
+    gboolean (*confirm_delete)   (XedFileBrowserWidget * widget,
+                                  XedFileBrowserStore * model,
+                                  GList *list);
+    gboolean (*confirm_no_trash) (XedFileBrowserWidget * widget,
+                                  GList *list);
 };
 
 GType xed_file_browser_widget_get_type            (void) G_GNUC_CONST;
-GType xed_file_browser_widget_register_type       (GTypeModule * module);
+void _xed_file_browser_widget_register_type       (GTypeModule *type_module);
 
 GtkWidget *xed_file_browser_widget_new            (const gchar *data_dir);
 
@@ -79,31 +79,31 @@ void xed_file_browser_widget_show_bookmarks       (XedFileBrowserWidget * obj);
 void xed_file_browser_widget_show_files           (XedFileBrowserWidget * obj);
 
 void xed_file_browser_widget_set_root             (XedFileBrowserWidget * obj,
-                                                     gchar const *root,
+                                                     GFile *root,
                                                      gboolean virtual_root);
 void
 xed_file_browser_widget_set_root_and_virtual_root (XedFileBrowserWidget * obj,
-						     gchar const *root,
-						     gchar const *virtual_root);
+                             GFile *root,
+                             GFile *virtual_root);
 
 gboolean
-xed_file_browser_widget_get_selected_directory    (XedFileBrowserWidget * obj, 
+xed_file_browser_widget_get_selected_directory    (XedFileBrowserWidget * obj,
                                                      GtkTreeIter * iter);
 
-XedFileBrowserStore * 
+XedFileBrowserStore *
 xed_file_browser_widget_get_browser_store         (XedFileBrowserWidget * obj);
-XedFileBookmarksStore * 
+XedFileBookmarksStore *
 xed_file_browser_widget_get_bookmarks_store       (XedFileBrowserWidget * obj);
 XedFileBrowserView *
 xed_file_browser_widget_get_browser_view          (XedFileBrowserWidget * obj);
 GtkWidget *
 xed_file_browser_widget_get_filter_entry          (XedFileBrowserWidget * obj);
 
-GtkUIManager * 
+GtkUIManager *
 xed_file_browser_widget_get_ui_manager            (XedFileBrowserWidget * obj);
 
 gulong xed_file_browser_widget_add_filter         (XedFileBrowserWidget * obj,
-                                                     XedFileBrowserWidgetFilterFunc func, 
+                                                     XedFileBrowserWidgetFilterFunc func,
                                                      gpointer user_data,
                                                      GDestroyNotify notify);
 void xed_file_browser_widget_remove_filter        (XedFileBrowserWidget * obj,
@@ -111,9 +111,9 @@ void xed_file_browser_widget_remove_filter        (XedFileBrowserWidget * obj,
 void xed_file_browser_widget_set_filter_pattern   (XedFileBrowserWidget * obj,
                                                      gchar const *pattern);
 
-void xed_file_browser_widget_refresh		    (XedFileBrowserWidget * obj);
-void xed_file_browser_widget_history_back	    (XedFileBrowserWidget * obj);
-void xed_file_browser_widget_history_forward	    (XedFileBrowserWidget * obj);
+void xed_file_browser_widget_refresh            (XedFileBrowserWidget * obj);
+void xed_file_browser_widget_history_back       (XedFileBrowserWidget * obj);
+void xed_file_browser_widget_history_forward        (XedFileBrowserWidget * obj);
 
 G_END_DECLS
 #endif /* __XED_FILE_BROWSER_WIDGET_H__ */

plugins/joinlines/joinlines.plugin.desktop.in

@@ -0,0 +1,10 @@
+[Plugin]
+Loader=python3
+Module=joinlines
+IAge=3
+_Name=Join Lines
+_Description=Join several lines
+Icon=gnome-mime-text-x-python
+Authors=Steve Frécinaux <steve@istique.net>;André Homeyer;Linux Mint team
+Copyright=Copyright @ 2006-2007 Steve Frécinaux, André Homeyer
+Builtin=true

plugins/joinlines/joinlines/__init__.py

@@ -0,0 +1,91 @@
+from gi.repository import GObject, Gtk, Xed
+
+import gettext
+gettext.install("xed")
+
+MENU_PATH = "/MenuBar/ViewMenu/ViewOps_1"
+
+class JoinLinesPlugin(GObject.Object, Xed.WindowActivatable):
+    __gtype_name__ = "JoinLinesPlugin"
+
+    window = GObject.property(type=Xed.Window)
+
+    def __init__(self):
+        GObject.Object.__init__(self)
+
+    def do_activate(self):
+        self._views = {}
+
+        self._insert_menu()
+
+    def _insert_menu(self):
+        manager = self.window.get_ui_manager()
+
+        self._action_group = Gtk.ActionGroup(name="XedJoinLinesPluginActions")
+        self._action_group.add_actions(
+            [("JoinLinesAction", None, _("_Join Lines"), "<Ctrl>J",
+              _("Join the selected lines"),
+              lambda w: self.join_lines(w))])
+
+        manager.insert_action_group(self._action_group)
+
+        self._ui_id = manager.new_merge_id()
+
+        manager.add_ui(self._ui_id,
+                       MENU_PATH,
+                       "JoinLinesAction",
+                       "JoinLinesAction",
+                       Gtk.UIManagerItemType.MENUITEM,
+                       False)
+
+    def do_update_state(self):
+        self._action_group.set_sensitive(self.window.get_active_document() != None)
+
+    def do_deactivate(self):
+        self._remove_menu()
+
+
+    def _remove_menu(self):
+        manager = self.window.get_ui_manager()
+        manager.remove_ui(self._ui_id)
+        manager.remove_action_group(self._action_group)
+        manager.ensure_update()
+
+    def join_lines(self, w):
+        doc = self.window.get_active_document()
+        if doc is None:
+            return
+
+        doc.begin_user_action()
+
+        # If there is a selection use it, otherwise join the
+        # next line
+        try:
+            start, end = doc.get_selection_bounds()
+        except ValueError:
+            start = doc.get_iter_at_mark(doc.get_insert())
+            end = start.copy()
+            end.forward_line()
+
+        end_mark = doc.create_mark(None, end)
+
+        if not start.ends_line():
+            start.forward_to_line_end()
+
+        # Include trailing spaces in the chunk to be removed
+        while start.backward_char() and start.get_char() in ('\t', ' '):
+            pass
+        start.forward_char()
+
+        while doc.get_iter_at_mark(end_mark).compare(start) == 1:
+            end = start.copy()
+            while end.get_char() in ('\r', '\n', ' ', '\t'):
+                end.forward_char()
+            doc.delete(start, end)
+
+            doc.insert(start, ' ')
+            start.forward_to_line_end()
+
+        doc.delete_mark(end_mark)
+        doc.end_user_action()
+

plugins/joinlines/meson.build

@@ -0,0 +1,13 @@
+install_subdir(
+    'joinlines',
+    install_dir: pluginslibdir
+)
+
+textsize_desktop = custom_target(
+    'joinlines_desktop',
+    input: 'joinlines.plugin.desktop.in',
+    output: 'joinlines.plugin',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: pluginslibdir,
+)

plugins/meson.build

@@ -0,0 +1,19 @@
+pluginsdatadir = join_paths(datadir, 'xed', 'plugins')
+pluginslibdir = join_paths(libdir, 'xed', 'plugins')
+
+subdir('bracket-complete')
+subdir('docinfo')
+subdir('filebrowser')
+subdir('joinlines')
+subdir('modelines')
+subdir('open-uri-context-menu')
+subdir('sort')
+subdir('taglist')
+subdir('textsize')
+subdir('time')
+subdir('trailsave')
+subdir('wordcompletion')
+
+if enable_spell
+    subdir('spell')
+endif