1.4.1

It didn't exist before that version of GTK.

Makefile.am

@@ -1,11 +1,7 @@
 ## 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
+SUBDIRS = xed pixmaps po data plugins docs help
 
 distuninstallcheck_listfiles = find . -type f -print
 
@@ -55,7 +51,7 @@ MAINTAINERCLEANFILES = 		\
 	m4/lt~obsolete.m4	\
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-tests
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \

autogen.sh

@@ -24,7 +24,6 @@ which yelp-build || {
 }
 
 REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_MACROS=python.m4
 GNOME_DATADIR="$gnome_datadir"
 USE_COMMON_DOC_BUILD=yes
 

configure.ac

@@ -3,8 +3,8 @@ 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, 2)
-m4_define(xed_micro_version, 0)
+m4_define(xed_minor_version, 4)
+m4_define(xed_micro_version, 1)
 m4_define(xed_version, xed_major_version.xed_minor_version.xed_micro_version)
 
 AC_INIT([xed], [xed_version],
@@ -49,12 +49,6 @@ 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 ===============================================================
@@ -151,12 +145,14 @@ dnl ================================================================
 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
+	glib-2.0 >= 2.40.0
 	$GMODULE_ADD
 	gthread-2.0 >= 2.13.0
-	gio-2.0 >= 2.26.0
-	gtk+-3.0 >= 3.10.0
-	gtksourceview-3.0 >= 2.9.7
+	gio-2.0 >= 2.40.0
+	gtk+-3.0 >= 3.14.0
+	gtksourceview-3.0 >= 3.14.0
+	libpeas-1.0 >= 1.12.0
+	libpeas-gtk-1.0 >= 1.12.0
 ])
 
 PKG_CHECK_MODULES(X11, [x11])
@@ -167,10 +163,17 @@ XED_LIBS="$XED_LIBS $X11_LIBS"
 AC_SUBST(XED_CFLAGS)
 AC_SUBST(XED_LIBS)
 
-PKG_CHECK_MODULES(EGG_SMCLIENT, [sm >= 1.0.0])
+# Introspection
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
-AC_SUBST(EGG_SMCLIENT_CFLAGS)
-AC_SUBST(EGG_SMCLIENT_LIBS)
+if test "$found_introspection" = "yes"; then
+	enable_introspection=yes
+	AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject Introspection])
+else
+	enable_introspection=no
+fi
+
+AM_PATH_PYTHON([3.4])
 
 dnl ================================================================
 dnl GSettings related settings
@@ -178,126 +181,10 @@ 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_COMPILE_RESOURCES, glib-compile-resources)
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
@@ -318,18 +205,9 @@ if test "x$enable_deprecations" = "xyes"; then
    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)
@@ -348,17 +226,10 @@ 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
@@ -367,11 +238,12 @@ plugins/sort/Makefile
 plugins/spell/Makefile
 plugins/spell/org.x.editor.plugins.spell.gschema.xml
 plugins/taglist/Makefile
+plugins/textsize/Makefile
+plugins/textsize/textsize/Makefile
 plugins/time/Makefile
 plugins/time/org.x.editor.plugins.time.gschema.xml
 plugins/trailsave/Makefile
 po/Makefile.in
-tests/Makefile
 ])
 
 AC_OUTPUT
@@ -381,9 +253,8 @@ echo "
 Configuration:
 
 	Source code location:	${srcdir}
-	Compiler:		${CC}
-	Python Plugins Support: $enable_python
+	Compiler:				${CC}
 	Spell Plugin enabled:	$enable_enchant
 	Gvfs metadata enabled:	$enable_gvfs_metadata
-	Tests enabled:		$enable_tests
+	GObject Introspection:	${enable_introspection}
 "

data/Makefile.am

@@ -4,13 +4,22 @@ 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@
 
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.x.editor.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $<> $@
+
 man_MANS = xed.1
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -22,12 +31,14 @@ bugreport_SCRIPTS = xed-bugreport.sh
 EXTRA_DIST = 			\
 	$(appdata_in_files)	\
 	$(desktop_in_files)	\
+	$(service_in_files) \
 	$(man_MANS)			\
 	xed.pc.in			\
 	xed-bugreport.sh.in
 
 CLEANFILES =	 			\
 	$(desktop_DATA)			\
+	$(service_DATA)         \
 	$(gsettings_SCHEMAS)	\
 	$(pkgconfig_DATA)		\
 	$(appdata_DATA)

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

@@ -1,195 +1,342 @@
 <?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>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">
+
+    <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>
+
+  </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="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="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>
       <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,10 +1,6 @@
 #!/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"
+PKG_CONFIG_MODULES="glib-2.0 gtk+-3.0 gtksourceview-3.0 enchant iso-codes"
 
 echo_padded ()
 {
@@ -53,21 +49,3 @@ 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.pc.in

@@ -6,7 +6,7 @@ pluginsdir=@libdir@/xed/plugins
 
 Name: xed
 Description: xed
-Requires: gtksourceview-@GTK_API_VERSION@
+Requires: gtksourceview-3.0 libpeas-1.0 libpeas-gtk-1.0
 Version: @VERSION@
 Cflags: -I${includedir}/xed
 Libs: -L${libdir}

debian/changelog

@@ -1,3 +1,222 @@
+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 ]

debian/control

@@ -4,17 +4,22 @@ Priority: optional
 Maintainer: Linux Mint <root@linuxmint.com>
 Build-Depends: autotools-dev,
                debhelper (>= 9),
+               gobject-introspection,
                gtk-doc-tools,
                intltool,
                iso-codes,
                libenchant-dev,
+               libgirepository1.0-dev,
                libglib2.0-dev,
                libgtk-3-dev,
                libgtksourceview-3.0-dev,
+               libpeas-dev,
                libsm-dev,
                libx11-dev,
                libxml2-dev,
                gnome-common,
+               python3,
+               python3-gi,
                yelp-tools,
 Standards-Version: 3.9.6
 
@@ -25,9 +30,13 @@ Depends: iso-codes,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
+         libpeas-1.0-0-python3loader,
+         python3,
+         python3-gi,
+         xapps-common,
          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
@@ -47,7 +56,7 @@ Package: xed-common
 Architecture: all
 Depends: python,
          ${misc:Depends},
-Description: generic text editor (common files)
+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 +79,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 +103,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 +129,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
@@ -136,4 +145,4 @@ Description: generic text editor (documentation files)
  includes support for spell checking, comparing files, viewing CVS
  ChangeLogs, and adjusting indentation levels.
  .
- This package contains the documentation files.
+ This package contains the documentation files.

debian/rules

@@ -3,11 +3,11 @@
 DHFLAGS=--parallel
 
 %:
-	dh $@ $(DHFLAGS)
+	dh $@ $(DHFLAGS) --with gir
 
 override_dh_install:
-	rm -rfv debian/tmp/usr/lib/*/xed/plugin-loaders/*.la
 	rm -rfv debian/tmp/usr/lib/*/xed/plugins/*.la
+	rm -rfv debian/tmp/usr/lib/*/xed/*.la
 	dh_install --fail-missing
 
 override_dh_auto_configure:
@@ -16,9 +16,7 @@ override_dh_auto_configure:
 	dh_auto_configure $(DHFLAGS) -- \
 		--disable-silent-rules \
 		--libexecdir=/usr/lib/ \
-		--disable-python \
-		--enable-gtk-doc \
-		--with-gtk=3.0
+		--enable-gtk-doc
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

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/appdata
+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,8 @@
-usr/bin/
-usr/lib/*/xed/plugin-loaders/*.so
-usr/lib/*/xed/plugins/
+usr/bin/xed
+usr/lib/*/xed/girepository-1.0/
 usr/lib/xed/xed-bugreport.sh
-usr/share/applications/
+usr/lib/*/xed/plugins/
+usr/lib/*/xed/*.so
+usr/share/applications/xed.desktop
+usr/share/dbus-1/
 usr/share/man/

docs/reference/Makefile.am

@@ -6,55 +6,38 @@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=xed
+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 top-level XML file (SGML in the past).
+DOC_MAIN_SGML_FILE = xed-docs.xml
 
 # 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=
+DOC_SOURCE_DIR = ../../xed
 
 # Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
+# e.g. SCAN_OPTIONS = --deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --rebuild-types
 
 # 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=
+MKDB_OPTIONS = --xml-mode --output-format=xml
 
 # 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
+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-close-confirmation-dialog.h		\
+	xed-dirs.h 							\
+	xed-commands.h						\
 	xed-documents-panel.h			\
-	xed-io-error-message-area.h		\
+	xed-io-error-info-bar.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		\
@@ -63,57 +46,29 @@ IGNORE_HFILES=		\
 	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=
+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=
+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)	\
+GTKDOC_CFLAGS =				\
+	-I$(top_srcdir)/xed		\
+	-I$(top_builddir)/xed 	\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	$(XED_CFLAGS)
 
-GTKDOC_LIBS=	\
+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
+MAINTAINERCLEANFILES = xed.types
 
 # 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/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,305 +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
@@ -763,8 +469,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

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"
-])

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 +1,26 @@
-DIST_SUBDIRS =	\
-	changecase 	\
-	docinfo 	\
-	filebrowser \
-	modelines	\
-	sort 		\
-	spell 		\
-	taglist 	\
-	time		\
+DIST_SUBDIRS =		\
+	docinfo 		\
+	filebrowser 	\
+	modelines 		\
+	sort 			\
+	spell			\
+	taglist			\
+	textsize 		\
+	time			\
 	trailsave
 
-SUBDIRS = 		\
-	changecase	\
-	docinfo		\
-	filebrowser	\
-	modelines	\
-	sort		\
-	taglist		\
-	time		\
+SUBDIRS = 			\
+	docinfo 		\
+	filebrowser 	\
+	modelines 		\
+	sort			\
+	taglist			\
+	textsize 		\
+	time			\
 	trailsave
 
 if ENABLE_ENCHANT
-SUBDIRS      += spell
+SUBDIRS += spell
 endif
 
 -include $(top_srcdir)/git.mk

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

@@ -19,11 +19,11 @@ libdocinfo_la_LIBADD  = $(XED_LIBS)
 uidir = $(XED_PLUGINS_DATA_DIR)/docinfo
 ui_DATA = docinfo.ui
 
-plugin_in_files = docinfo.xed-plugin.desktop.in
+plugin_in_files = docinfo.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: %.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)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
 

plugins/docinfo/docinfo.plugin.desktop.in

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

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,7 +17,6 @@
  * 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
@@ -28,554 +27,537 @@
 
 #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"
 #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))
 
 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 = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginPrivate);
+}
+
+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");
+
+    g_type_class_add_private (klass, sizeof (XedDocInfoPluginPrivate));
+}
+
+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

@@ -44,9 +44,9 @@ libfilebrowser_la_LIBADD = $(XED_LIBS)
 uidir = $(XED_PLUGINS_DATA_DIR)/filebrowser
 ui_DATA = xed-file-browser-widget-ui.xml
 
-plugin_in_files = filebrowser.xed-plugin.desktop.in
+plugin_in_files = filebrowser.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: %.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)) > $@
@@ -63,7 +63,7 @@ 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)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 filebrowser_gschema_in = org.x.editor.plugins.filebrowser.gschema.xml.in

plugins/filebrowser/filebrowser.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Loader=C
 Module=filebrowser
 IAge=2

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

@@ -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-marshal.list

@@ -1,5 +1,5 @@
 VOID:UINT,STRING
-VOID:STRING,STRING
+VOID:OBJECT,OBJECT
 BOOL:OBJECT,POINTER
 BOOL:POINTER
 BOOL: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,148 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "xed-file-browser-utils.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#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);
+    gtk_icon_info_free (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,61 @@
 #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	
+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_click_policy (XedFileBrowserView            *tree_view,
+                                             XedFileBrowserViewClickPolicy  policy);
+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/modelines/Makefile.am

@@ -22,10 +22,10 @@ libmodelines_la_SOURCES = \
 libmodelines_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libmodelines_la_LIBADD  = $(XED_LIBS)
 
-plugin_in_files = modelines.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_in_files = modelines.plugin.desktop.in
+%.plugin: %.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)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = \
 	$(plugin_in_files)				\

plugins/modelines/modeline-parser.c

@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksource.h>
-#include <xed/xed-language-manager.h>
-#include <xed/xed-prefs-manager.h>
 #include <xed/xed-debug.h>
+#include <xed/xed-settings.h>
+#include <xed/xed-utils.h>
 #include "modeline-parser.h"
 
 #define MODELINES_LANGUAGE_MAPPINGS_FILE "language-mappings"
@@ -64,7 +64,7 @@ typedef struct _ModelineOptions
 	GtkWrapMode	wrap_mode;
 	gboolean	display_right_margin;
 	guint		right_margin_position;
-	
+
 	ModelineSet	set;
 } ModelineOptions;
 
@@ -80,7 +80,10 @@ has_option (ModelineOptions *options,
 void
 modeline_parser_init (const gchar *data_dir)
 {
-	modelines_data_dir = g_strdup (data_dir);
+	if (modelines_data_dir == NULL)
+	{
+		modelines_data_dir = g_strdup (data_dir);
+	}
 }
 
 void
@@ -94,12 +97,13 @@ modeline_parser_shutdown ()
 
 	if (kate_languages != NULL)
 		g_hash_table_destroy (kate_languages);
-	
+
 	vim_languages = NULL;
 	emacs_languages = NULL;
 	kate_languages = NULL;
 
 	g_free (modelines_data_dir);
+	modelines_data_dir = NULL;
 }
 
 static GHashTable *
@@ -224,7 +228,7 @@ skip_whitespaces (gchar **s)
 }
 
 /* Parse vi(m) modelines.
- * Vi(m) modelines looks like this: 
+ * Vi(m) modelines looks like this:
  *   - first form:   [text]{white}{vi:|vim:|ex:}[white]{options}
  *   - second form:  [text]{white}{vi:|vim:|ex:}[white]se[t] {options}:[text]
  * They can happen on the three first or last lines.
@@ -289,7 +293,7 @@ parse_vim_modeline (gchar           *s,
 		{
 			g_free (options->language_id);
 			options->language_id = get_language_id_vim (value->str);
-			
+
 			options->set |= MODELINE_SET_LANGUAGE;
 		}
 		else if (strcmp (key->str, "et") == 0 ||
@@ -302,7 +306,7 @@ parse_vim_modeline (gchar           *s,
 			 strcmp (key->str, "tabstop") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->tab_width = intval;
@@ -313,7 +317,7 @@ parse_vim_modeline (gchar           *s,
 			 strcmp (key->str, "shiftwidth") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->indent_width = intval;
@@ -326,18 +330,18 @@ parse_vim_modeline (gchar           *s,
 
 			options->set |= MODELINE_SET_WRAP_MODE;
 		}
-		else if (strcmp (key->str, "textwidth") == 0)
+		else if (strcmp (key->str, "textwidth") == 0 || strcmp (key->str, "tw") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->right_margin_position = intval;
 				options->display_right_margin = TRUE;
-				
+
 				options->set |= MODELINE_SET_SHOW_RIGHT_MARGIN |
 				                MODELINE_SET_RIGHT_MARGIN_POSITION;
-				
+
 			}
 		}
 	}
@@ -406,13 +410,13 @@ parse_emacs_modeline (gchar           *s,
 		{
 			g_free (options->language_id);
 			options->language_id = get_language_id_emacs (value->str);
-			
+
 			options->set |= MODELINE_SET_LANGUAGE;
 		}
 		else if (strcmp (key->str, "tab-width") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->tab_width = intval;
@@ -422,7 +426,7 @@ parse_emacs_modeline (gchar           *s,
 		else if (strcmp (key->str, "indent-offset") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->indent_width = intval;
@@ -433,14 +437,14 @@ parse_emacs_modeline (gchar           *s,
 		{
 			intval = strcmp (value->str, "nil") == 0;
 			options->insert_spaces = intval;
-			
+
 			options->set |= MODELINE_SET_INSERT_SPACES;
 		}
 		else if (strcmp (key->str, "autowrap") == 0)
 		{
 			intval = strcmp (value->str, "nil") != 0;
 			options->wrap_mode = intval ? GTK_WRAP_WORD : GTK_WRAP_NONE;
-			
+
 			options->set |= MODELINE_SET_WRAP_MODE;
 		}
 	}
@@ -504,13 +508,13 @@ parse_kate_modeline (gchar           *s,
 		{
 			g_free (options->language_id);
 			options->language_id = get_language_id_kate (value->str);
-			
+
 			options->set |= MODELINE_SET_LANGUAGE;
 		}
 		else if (strcmp (key->str, "tab-width") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->tab_width = intval;
@@ -539,17 +543,17 @@ parse_kate_modeline (gchar           *s,
 
 			options->wrap_mode = intval ? GTK_WRAP_WORD : GTK_WRAP_NONE;
 
-			options->set |= MODELINE_SET_WRAP_MODE;			
+			options->set |= MODELINE_SET_WRAP_MODE;
 		}
 		else if (strcmp (key->str, "word-wrap-column") == 0)
 		{
 			intval = atoi (value->str);
-			
+
 			if (intval)
 			{
 				options->right_margin_position = intval;
 				options->display_right_margin = TRUE;
-				
+
 				options->set |= MODELINE_SET_RIGHT_MARGIN_POSITION |
 				                MODELINE_SET_SHOW_RIGHT_MARGIN;
 			}
@@ -611,7 +615,7 @@ check_previous (GtkSourceView   *view,
                 ModelineSet      set)
 {
 	GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
-	   
+
 	/* Do not restore default when this is the first time */
 	if (!previous)
 		return FALSE;
@@ -648,7 +652,7 @@ check_previous (GtkSourceView   *view,
 		case MODELINE_SET_LANGUAGE:
 		{
 			GtkSourceLanguage *language = gtk_source_buffer_get_language (buffer);
-			
+
 			return (language == NULL && previous->language_id == NULL) ||
 			       (language != NULL && g_strcmp0 (gtk_source_language_get_id (language),
 			                                       previous->language_id) == 0);
@@ -674,7 +678,8 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 	GtkTextBuffer *buffer;
 	GtkTextIter iter, liter;
 	gint line_count;
-	
+	GSettings *settings;
+
 	options.language_id = NULL;
 	options.set = MODELINE_SET_NONE;
 
@@ -746,7 +751,7 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 		GtkSourceLanguageManager *manager;
 		GtkSourceLanguage *language;
 
-		manager = xed_get_language_manager ();
+		manager = gtk_source_language_manager_get_default ();
 		language = gtk_source_language_manager_get_language
 				(manager, options.language_id);
 
@@ -757,9 +762,11 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 		}
 	}
 
-	ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer), 
+	ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer),
 	                                               MODELINE_OPTIONS_DATA_KEY);
 
+    settings = g_settings_new ("org.x.editor.preferences.editor");
+
 	/* Apply the options we got from modelines and restore defaults if
 	   we set them before */
 	if (has_option (&options, MODELINE_SET_INSERT_SPACES))
@@ -769,21 +776,24 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 	}
 	else if (check_previous (view, previous, MODELINE_SET_INSERT_SPACES))
 	{
-		gtk_source_view_set_insert_spaces_instead_of_tabs
-							(view,
-							 xed_prefs_manager_get_insert_spaces ());
+		gboolean insert_spaces;
+
+        insert_spaces = g_settings_get_boolean (settings, XED_SETTINGS_INSERT_SPACES);
+        gtk_source_view_set_insert_spaces_instead_of_tabs (view, insert_spaces);
 	}
-	
+
 	if (has_option (&options, MODELINE_SET_TAB_WIDTH))
 	{
 		gtk_source_view_set_tab_width (view, options.tab_width);
 	}
 	else if (check_previous (view, previous, MODELINE_SET_TAB_WIDTH))
 	{
-		gtk_source_view_set_tab_width (view, 
-		                               xed_prefs_manager_get_tabs_size ());
+		guint tab_width;
+
+        tab_width = g_settings_get_uint (settings, XED_SETTINGS_TABS_SIZE);
+        gtk_source_view_set_tab_width (view, tab_width);
 	}
-	
+
 	if (has_option (&options, MODELINE_SET_INDENT_WIDTH))
 	{
 		gtk_source_view_set_indent_width (view, options.indent_width);
@@ -792,39 +802,46 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 	{
 		gtk_source_view_set_indent_width (view, -1);
 	}
-	
+
 	if (has_option (&options, MODELINE_SET_WRAP_MODE))
 	{
 		gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), options.wrap_mode);
 	}
 	else if (check_previous (view, previous, MODELINE_SET_WRAP_MODE))
 	{
-		gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), 
-		                             xed_prefs_manager_get_wrap_mode ());
+		GtkWrapMode mode;
+
+        mode = g_settings_get_enum (settings, XED_SETTINGS_WRAP_MODE);
+        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), mode);
 	}
-	
+
 	if (has_option (&options, MODELINE_SET_RIGHT_MARGIN_POSITION))
 	{
 		gtk_source_view_set_right_margin_position (view, options.right_margin_position);
 	}
 	else if (check_previous (view, previous, MODELINE_SET_RIGHT_MARGIN_POSITION))
 	{
-		gtk_source_view_set_right_margin_position (view, 
-		                                           xed_prefs_manager_get_right_margin_position ());
+		guint right_margin_pos;
+
+        right_margin_pos = g_settings_get_uint (settings, XED_SETTINGS_RIGHT_MARGIN_POSITION);
+        gtk_source_view_set_right_margin_position (view, right_margin_pos);
 	}
-	
+
 	if (has_option (&options, MODELINE_SET_SHOW_RIGHT_MARGIN))
 	{
 		gtk_source_view_set_show_right_margin (view, options.display_right_margin);
 	}
 	else if (check_previous (view, previous, MODELINE_SET_SHOW_RIGHT_MARGIN))
 	{
-		gtk_source_view_set_show_right_margin (view, 
-		                                       xed_prefs_manager_get_display_right_margin ());
+		gboolean display_right_margin;
+
+        display_right_margin = g_settings_get_boolean (settings, XED_SETTINGS_DISPLAY_RIGHT_MARGIN);
+        gtk_source_view_set_show_right_margin (view, display_right_margin);
 	}
-	
+
 	if (previous)
 	{
+		g_free (previous->language_id);
 		*previous = options;
 		previous->language_id = g_strdup (options.language_id);
 	}
@@ -833,13 +850,13 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 		previous = g_slice_new (ModelineOptions);
 		*previous = options;
 		previous->language_id = g_strdup (options.language_id);
-		
-		g_object_set_data_full (G_OBJECT (buffer), 
-		                        MODELINE_OPTIONS_DATA_KEY, 
+
+		g_object_set_data_full (G_OBJECT (buffer),
+		                        MODELINE_OPTIONS_DATA_KEY,
 		                        previous,
 		                        (GDestroyNotify)free_modeline_options);
 	}
-	
+
 	g_free (options.language_id);
 }
 

plugins/modelines/modeline-parser.h

@@ -1,14 +1,14 @@
 /*
  * modelie-parser.h
  * Emacs, Kate and Vim-style modelines support for xed.
- * 
+ *
  * Copyright (C) 2005-2007 - Steve Frécinaux <code@istique.net>
  *
  * 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
@@ -23,14 +23,14 @@
 #define __MODELINE_PARSER_H__
 
 #include <glib.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
 
 G_BEGIN_DECLS
 
-void	modeline_parser_init		(const gchar *data_dir);
-void	modeline_parser_shutdown	(void);
-void	modeline_parser_apply_modeline	(GtkSourceView *view);
-void	modeline_parser_deactivate	(GtkSourceView *view);
+void modeline_parser_init (const gchar *data_dir);
+void modeline_parser_shutdown (void);
+void modeline_parser_apply_modeline (GtkSourceView *view);
+void modeline_parser_deactivate (GtkSourceView *view);
 
 G_END_DECLS
 

plugins/modelines/modelines.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Module=modelines
 IAge=2
 _Name=Modelines

plugins/modelines/xed-modeline-plugin.c

@@ -1,14 +1,14 @@
 /*
  * xed-modeline-plugin.c
  * Emacs, Kate and Vim-style modelines support for xed.
- * 
+ *
  * Copyright (C) 2005-2007 - Steve Frécinaux <code@istique.net>
  *
  * 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
@@ -18,9 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
- 
+
 #ifdef HAVE_CONFIG_H
-#	include <config.h>
+#   include <config.h>
 #endif
 
 #include <glib/gi18n-lib.h>
@@ -29,220 +29,196 @@
 #include "modeline-parser.h"
 
 #include <xed/xed-debug.h>
-#include <xed/xed-utils.h>
+#include <xed/xed-view-activatable.h>
+#include <xed/xed-view.h>
 
-#define WINDOW_DATA_KEY "XedModelinePluginWindowData"
-#define DOCUMENT_DATA_KEY "XedModelinePluginDocumentData"
-
-typedef struct
+struct _XedModelinePluginPrivate
 {
-	gulong tab_added_handler_id;
-	gulong tab_removed_handler_id;
-} WindowData;
+    XedView *view;
 
-typedef struct
+    gulong document_loaded_handler_id;
+    gulong document_saved_handler_id;
+};
+
+enum
 {
-	gulong document_loaded_handler_id;
-	gulong document_saved_handler_id;
-} DocumentData;
+    PROP_0,
+    PROP_VIEW
+};
 
-static void	xed_modeline_plugin_activate (XedPlugin *plugin, XedWindow *window);
-static void	xed_modeline_plugin_deactivate (XedPlugin *plugin, XedWindow *window);
-static GObject	*xed_modeline_plugin_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_param);
-static void	xed_modeline_plugin_finalize (GObject *object);
+static void xed_view_activatable_iface_init (XedViewActivatableInterface *iface);
 
-XED_PLUGIN_REGISTER_TYPE(XedModelinePlugin, xed_modeline_plugin)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedModelinePlugin,
+                                xed_modeline_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_VIEW_ACTIVATABLE,
+                                                               xed_view_activatable_iface_init))
 
 static void
-window_data_free (WindowData *wdata)
+xed_modeline_plugin_constructed (GObject *object)
 {
-	g_slice_free (WindowData, wdata);
-}
+    gchar *data_dir;
 
-static void
-document_data_free (DocumentData *ddata)
-{
-	g_slice_free (DocumentData, ddata);
-}
+    data_dir = peas_extension_base_get_data_dir (PEAS_EXTENSION_BASE (object));
 
-static void
-xed_modeline_plugin_class_init (XedModelinePluginClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
+    modeline_parser_init (data_dir);
 
-	object_class->constructor = xed_modeline_plugin_constructor;
-	object_class->finalize = xed_modeline_plugin_finalize;
+    g_free (data_dir);
 
-	plugin_class->activate = xed_modeline_plugin_activate;
-	plugin_class->deactivate = xed_modeline_plugin_deactivate;
-}
-
-static GObject *
-xed_modeline_plugin_constructor (GType                  type,
-				   guint                  n_construct_properties,
-				   GObjectConstructParam *construct_param)
-{
-	GObject *object;
-	gchar *data_dir;
-
-	object = G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->constructor (type,
-										   n_construct_properties,
-										   construct_param);
-
-	data_dir = xed_plugin_get_data_dir (XED_PLUGIN (object));
-
-	modeline_parser_init (data_dir);
-
-	g_free (data_dir);
-
-	return object;
+    G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->constructed (object);
 }
 
 static void
 xed_modeline_plugin_init (XedModelinePlugin *plugin)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin initializing");
+    xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin initializing");
+
+    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
+                                                XED_TYPE_MODELINE_PLUGIN,
+                                                XedModelinePluginPrivate);
+}
+
+static void
+xed_modeline_plugin_dispose (GObject *object)
+{
+    XedModelinePlugin *plugin = XED_MODELINE_PLUGIN (object);
+
+    xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin disposing");
+
+    g_clear_object (&plugin->priv->view);
+
+    G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->dispose (object);
 }
 
 static void
 xed_modeline_plugin_finalize (GObject *object)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin finalizing");
 
-	modeline_parser_shutdown ();
+    modeline_parser_shutdown ();
 
-	G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->finalize (object);
+    G_OBJECT_CLASS (xed_modeline_plugin_parent_class)->finalize (object);
 }
 
 static void
-on_document_loaded_or_saved (XedDocument *document,
-			     const GError  *error,
-			     GtkSourceView *view)
+xed_modeline_plugin_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
 {
-	modeline_parser_apply_modeline (view);
+    XedModelinePlugin *plugin = XED_MODELINE_PLUGIN (object);
+
+    switch (prop_id)
+    {
+        case PROP_VIEW:
+            plugin->priv->view = XED_VIEW (g_value_dup_object (value));
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
 }
 
 static void
-connect_handlers (XedView *view)
+xed_modeline_plugin_get_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
 {
-	DocumentData *data;
-        GtkTextBuffer *doc;
+    XedModelinePlugin *plugin = XED_MODELINE_PLUGIN (object);
 
-        doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-        data = g_slice_new (DocumentData);
-
-	data->document_loaded_handler_id =
-		g_signal_connect (doc, "loaded",
-				  G_CALLBACK (on_document_loaded_or_saved),
-				  view);
-	data->document_saved_handler_id =
-		g_signal_connect (doc, "saved",
-				  G_CALLBACK (on_document_loaded_or_saved),
-				  view);
-
-	g_object_set_data_full (G_OBJECT (doc), DOCUMENT_DATA_KEY,
-				data, (GDestroyNotify) document_data_free);
+    switch (prop_id)
+    {
+        case PROP_VIEW:
+            g_value_set_object (value, plugin->priv->view);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
 }
 
 static void
-disconnect_handlers (XedView *view)
+on_document_loaded_or_saved (XedDocument   *document,
+                             GtkSourceView *view)
 {
-	DocumentData *data;
-	GtkTextBuffer *doc;
-
-	doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-	data = g_object_steal_data (G_OBJECT (doc), DOCUMENT_DATA_KEY);
-
-	if (data)
-	{
-		g_signal_handler_disconnect (doc, data->document_loaded_handler_id);
-		g_signal_handler_disconnect (doc, data->document_saved_handler_id);
-
-		document_data_free (data);
-	}
-	else
-	{
-		g_warning ("Modeline handlers not found");
-	}
+    modeline_parser_apply_modeline (view);
 }
 
 static void
-on_window_tab_added (XedWindow *window,
-		     XedTab *tab,
-		     gpointer user_data)
+xed_modeline_plugin_activate (XedViewActivatable *activatable)
 {
-	connect_handlers (xed_tab_get_view (tab));
+    XedModelinePlugin *plugin;
+    GtkTextBuffer *doc;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    plugin = XED_MODELINE_PLUGIN (activatable);
+
+    modeline_parser_apply_modeline (GTK_SOURCE_VIEW (plugin->priv->view));
+
+    doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (plugin->priv->view));
+
+    plugin->priv->document_loaded_handler_id =
+        g_signal_connect (doc, "loaded",
+                          G_CALLBACK (on_document_loaded_or_saved), plugin->priv->view);
+    plugin->priv->document_saved_handler_id =
+        g_signal_connect (doc, "saved",
+                          G_CALLBACK (on_document_loaded_or_saved), plugin->priv->view);
 }
 
 static void
-on_window_tab_removed (XedWindow *window,
-		       XedTab *tab,
-		       gpointer user_data)
+xed_modeline_plugin_deactivate (XedViewActivatable *activatable)
 {
-	disconnect_handlers (xed_tab_get_view (tab));
+    XedModelinePlugin *plugin;
+    GtkTextBuffer *doc;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    plugin = XED_MODELINE_PLUGIN (activatable);
+
+    doc = gtk_text_view_get_buffer (GTK_TEXT_VIEW (plugin->priv->view));
+
+    g_signal_handler_disconnect (doc, plugin->priv->document_loaded_handler_id);
+    g_signal_handler_disconnect (doc, plugin->priv->document_saved_handler_id);
 }
 
 static void
-xed_modeline_plugin_activate (XedPlugin *plugin,
-				XedWindow *window)
+xed_modeline_plugin_class_init (XedModelinePluginClass *klass)
 {
-	WindowData *wdata;
-	GList *views;
-	GList *l;
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	xed_debug (DEBUG_PLUGINS);
+    object_class->constructed = xed_modeline_plugin_constructed;
+    object_class->dispose = xed_modeline_plugin_dispose;
+    object_class->finalize = xed_modeline_plugin_finalize;
+    object_class->set_property = xed_modeline_plugin_set_property;
+    object_class->get_property = xed_modeline_plugin_get_property;
 
-	views = xed_window_get_views (window);
-	for (l = views; l != NULL; l = l->next)
-	{
-		connect_handlers (XED_VIEW (l->data));
-		modeline_parser_apply_modeline (GTK_SOURCE_VIEW (l->data));
-	}
-	g_list_free (views);
+    g_object_class_override_property (object_class, PROP_VIEW, "view");
 
-	wdata = g_slice_new (WindowData);
-
-	wdata->tab_added_handler_id =
-		g_signal_connect (window, "tab-added",
-				  G_CALLBACK (on_window_tab_added), NULL);
-
-	wdata->tab_removed_handler_id =
-		g_signal_connect (window, "tab-removed",
-				  G_CALLBACK (on_window_tab_removed), NULL);
-
-	g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY,
-				wdata, (GDestroyNotify) window_data_free);
+    g_type_class_add_private (klass, sizeof (XedModelinePluginPrivate));
 }
 
 static void
-xed_modeline_plugin_deactivate (XedPlugin *plugin,
-				  XedWindow *window)
+xed_view_activatable_iface_init (XedViewActivatableInterface *iface)
 {
-	WindowData *wdata;
-	GList *views;
-	GList *l;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	wdata = g_object_steal_data (G_OBJECT (window), WINDOW_DATA_KEY);
-
-	g_signal_handler_disconnect (window, wdata->tab_added_handler_id);
-	g_signal_handler_disconnect (window, wdata->tab_removed_handler_id);
-
-	window_data_free (wdata);
-
-	views = xed_window_get_views (window);
-
-	for (l = views; l != NULL; l = l->next)
-	{
-		disconnect_handlers (XED_VIEW (l->data));
-		
-		modeline_parser_deactivate (GTK_SOURCE_VIEW (l->data));
-	}
-	
-	g_list_free (views);
+    iface->activate = xed_modeline_plugin_activate;
+    iface->deactivate = xed_modeline_plugin_deactivate;
 }
 
+static void
+xed_modeline_plugin_class_finalize (XedModelinePluginClass *klass)
+{
+   /* dummy function - used by G_DEFINE_DYNAMIC_TYPE_EXTENDED */
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+   xed_modeline_plugin_register_type (G_TYPE_MODULE (module));
+
+   peas_object_module_register_extension_type (module,
+                                               XED_TYPE_VIEW_ACTIVATABLE,
+                                               XED_TYPE_MODELINE_PLUGIN);
+}

plugins/modelines/xed-modeline-plugin.h

@@ -1,7 +1,7 @@
 /*
  * xed-modeline-plugin.h
  * Emacs, Kate and Vim-style modelines support for xed.
- * 
+ *
  * Copyright (C) 2005-2007 - Steve Frécinaux <code@istique.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,24 +24,41 @@
 
 #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
 
-#define XED_TYPE_MODELINE_PLUGIN		(xed_modeline_plugin_get_type ())
-#define XED_MODELINE_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_MODELINE_PLUGIN, XedModelinePlugin))
-#define XED_MODELINE_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_MODELINE_PLUGIN, XedModelinePluginClass))
-#define XED_IS_MODELINE_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_MODELINE_PLUGIN))
-#define XED_IS_MODELINE_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_MODELINE_PLUGIN))
-#define XED_MODELINE_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_MODELINE_PLUGIN, XedModelinePluginClass))
+#define XED_TYPE_MODELINE_PLUGIN        (xed_modeline_plugin_get_type ())
+#define XED_MODELINE_PLUGIN(o)      (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_MODELINE_PLUGIN, XedModelinePlugin))
+#define XED_MODELINE_PLUGIN_CLASS(k)        (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_MODELINE_PLUGIN, XedModelinePluginClass))
+#define XED_IS_MODELINE_PLUGIN(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_MODELINE_PLUGIN))
+#define XED_IS_MODELINE_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_MODELINE_PLUGIN))
+#define XED_MODELINE_PLUGIN_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_MODELINE_PLUGIN, XedModelinePluginClass))
 
 /* Private structure type */
-typedef XedPluginClass	XedModelinePluginClass;
-typedef XedPlugin		XedModelinePlugin;
+typedef struct _XedModelinePlugin         XedModelinePlugin;
+typedef struct _XedModelinePluginPrivate  XedModelinePluginPrivate;
+typedef struct _XedModelinePluginClass    XedModelinePluginClass;
 
-GType	xed_modeline_plugin_get_type		(void) G_GNUC_CONST;
+struct _XedModelinePlugin
+{
+    PeasExtensionBase parent;
 
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule *module);
+    /*< private >*/
+    XedModelinePluginPrivate *priv;
+};
+
+typedef struct _XedModelinePluginClass    XedModelinePluginClass;
+
+struct _XedModelinePluginClass
+{
+    PeasExtensionBaseClass parent_class;
+};
+
+GType   xed_modeline_plugin_get_type        (void) G_GNUC_CONST;
+
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 

plugins/sort/Makefile.am

@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	$(XED_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)	
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 plugin_LTLIBRARIES = libsort.la
 
@@ -16,16 +16,13 @@ libsort_la_SOURCES = \
 libsort_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libsort_la_LIBADD  = $(XED_LIBS)
 
-uidir = $(XED_PLUGINS_DATA_DIR)/sort
-ui_DATA = sort.ui
+plugin_in_files = sort.plugin.desktop.in
 
-plugin_in_files = sort.xed-plugin.desktop.in
+%.plugin: %.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-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:.plugin.desktop.in=.plugin)
 
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
-
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_files)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)

plugins/sort/sort.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Module=sort
 IAge=2
 _Name=Sort
@@ -7,3 +7,4 @@ Icon=gtk-sort-ascending
 Authors=Carlo Borreo <borreo@softhome.net>;Lee Mallabone <mate@fonicmonkey.net>;Paolo Maggi <paolo.maggi@polito.it>;Jorge Alberto Torres H. <jorge@deadoak.com>
 Copyright=Copyright © 2001 Carlo Borreo\nCopyright © 2002-2003 Lee Mallabone, Paolo Maggi\nCopyright © 2004-2005 Paolo Maggi
 Website=http://www.mate-desktop.org
+Builtin=true

plugins/sort/sort.ui

@@ -1,274 +0,0 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
-<interface>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="lower">1</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
-  </object>
-  <object class="GtkImage" id="sort_image">
-    <property name="stock">gtk-sort-ascending</property>
-    <property name="icon_size">4</property>
-  </object>
-  <object class="GtkDialog" id="sort_dialog">
-    <property name="title" translatable="yes">Sort</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
-    <property name="resizable">False</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog_action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <property name="image">sort_image</property>
-                <property name="label" translatable="yes">_Sort</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="button3">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="border_width">10</property>
-            <property name="visible">True</property>
-            <property name="homogeneous">False</property>
-            <property name="spacing">18</property>
-            <child>
-              <object class="GtkVBox" id="vbox5">
-                <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkCheckButton" id="reverse_order_checkbutton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Reverse order</property>
-                    <property name="use_underline">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="focus_on_click">True</property>
-                    <property name="active">False</property>
-                    <property name="inconsistent">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="remove_dups_checkbutton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">R_emove duplicates</property>
-                    <property name="use_underline">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="focus_on_click">True</property>
-                    <property name="active">False</property>
-                    <property name="inconsistent">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="ignore_case_checkbutton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Ignore case</property>
-                    <property name="use_underline">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="focus_on_click">True</property>
-                    <property name="active">True</property>
-                    <property name="inconsistent">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox13">
-                    <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label18">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">S_tart at column:</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="mnemonic_widget">col_num_spinbutton</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="col_num_spinbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="climb_rate">1</property>
-                        <property name="digits">0</property>
-                        <property name="numeric">True</property>
-                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                        <property name="snap_to_ticks">False</property>
-                        <property name="wrap">False</property>
-                        <property name="adjustment">adjustment1</property>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox14">
-                <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="image7">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                    <property name="icon_size">4</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label17">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">You cannot undo a sort operation</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                    <property name="width_chars">-1</property>
-                    <property name="single_line_mode">False</property>
-                    <property name="angle">0</property>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">button1</action-widget>
-      <action-widget response="-5">button2</action-widget>
-      <action-widget response="-11">button3</action-widget>
-    </action-widgets>
-  </object>
-</interface>

plugins/sort/xed-sort-plugin.c

@@ -28,561 +28,392 @@
 #include "xed-sort-plugin.h"
 
 #include <string.h>
-#include <glib/gi18n-lib.h>
-#include <gmodule.h>
+#include <stdlib.h>
+#include <glib/gi18n.h>
 
+#include <xed/xed-window.h>
+#include <xed/xed-window-activatable.h>
 #include <xed/xed-debug.h>
 #include <xed/xed-utils.h>
-#include <xed/xed-help.h>
+#include <xed/xed-app.h>
 
 #define XED_SORT_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_SORT_PLUGIN, XedSortPluginPrivate))
 
-/* Key in case the plugin ever needs any settings. */
-#define SORT_BASE_KEY "/apps/xed/plugins/sort"
-
-#define WINDOW_DATA_KEY "XedSortPluginWindowData"
 #define MENU_PATH "/MenuBar/EditMenu/EditOps_6"
 
-XED_PLUGIN_REGISTER_TYPE(XedSortPlugin, xed_sort_plugin)
+static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
 
-typedef struct
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedSortPlugin,
+                                xed_sort_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init))
+
+struct _XedSortPluginPrivate
 {
-	GtkWidget *dialog;
-	GtkWidget *col_num_spinbutton;
-	GtkWidget *reverse_order_checkbutton;
-	GtkWidget *ignore_case_checkbutton;
-	GtkWidget *remove_dups_checkbutton;
+    XedWindow *window;
 
-	XedDocument *doc;
+    GtkActionGroup *ui_action_group;
+    guint ui_id;
 
-	GtkTextIter start, end; /* selection */
-} SortDialog;
+    GtkTextIter start, end; /* selection */
+};
 
-typedef struct
+enum
 {
-	GtkActionGroup *ui_action_group;
-	guint ui_id;
-} WindowData;
+    PROP_0,
+    PROP_WINDOW
+};
 
-typedef struct
-{
-	XedPlugin *plugin;
-	XedWindow *window;
-} ActionData;
+static void sort_cb (GtkAction     *action,
+                     XedSortPlugin *plugin);
 
-typedef struct
-{
-	gboolean ignore_case;
-	gboolean reverse_order;
-	gboolean remove_duplicates;
-	gint starting_column;
-} SortInfo;
-
-static void sort_cb (GtkAction *action, ActionData *action_data);
-static void sort_real (SortDialog *dialog);
+static void buffer_sort_lines (GtkSourceBuffer *buffer,
+                               GtkTextIter     *start,
+                               GtkTextIter     *end);
 
 static const GtkActionEntry action_entries[] =
 {
-	{ "Sort",
-	  "view-sort-ascending-symbolic",
-	  N_("S_ort..."),
-	  NULL,
-	  N_("Sort the current document or selection"),
-	  G_CALLBACK (sort_cb) }
+    { "Sort",
+      NULL,
+      N_("S_ort lines"),
+      "F10",
+      N_("Sort the current document or selection"),
+      G_CALLBACK (sort_cb)
+    }
 };
 
-static void
-sort_dialog_dispose (GObject *obj,
-		     gpointer  dialog_pointer)
-{
-	xed_debug (DEBUG_PLUGINS);
-
-	g_slice_free (SortDialog, dialog_pointer);
-}
-
-static void
-sort_dialog_response_handler (GtkDialog  *widget,
-			      gint       res_id,
-			      SortDialog *dialog)
-{
-	xed_debug (DEBUG_PLUGINS);
-
-	switch (res_id)
-	{
-		case GTK_RESPONSE_OK:
-			sort_real (dialog);
-			gtk_widget_destroy (dialog->dialog);
-			break;
-
-		case GTK_RESPONSE_HELP:
-			xed_help_display (GTK_WINDOW (widget),
-					    NULL,
-					    "xed-sort-plugin");
-			break;
-
-		case GTK_RESPONSE_CANCEL:
-			gtk_widget_destroy (dialog->dialog);
-			break;
-	}
-}
-
 /* NOTE: we store the current selection in the dialog since focusing
  * the text field (like the combo box) looses the documnent selection.
  * Storing the selection ONLY works because the dialog is modal */
 static void
-get_current_selection (XedWindow *window, SortDialog *dialog)
+get_current_selection (XedSortPlugin *plugin)
 {
-	XedDocument *doc;
+    XedSortPluginPrivate *priv;
+    XedDocument *doc;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	doc = xed_window_get_active_document (window);
+    priv = plugin->priv;
 
-	if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc),
-						   &dialog->start,
-						   &dialog->end))
-	{
-		/* No selection, get the whole document. */
-		gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc),
-					    &dialog->start,
-					    &dialog->end);
-	}
-}
+    doc = xed_window_get_active_document (priv->window);
 
-static SortDialog *
-get_sort_dialog (ActionData *action_data)
-{
-	SortDialog *dialog;
-	GtkWidget *error_widget;
-	gboolean ret;
-	gchar *data_dir;
-	gchar *ui_file;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	dialog = g_slice_new (SortDialog);
-
-	data_dir = xed_plugin_get_data_dir (action_data->plugin);
-	ui_file = g_build_filename (data_dir, "sort.ui", NULL);
-	g_free (data_dir);
-	ret = xed_utils_get_ui_objects (ui_file,
-					  NULL,
-					  &error_widget,
-					  "sort_dialog", &dialog->dialog,
-					  "reverse_order_checkbutton", &dialog->reverse_order_checkbutton,
-					  "col_num_spinbutton", &dialog->col_num_spinbutton,
-					  "ignore_case_checkbutton", &dialog->ignore_case_checkbutton,
-					  "remove_dups_checkbutton", &dialog->remove_dups_checkbutton,
-					  NULL);
-	g_free (ui_file);
-
-	if (!ret)
-	{
-		const gchar *err_message;
-
-		err_message = gtk_label_get_label (GTK_LABEL (error_widget));
-		xed_warning (GTK_WINDOW (action_data->window),
-			       "%s", err_message);
-
-		g_slice_free (SortDialog, dialog);
-		gtk_widget_destroy (error_widget);
-
-		return NULL;
-	}
-
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog->dialog),
-					 GTK_RESPONSE_OK);
-
-	g_signal_connect (dialog->dialog,
-			  "dispose",
-			  G_CALLBACK (sort_dialog_dispose),
-			  dialog);
-
-	g_signal_connect (dialog->dialog,
-			  "response",
-			  G_CALLBACK (sort_dialog_response_handler),
-			  dialog);
-
-	get_current_selection (action_data->window, dialog);
-
-	return dialog;
+    if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &priv->start, &priv->end))
+    {
+        /* No selection, get the whole document. */
+        gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc), &priv->start, &priv->end);
+    }
 }
 
 static void
-sort_cb (GtkAction  *action,
-	 ActionData *action_data)
+sort_cb (GtkAction     *action,
+         XedSortPlugin *plugin)
 {
-	XedDocument *doc;
-	GtkWindowGroup *wg;
-	SortDialog *dialog;
+    XedSortPluginPrivate *priv;
+    XedDocument *doc;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	doc = xed_window_get_active_document (action_data->window);
-	g_return_if_fail (doc != NULL);
+    priv = plugin->priv;
 
-	dialog = get_sort_dialog (action_data);
-	g_return_if_fail (dialog != NULL);
+    doc = xed_window_get_active_document (priv->window);
+    g_return_if_fail (doc != NULL);
 
-	wg = xed_window_get_group (action_data->window);
-	gtk_window_group_add_window (wg,
-				     GTK_WINDOW (dialog->dialog));
+    get_current_selection (plugin);
 
-	dialog->doc = doc;
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-				      GTK_WINDOW (action_data->window));
-
-	gtk_window_set_modal (GTK_WINDOW (dialog->dialog),
-			      TRUE);
-
-	gtk_widget_show (GTK_WIDGET (dialog->dialog));
-}
-
-/* Compares two strings for the sorting algorithm. Uses the UTF-8 processing
- * functions in GLib to be as correct as possible.*/
-static gint
-compare_algorithm (gconstpointer s1,
-		   gconstpointer s2,
-		   gpointer	 data)
-{
-	gint length1, length2;
-	gint ret;
-	gchar *string1, *string2;
-	gchar *substring1, *substring2;
-	gchar *key1, *key2;
-	SortInfo *sort_info;
-
-	xed_debug (DEBUG_PLUGINS);
-
-	sort_info = (SortInfo *) data;
-	g_return_val_if_fail (sort_info != NULL, -1);
-
-	if (!sort_info->ignore_case)
-	{
-		string1 = *((gchar **) s1);
-		string2 = *((gchar **) s2);
-	}
-	else
-	{
-		string1 = g_utf8_casefold (*((gchar **) s1), -1);
-		string2 = g_utf8_casefold (*((gchar **) s2), -1);
-	}
-
-	length1 = g_utf8_strlen (string1, -1);
-	length2 = g_utf8_strlen (string2, -1);
-
-	if ((length1 < sort_info->starting_column) &&
-	    (length2 < sort_info->starting_column))
-	{
-		ret = 0;
-	}
-	else if (length1 < sort_info->starting_column)
-	{
-		ret = -1;
-	}
-	else if (length2 < sort_info->starting_column)
-	{
-		ret = 1;
-	}
-	else if (sort_info->starting_column < 1)
-	{
-		key1 = g_utf8_collate_key (string1, -1);
-		key2 = g_utf8_collate_key (string2, -1);
-		ret = strcmp (key1, key2);
-
-		g_free (key1);
-		g_free (key2);
-	}
-	else
-	{
-		/* A character column offset is required, so figure out
-		 * the correct offset into the UTF-8 string. */
-		substring1 = g_utf8_offset_to_pointer (string1, sort_info->starting_column);
-		substring2 = g_utf8_offset_to_pointer (string2, sort_info->starting_column);
-
-		key1 = g_utf8_collate_key (substring1, -1);
-		key2 = g_utf8_collate_key (substring2, -1);
-		ret = strcmp (key1, key2);
-
-		g_free (key1);
-		g_free (key2);
-	}
-
-	/* Do the necessary cleanup. */
-	if (sort_info->ignore_case)
-	{
-		g_free (string1);
-		g_free (string2);
-	}
-
-	if (sort_info->reverse_order)
-	{
-		ret = -1 * ret;
-	}
-
-	return ret;
+    buffer_sort_lines (GTK_SOURCE_BUFFER (doc),
+                       &priv->start,
+                       &priv->end);
 }
 
 static gchar *
 get_line_slice (GtkTextBuffer *buf,
-		gint           line)
+                gint           line)
 {
-	GtkTextIter start, end;
-	char *ret;
+    GtkTextIter start, end;
 
-	gtk_text_buffer_get_iter_at_line (buf, &start, line);
-	end = start;
+    gtk_text_buffer_get_iter_at_line (buf, &start, line);
+    end = start;
 
-	if (!gtk_text_iter_ends_line (&start))
-		gtk_text_iter_forward_to_line_end (&end);
+    if (!gtk_text_iter_ends_line (&start))
+    {
+        gtk_text_iter_forward_to_line_end (&end);
+    }
 
-	ret= gtk_text_buffer_get_slice (buf,
-					  &start,
-					  &end,
-					  TRUE);
+    return gtk_text_buffer_get_slice (buf, &start, &end, TRUE);
+}
 
-	g_assert (ret != NULL);
+typedef struct {
+    gchar *line; /* the original text to re-insert */
+    gchar *key;  /* the key to use for the comparison */
+} SortLine;
 
-	return ret;
+static gint
+compare_line (gconstpointer aptr,
+              gconstpointer bptr)
+{
+    const SortLine *a = aptr;
+    const SortLine *b = bptr;
+
+    return g_strcmp0 (a->key, b->key);
 }
 
 static void
-sort_real (SortDialog *dialog)
+buffer_sort_lines (GtkSourceBuffer    *buffer,
+                   GtkTextIter        *start,
+                   GtkTextIter        *end)
 {
-	XedDocument *doc;
-	GtkTextIter start, end;
-	gint start_line, end_line;
-	gint i;
-	gchar *last_row = NULL;
-	gint num_lines;
-	gchar **lines;
-	SortInfo *sort_info;
+    GtkTextBuffer *text_buffer;
+    gint start_line;
+    gint end_line;
+    gint num_lines;
+    SortLine *lines;
+    gchar *last_line = NULL;
+    gint i;
 
-	xed_debug (DEBUG_PLUGINS);
+    g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
+    g_return_if_fail (start != NULL);
+    g_return_if_fail (end != NULL);
 
-	doc = dialog->doc;
-	g_return_if_fail (doc != NULL);
+    text_buffer = GTK_TEXT_BUFFER (buffer);
 
-	sort_info = g_new0 (SortInfo, 1);
-	sort_info->ignore_case = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->ignore_case_checkbutton));
-	sort_info->reverse_order = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->reverse_order_checkbutton));
-	sort_info->remove_duplicates = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->remove_dups_checkbutton));
-	sort_info->starting_column = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->col_num_spinbutton)) - 1;
+    gtk_text_iter_order (start, end);
 
-	start = dialog->start;
-	end = dialog->end;
-	start_line = gtk_text_iter_get_line (&start);
-	end_line = gtk_text_iter_get_line (&end);
+    start_line = gtk_text_iter_get_line (start);
+    end_line = gtk_text_iter_get_line (end);
 
-	/* if we are at line start our last line is the previus one.
-	 * Otherwise the last line is the current one but we try to
-	 * move the iter after the line terminator */
-	if (gtk_text_iter_get_line_offset (&end) == 0)
-		end_line = MAX (start_line, end_line - 1);
-	else
-		gtk_text_iter_forward_line (&end);
+    /* Required for gtk_text_buffer_delete() */
+    if (!gtk_text_iter_starts_line (start))
+    {
+        gtk_text_iter_set_line_offset (start, 0);
+    }
 
-	num_lines = end_line - start_line + 1;
-	lines = g_new0 (gchar *, num_lines + 1);
+    /* if we are at line start our last line is the previus one.
+     * Otherwise the last line is the current one but we try to
+     * move the iter after the line terminator */
+    if (gtk_text_iter_starts_line (end))
+    {
+        end_line = MAX (start_line, end_line - 1);
+    }
+    else
+    {
+        gtk_text_iter_forward_line (end);
+    }
 
-	xed_debug_message (DEBUG_PLUGINS, "Building list...");
+    if (start_line == end_line)
+    {
+        return;
+    }
 
-	for (i = 0; i < num_lines; i++)
-	{
-		lines[i] = get_line_slice (GTK_TEXT_BUFFER (doc), start_line + i);
-	}
+    num_lines = end_line - start_line + 1;
+    lines = g_new0 (SortLine, num_lines);
 
-	lines[num_lines] = NULL;
+    for (i = 0; i < num_lines; i++)
+    {
+        gchar *line;
 
-	xed_debug_message (DEBUG_PLUGINS, "Sort list...");
+        lines[i].line = get_line_slice (text_buffer, start_line + i);
+        line = g_utf8_casefold (lines[i].line, -1);
+        lines[i].key = g_utf8_collate_key (line, -1);
 
-	g_qsort_with_data (lines,
-			   num_lines,
-			   sizeof (gpointer),
-			   compare_algorithm,
-			   sort_info);
+        g_free (line);
+    }
 
-	xed_debug_message (DEBUG_PLUGINS, "Rebuilding document...");
+    qsort (lines, num_lines, sizeof (SortLine), compare_line);
 
-	gtk_source_buffer_begin_not_undoable_action (GTK_SOURCE_BUFFER (doc));
+    gtk_text_buffer_begin_user_action (text_buffer);
 
-	gtk_text_buffer_delete (GTK_TEXT_BUFFER (doc),
-				&start,
-				&end);
+    gtk_text_buffer_delete (text_buffer, start, end);
 
-	for (i = 0; i < num_lines; i++)
-	{
-		if (sort_info->remove_duplicates &&
-		    last_row != NULL &&
-		    (strcmp (last_row, lines[i]) == 0))
-			continue;
+    for (i = 0; i < num_lines; i++)
+    {
+        gtk_text_buffer_insert (text_buffer, start, lines[i].line, -1);
+        gtk_text_buffer_insert (text_buffer, start, "\n", -1);
 
-		gtk_text_buffer_insert (GTK_TEXT_BUFFER (doc),
-					&start,
-					lines[i],
-					-1);
-		gtk_text_buffer_insert (GTK_TEXT_BUFFER (doc),
-					&start,
-					"\n",
-					-1);
+        last_line = lines[i].line;
+    }
 
-		last_row = lines[i];
-	}
+    gtk_text_buffer_end_user_action (text_buffer);
 
-	gtk_source_buffer_end_not_undoable_action (GTK_SOURCE_BUFFER (doc));
+    for (i = 0; i < num_lines; i++)
+    {
+        g_free (lines[i].line);
+        g_free (lines[i].key);
+    }
 
-	g_strfreev (lines);
-	g_free (sort_info);
-
-	xed_debug_message (DEBUG_PLUGINS, "Done.");
+    g_free (lines);
 }
 
 static void
-free_window_data (WindowData *data)
+update_ui (XedSortPlugin *plugin)
 {
-	g_return_if_fail (data != NULL);
+    XedView *view;
 
-	g_object_unref (data->ui_action_group);
-	g_slice_free (WindowData, data);
+    xed_debug (DEBUG_PLUGINS);
+
+    view = xed_window_get_active_view (plugin->priv->window);
+
+    gtk_action_group_set_sensitive (plugin->priv->ui_action_group,
+                                    (view != NULL) &&
+                                    gtk_text_view_get_editable (GTK_TEXT_VIEW (view)));
 }
 
 static void
-free_action_data (ActionData *data)
+xed_sort_plugin_activate (XedWindowActivatable *activatable)
 {
-	g_return_if_fail (data != NULL);
+    XedSortPluginPrivate *priv;
+    GtkUIManager *manager;
 
-	g_slice_free (ActionData, data);
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_SORT_PLUGIN (activatable)->priv;
+    manager = xed_window_get_ui_manager (priv->window);
+
+    priv->ui_action_group = gtk_action_group_new ("XedSortPluginActions");
+    gtk_action_group_set_translation_domain (priv->ui_action_group, GETTEXT_PACKAGE);
+    gtk_action_group_add_actions (priv->ui_action_group, action_entries, G_N_ELEMENTS (action_entries), activatable);
+
+    gtk_ui_manager_insert_action_group (manager, priv->ui_action_group, -1);
+
+    priv->ui_id = gtk_ui_manager_new_merge_id (manager);
+
+    gtk_ui_manager_add_ui (manager,
+                           priv->ui_id,
+                           MENU_PATH,
+                           "Sort",
+                           "Sort",
+                           GTK_UI_MANAGER_MENUITEM,
+                           FALSE);
+
+    update_ui (XED_SORT_PLUGIN (activatable));
 }
 
 static void
-update_ui_real (XedWindow  *window,
-		WindowData   *data)
+xed_sort_plugin_deactivate (XedWindowActivatable *activatable)
 {
-	XedView *view;
+    XedSortPluginPrivate *priv;
+    GtkUIManager *manager;
 
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);
 
-	view = xed_window_get_active_view (window);
+    priv = XED_SORT_PLUGIN (activatable)->priv;
+    manager = xed_window_get_ui_manager (priv->window);
 
-	gtk_action_group_set_sensitive (data->ui_action_group,
-					(view != NULL) &&
-					gtk_text_view_get_editable (GTK_TEXT_VIEW (view)));
+    gtk_ui_manager_remove_ui (manager, priv->ui_id);
+    gtk_ui_manager_remove_action_group (manager, priv->ui_action_group);
 }
 
 static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
+xed_sort_plugin_update_state (XedWindowActivatable *activatable)
 {
-	GtkUIManager *manager;
-	WindowData *data;
-	ActionData *action_data;
+    xed_debug (DEBUG_PLUGINS);
 
-	xed_debug (DEBUG_PLUGINS);
-
-	data = g_slice_new (WindowData);
-	action_data = g_slice_new (ActionData);
-	action_data->window = window;
-	action_data->plugin = plugin;
-
-	manager = xed_window_get_ui_manager (window);
-
-	data->ui_action_group = gtk_action_group_new ("XedSortPluginActions");
-	gtk_action_group_set_translation_domain (data->ui_action_group,
-						 GETTEXT_PACKAGE);
-	gtk_action_group_add_actions_full (data->ui_action_group,
-					   action_entries,
-					   G_N_ELEMENTS (action_entries),
-					   action_data,
-					   (GDestroyNotify) free_action_data);
-
-	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,
-			       "Sort",
-			       "Sort",
-			       GTK_UI_MANAGER_MENUITEM,
-			       FALSE);
-
-	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->ui_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);
+    update_ui (XED_SORT_PLUGIN (activatable));
 }
 
 static void
 xed_sort_plugin_init (XedSortPlugin *plugin)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin initializing");
+    xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin initializing");
+
+    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XED_TYPE_SORT_PLUGIN, XedSortPluginPrivate);
+}
+
+static void
+xed_sort_plugin_dispose (GObject *object)
+{
+    XedSortPlugin *plugin = XED_SORT_PLUGIN (object);
+
+    xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin disposing");
+
+    g_clear_object (&plugin->priv->ui_action_group);
+    g_clear_object (&plugin->priv->window);
+
+    G_OBJECT_CLASS (xed_sort_plugin_parent_class)->dispose (object);
 }
 
 static void
 xed_sort_plugin_finalize (GObject *object)
 {
-	xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin finalizing");
 
-	G_OBJECT_CLASS (xed_sort_plugin_parent_class)->finalize (object);
+    G_OBJECT_CLASS (xed_sort_plugin_parent_class)->finalize (object);
+}
+
+static void
+xed_sort_plugin_set_property (GObject      *object,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+    XedSortPlugin *plugin = XED_SORT_PLUGIN (object);
+
+    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
+xed_sort_plugin_get_property (GObject    *object,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+    XedSortPlugin *plugin = XED_SORT_PLUGIN (object);
+
+    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
 xed_sort_plugin_class_init (XedSortPluginClass *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_sort_plugin_finalize;
+    object_class->dispose = xed_sort_plugin_dispose;
+    object_class->finalize = xed_sort_plugin_finalize;
+    object_class->set_property = xed_sort_plugin_set_property;
+    object_class->get_property = xed_sort_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");
+
+    g_type_class_add_private (klass, sizeof (XedSortPluginPrivate));
+}
+
+static void
+xed_sort_plugin_class_finalize (XedSortPluginClass *klass)
+{
+    /* dummy function - used by G_DEFINE_DYNAMIC_TYPE_EXTENDED */
+}
+
+static void
+xed_window_activatable_iface_init (XedWindowActivatableInterface *iface)
+{
+    iface->activate = xed_sort_plugin_activate;
+    iface->deactivate = xed_sort_plugin_deactivate;
+    iface->update_state = xed_sort_plugin_update_state;
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+    xed_sort_plugin_register_type (G_TYPE_MODULE (module));
+
+    peas_object_module_register_extension_type (module,
+                                                XED_TYPE_WINDOW_ACTIVATABLE,
+                                                XED_TYPE_SORT_PLUGIN);
 }

plugins/sort/xed-sort-plugin.h

@@ -1,6 +1,6 @@
 /*
  * xed-sort-plugin.h
- * 
+ *
  * 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)
@@ -14,8 +14,6 @@
  * 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_SORT_PLUGIN_H__
@@ -23,50 +21,38 @@
 
 #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_SORT_PLUGIN		(xed_sort_plugin_get_type ())
-#define XED_SORT_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_SORT_PLUGIN, XedSortPlugin))
-#define XED_SORT_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_SORT_PLUGIN, XedSortPluginClass))
-#define XED_IS_SORT_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_SORT_PLUGIN))
-#define XED_IS_SORT_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_SORT_PLUGIN))
-#define XED_SORT_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_SORT_PLUGIN, XedSortPluginClass))
+#define XED_TYPE_SORT_PLUGIN            (xed_sort_plugin_get_type ())
+#define XED_SORT_PLUGIN(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_SORT_PLUGIN, XedSortPlugin))
+#define XED_SORT_PLUGIN_CLASS(k)        (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_SORT_PLUGIN, XedSortPluginClass))
+#define XED_IS_SORT_PLUGIN(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_SORT_PLUGIN))
+#define XED_IS_SORT_PLUGIN_CLASS(k)     (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_SORT_PLUGIN))
+#define XED_SORT_PLUGIN_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_SORT_PLUGIN, XedSortPluginClass))
 
-/* Private structure type */
-typedef struct _XedSortPluginPrivate	XedSortPluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _XedSortPlugin		XedSortPlugin;
+typedef struct _XedSortPlugin           XedSortPlugin;
+typedef struct _XedSortPluginPrivate    XedSortPluginPrivate;
+typedef struct _XedSortPluginClass      XedSortPluginClass;
 
 struct _XedSortPlugin
 {
-	XedPlugin parent_instance;
-};
+    PeasExtensionBase parent;
 
-/*
- * Class definition
- */
-typedef struct _XedSortPluginClass	XedSortPluginClass;
+    /*< private >*/
+    XedSortPluginPrivate *priv;
+};
 
 struct _XedSortPluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
-/*
- * Public methods
- */
-GType	xed_sort_plugin_get_type		(void) G_GNUC_CONST;
+GType xed_sort_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/spell/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = 							\
 	$(XED_CFLAGS) 					\
 	$(ENCHANT_CFLAGS)					\
 	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED_CFLAGS)	
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 BUILT_SOURCES = 					\
 	xed-spell-marshal.c				\
@@ -29,9 +29,9 @@ libspell_la_SOURCES = \
 	xed-automatic-spell-checker.h			\
 	xed-spell-utils.c				\
 	xed-spell-utils.h				\
-	$(BUILT_SOURCES)			
+	$(BUILT_SOURCES)
 
-libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) 
+libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libspell_la_LIBADD  = $(XED_LIBS) $(ENCHANT_LIBS)
 
 uidir = $(XED_PLUGINS_DATA_DIR)/spell
@@ -44,11 +44,11 @@ xed-spell-marshal.c: xed-spell-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) echo "#include \"xed-spell-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=xed_marshal >> $@
 
-plugin_in_files = spell.xed-plugin.desktop.in
+plugin_in_files = spell.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: %.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)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 spell_gschema_in = org.x.editor.plugins.spell.gschema.xml.in

plugins/spell/languages-dialog.ui

@@ -1,136 +1,132 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Set language</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
     <property name="modal">True</property>
-    <property name="resizable">True</property>
     <property name="destroy_with_parent">True</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
                 <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
                 <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="visible">True</property>
-                <property name="can_default">True</property>
-                <property name="can_focus">True</property>
                 <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="content">
-            <property name="border_width">5</property>
+          <object class="GtkBox" id="content">
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">11</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Select the _language of the current document.</property>
                 <property name="use_underline">True</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">True</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
                 <property name="mnemonic_widget">languages_treeview</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="height_request">180</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                <property name="shadow_type">etched-in</property>
                 <child>
                   <object class="GtkTreeView" id="languages_treeview">
                     <property name="height_request">180</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
-                    <property name="rules_hint">False</property>
-                    <property name="reorderable">False</property>
-                    <property name="enable_search">True</property>
-                    <property name="fixed_height_mode">False</property>
-                    <property name="hover_selection">False</property>
-                    <property name="hover_expand">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                    </child>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>

plugins/spell/spell-checker.ui

@@ -1,479 +1,366 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <object class="GtkImage" id="check_word_image">
-    <property name="stock">gtk-spell-check</property>
-    <property name="icon_size">4</property>
-  </object>
-  <object class="GtkImage" id="add_word_image">
-    <property name="stock">gtk-add</property>
-    <property name="icon_size">4</property>
-  </object>
-  <object class="GtkImage" id="ignore_image">
-     <property name="stock">gtk-go-down</property>
-     <property name="icon_size">4</property>
-  </object>
-  <object class="GtkImage" id="change_image">
-     <property name="stock">gtk-convert</property>
-     <property name="icon_size">4</property>
-  </object>
-  <object class="GtkImage" id="ignore_all_image">
-    <property name="stock">gtk-goto-bottom</property>
-    <property name="icon_size">4</property>
-  </object>
-  <object class="GtkImage" id="change_all_image">
-     <property name="stock">gtk-convert</property>
-     <property name="icon_size">4</property>
-  </object>
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="check_spelling_window">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">Check spelling</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
+    <property name="can_focus">False</property>
     <property name="resizable">False</property>
-    <property name="destroy_with_parent">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="startup_id">Check spelling</property>
     <child>
-      <object class="GtkVBox" id="content">
-        <property name="border_width">12</property>
+      <object class="GtkBox" id="content">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">12</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
-            <property name="homogeneous">False</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Misspelled word:</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="right_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="bottom_attach">1</property>
-                <property name="x_options">fill</property>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="misspelled_word_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">word</property>
-                <property name="use_underline">False</property>
                 <property name="use_markup">True</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
+                <property name="justify">center</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <attributes>
-                  <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                </attributes>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">0</property>
-                <property name="bottom_attach">1</property>
-                <property name="x_options">fill</property>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Change _to:</property>
                 <property name="use_underline">True</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="mnemonic_widget">word_entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="right_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">fill</property>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkEntry" id="word_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="editable">True</property>
-                    <property name="visibility">True</property>
-                    <property name="max_length">0</property>
-                    <property name="text" translatable="yes"/>
-                    <property name="has_frame">True</property>
-                    <property name="activates_default">False</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="check_word_button">
+                    <property name="label" translatable="yes">Check _Word</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="image">check_word_image</property>
-                    <property name="label" translatable="yes">Check _Word</property>
+                    <property name="receives_default">True</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">fill</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="table2">
+          <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="homogeneous">False</property>
+            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
-              <object class="GtkLabel" id="label4">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Suggestions:</property>
                 <property name="use_underline">True</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="mnemonic_widget">suggestions_list</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="right_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="bottom_attach">1</property>
-                <property name="x_options">fill</property>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTreeView" id="suggestions_list">
-                    <property name="width_request">200</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
-                    <property name="rules_hint">False</property>
-                    <property name="reorderable">False</property>
-                    <property name="enable_search">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                    </child>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="right_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
-                <property name="homogeneous">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">6</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkTable" id="table3">
+                  <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="homogeneous">True</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">12</property>
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkButton" id="ignore_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="image">ignore_image</property>
                         <property name="label" translatable="yes">_Ignore</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="bottom_attach">1</property>
-                        <property name="y_options">expand</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="change_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="image">change_image</property>
-                        <property name="label" translatable="yes">Cha_nge</property>
+                        <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options">expand</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="ignore_all_button">
+                        <property name="label" translatable="yes">Ignore _All</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="image">ignore_all_image</property>
-                        <property name="label" translatable="yes">Ignore _All</property>
+                        <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">0</property>
-                        <property name="bottom_attach">1</property>
-                        <property name="y_options">expand</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="change_button">
+                        <property name="label" translatable="yes">Cha_nge</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="change_all_button">
+                        <property name="label" translatable="yes">Change A_ll</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="image">change_all_image</property>
-                        <property name="label" translatable="yes">Change A_ll</property>
+                        <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options">expand</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox3">
+                  <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">11</property>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">User dictionary:</property>
-                        <property name="use_underline">False</property>
                         <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">7.45058e-09</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox2">
+                      <object class="GtkBox" id="box7">
                         <property name="visible">True</property>
-                        <property name="homogeneous">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
+                        <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkButton" id="add_word_button">
+                            <property name="label" translatable="yes">Add w_ord</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="image">add_word_image</property>
-                            <property name="label" translatable="yes">Add w_ord</property>
+                            <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
+                            <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">False</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox32">
+              <object class="GtkBox" id="box4">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="label44">
+                  <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Language:</property>
-                    <property name="use_underline">False</property>
-                    <property name="use_markup">False</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="language_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Language</property>
-                    <property name="use_underline">False</property>
                     <property name="use_markup">True</property>
-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap">False</property>
-                    <property name="selectable">False</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xpad">0</property>
-                    <property name="ypad">0</property>
-                    <attributes>
-                      <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                    </attributes>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="right_attach">1</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">fill</property>
-                <property name="y_options">fill</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkButtonBox" id="buttonbox1">
                 <property name="visible">True</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
-                <property name="spacing">0</property>
+                <property name="can_focus">False</property>
+                <property name="homogeneous">True</property>
+                <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="close_button">
+                    <property name="label" translatable="yes">_Close</property>
                     <property name="visible">True</property>
-                    <property name="can_default">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label">gtk-close</property>
-                    <property name="use_stock">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">end</property>
+                    <property name="use_underline">True</property>
+                    <style>
+                      <class name="text-button"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">fill</property>
-                <property name="y_options">fill</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
-            <property name="padding">0</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>

plugins/spell/spell.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Module=spell
 IAge=2
 _Name=Spell Checker

plugins/spell/xed-spell-language-dialog.c

@@ -3,7 +3,7 @@
  * xed-spell-language-dialog.c
  * This file is part of xed
  *
- * Copyright (C) 2002 Paolo Maggi 
+ * Copyright (C) 2002 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
@@ -17,14 +17,14 @@
  *
  * 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. 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
- 
+
 /*
- * Modified by the xed Team, 2002. See the AUTHORS file for a 
- * list of people on the xed Team.  
- * See the ChangeLog files for a list of changes. 
+ * Modified by the xed Team, 2002. See the AUTHORS file for a
+ * list of people on the xed Team.
+ * See the ChangeLog files for a list of changes.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -34,275 +34,251 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <xed/xed-utils.h>
-#include <xed/xed-help.h>
+#include <xed/xed-app.h>
 #include "xed-spell-language-dialog.h"
 #include "xed-spell-checker-language.h"
 
 
 enum
 {
-	COLUMN_LANGUAGE_NAME = 0,
-	COLUMN_LANGUAGE_POINTER,
-	ENCODING_NUM_COLS
+    COLUMN_LANGUAGE_NAME = 0,
+    COLUMN_LANGUAGE_POINTER,
+    ENCODING_NUM_COLS
 };
 
 
-struct _XedSpellLanguageDialog 
+struct _XedSpellLanguageDialog
 {
-	GtkDialog dialog;
+    GtkDialog dialog;
 
-	GtkWidget *languages_treeview;
-	GtkTreeModel *model;
+    GtkWidget *languages_treeview;
+    GtkTreeModel *model;
 };
 
-G_DEFINE_TYPE(XedSpellLanguageDialog, xed_spell_language_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (XedSpellLanguageDialog, xed_spell_language_dialog, GTK_TYPE_DIALOG)
 
 
-static void 
+static void
 xed_spell_language_dialog_class_init (XedSpellLanguageDialogClass *klass)
 {
-	/* GObjectClass *object_class = G_OBJECT_CLASS (klass); */
+    /* GObjectClass *object_class = G_OBJECT_CLASS (klass); */
 }
 
 static void
 dialog_response_handler (GtkDialog *dlg,
-			 gint       res_id)
+                         gint       res_id)
 {
-	if (res_id == GTK_RESPONSE_HELP)
-	{
-		xed_help_display (GTK_WINDOW (dlg),
-				    NULL,
-				    "xed-spell-checker-plugin");
+    if (res_id == GTK_RESPONSE_HELP)
+    {
+        xed_app_show_help (XED_APP (g_application_get_default ()), GTK_WINDOW (dlg), NULL, "xed-spell-checker-plugin");
 
-		g_signal_stop_emission_by_name (dlg, "response");
-	}
-}
-
-static void 
-scroll_to_selected (GtkTreeView *tree_view)
-{
-	GtkTreeModel *model;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-
-	model = gtk_tree_view_get_model (tree_view);
-	g_return_if_fail (model != NULL);
-
-	/* Scroll to selected */
-	selection = gtk_tree_view_get_selection (tree_view);
-	g_return_if_fail (selection != NULL);
-
-	if (gtk_tree_selection_get_selected (selection, NULL, &iter))
-	{
-		GtkTreePath* path;
-
-		path = gtk_tree_model_get_path (model, &iter);
-		g_return_if_fail (path != NULL);
-
-		gtk_tree_view_scroll_to_cell (tree_view,
-					      path, NULL, TRUE, 1.0, 0.0);
-		gtk_tree_path_free (path);
-	}
+        g_signal_stop_emission_by_name (dlg, "response");
+    }
 }
 
 static void
-language_row_activated (GtkTreeView *tree_view,
-			GtkTreePath *path,
-			GtkTreeViewColumn *column,
-			XedSpellLanguageDialog *dialog)
+scroll_to_selected (GtkTreeView *tree_view)
 {
-	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+    GtkTreeModel *model;
+    GtkTreeSelection *selection;
+    GtkTreeIter iter;
+
+    model = gtk_tree_view_get_model (tree_view);
+    g_return_if_fail (model != NULL);
+
+    /* Scroll to selected */
+    selection = gtk_tree_view_get_selection (tree_view);
+    g_return_if_fail (selection != NULL);
+
+    if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+    {
+        GtkTreePath* path;
+
+        path = gtk_tree_model_get_path (model, &iter);
+        g_return_if_fail (path != NULL);
+
+        gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 1.0, 0.0);
+        gtk_tree_path_free (path);
+    }
+}
+
+static void
+language_row_activated (GtkTreeView            *tree_view,
+                        GtkTreePath            *path,
+                        GtkTreeViewColumn      *column,
+                        XedSpellLanguageDialog *dialog)
+{
+    gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 }
 
 static void
 create_dialog (XedSpellLanguageDialog *dlg,
-	       const gchar *data_dir)
+               const gchar            *data_dir)
 {
-	GtkWidget *error_widget;
-	GtkWidget *content;
-	gboolean ret;
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	gchar *ui_file;
-	gchar *root_objects[] = {
-		"content",
-		NULL
-	};
-	
-	gtk_dialog_add_buttons (GTK_DIALOG (dlg),
-				GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK,
-				GTK_RESPONSE_OK,
-				GTK_STOCK_HELP,
-				GTK_RESPONSE_HELP,
-				NULL);
+    GtkWidget *error_widget;
+    GtkWidget *content;
+    gboolean ret;
+    GtkCellRenderer *cell;
+    GtkTreeViewColumn *column;
+    gchar *ui_file;
+    gchar *root_objects[] = {
+        "content",
+        NULL
+    };
 
-	gtk_window_set_title (GTK_WINDOW (dlg), _("Set language"));
-	gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
-	gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
+    gtk_dialog_add_buttons (GTK_DIALOG (dlg),
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"), GTK_RESPONSE_OK,
+                            _("_Help"), GTK_RESPONSE_HELP,
+                            NULL);
 
-	/* HIG defaults */
-	gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
-	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
-			     2); /* 2 * 5 + 2 = 12 */
-	gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dlg))),
-					5);
-	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dlg))),
-			     6);
+    gtk_window_set_title (GTK_WINDOW (dlg), _("Set language"));
+    gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
+    gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
 
-	g_signal_connect (dlg,
-			  "response",
-			  G_CALLBACK (dialog_response_handler),
-			  NULL);
+    /* HIG defaults */
+    gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
+    gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 2);
+    gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 5);
+    gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 6);
 
-	ui_file = g_build_filename (data_dir, "languages-dialog.ui", NULL);
-	ret = xed_utils_get_ui_objects (ui_file,
-					  root_objects,	
-					  &error_widget,
-					  "content", &content,
-					  "languages_treeview", &dlg->languages_treeview,
-					  NULL);
-	g_free (ui_file);
-	
-	if (!ret)
-	{
-		gtk_widget_show (error_widget);
+    g_signal_connect (dlg, "response",
+                      G_CALLBACK (dialog_response_handler), NULL);
 
-		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
-		                    error_widget,
-		                    TRUE, TRUE, 0);
+    ui_file = g_build_filename (data_dir, "languages-dialog.ui", NULL);
+    ret = xed_utils_get_ui_objects (ui_file,
+                                    root_objects,
+                                    &error_widget,
+                                    "content", &content,
+                                    "languages_treeview", &dlg->languages_treeview,
+                                    NULL);
+    g_free (ui_file);
 
-		return;
-	}
+    if (!ret)
+    {
+        gtk_widget_show (error_widget);
 
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
-			    content, TRUE, TRUE, 0);
-	g_object_unref (content);
-	gtk_container_set_border_width (GTK_CONTAINER (content), 5);
+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), error_widget, TRUE, TRUE, 0);
 
-	dlg->model = GTK_TREE_MODEL (gtk_list_store_new (ENCODING_NUM_COLS,
-							 G_TYPE_STRING,
-							 G_TYPE_POINTER));
+        return;
+    }
 
-	gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->languages_treeview),
-				 dlg->model);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), content, TRUE, TRUE, 0);
+    g_object_unref (content);
+    gtk_container_set_border_width (GTK_CONTAINER (content), 5);
 
-	g_object_unref (dlg->model);
+    dlg->model = GTK_TREE_MODEL (gtk_list_store_new (ENCODING_NUM_COLS, G_TYPE_STRING, G_TYPE_POINTER));
 
-	/* Add the encoding column */
-	cell = gtk_cell_renderer_text_new ();
-	column = gtk_tree_view_column_new_with_attributes (_("Languages"),
-							   cell, 
-							   "text",
-							   COLUMN_LANGUAGE_NAME,
-							   NULL);
-	
-	gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->languages_treeview),
-				     column);
+    gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->languages_treeview), dlg->model);
 
-	gtk_tree_view_set_search_column (GTK_TREE_VIEW (dlg->languages_treeview),
-					 COLUMN_LANGUAGE_NAME);
+    g_object_unref (dlg->model);
 
-	g_signal_connect (dlg->languages_treeview,
-			  "realize",
-			  G_CALLBACK (scroll_to_selected),
-			  dlg);
-	g_signal_connect (dlg->languages_treeview,
-			  "row-activated", 
-			  G_CALLBACK (language_row_activated),
-			  dlg);
+    /* Add the encoding column */
+    cell = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new_with_attributes (_("Languages"),
+                                                       cell,
+                                                       "text",
+                                                       COLUMN_LANGUAGE_NAME,
+                                                       NULL);
+
+    gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->languages_treeview), column);
+
+    gtk_tree_view_set_search_column (GTK_TREE_VIEW (dlg->languages_treeview), COLUMN_LANGUAGE_NAME);
+
+    g_signal_connect (dlg->languages_treeview, "realize",
+                      G_CALLBACK (scroll_to_selected), dlg);
+    g_signal_connect (dlg->languages_treeview, "row-activated",
+                      G_CALLBACK (language_row_activated), dlg);
 }
 
 static void
 xed_spell_language_dialog_init (XedSpellLanguageDialog *dlg)
 {
-	
+
 }
 
 static void
 populate_language_list (XedSpellLanguageDialog        *dlg,
-			const XedSpellCheckerLanguage *cur_lang)
+                        const XedSpellCheckerLanguage *cur_lang)
 {
-	GtkListStore *store;
-	GtkTreeIter iter;
+    GtkListStore *store;
+    GtkTreeIter iter;
 
-	const GSList* langs;
+    const GSList* langs;
 
-	/* create list store */
-	store = GTK_LIST_STORE (dlg->model);
+    /* create list store */
+    store = GTK_LIST_STORE (dlg->model);
 
-	langs = xed_spell_checker_get_available_languages ();
+    langs = xed_spell_checker_get_available_languages ();
 
-	while (langs)
-	{
-		const gchar *name;
+    while (langs)
+    {
+        const gchar *name;
 
-		name = xed_spell_checker_language_to_string ((const XedSpellCheckerLanguage*)langs->data);
+        name = xed_spell_checker_language_to_string ((const XedSpellCheckerLanguage*)langs->data);
 
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
-				    COLUMN_LANGUAGE_NAME, name,
-				    COLUMN_LANGUAGE_POINTER, langs->data,
-				    -1);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            COLUMN_LANGUAGE_NAME, name,
+                            COLUMN_LANGUAGE_POINTER, langs->data,
+                            -1);
 
-		if (langs->data == cur_lang)
-		{
-			GtkTreeSelection *selection;
+        if (langs->data == cur_lang)
+        {
+            GtkTreeSelection *selection;
 
-			selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->languages_treeview));
-			g_return_if_fail (selection != NULL);
+            selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->languages_treeview));
+            g_return_if_fail (selection != NULL);
 
-			gtk_tree_selection_select_iter (selection, &iter);
-		}
+            gtk_tree_selection_select_iter (selection, &iter);
+        }
 
-		langs = g_slist_next (langs);
-	}
+        langs = g_slist_next (langs);
+    }
 }
 
 GtkWidget *
-xed_spell_language_dialog_new (GtkWindow                       *parent,
-				 const XedSpellCheckerLanguage *cur_lang,
-				 const gchar *data_dir)
+xed_spell_language_dialog_new (GtkWindow                     *parent,
+                               const XedSpellCheckerLanguage *cur_lang,
+                               const gchar                   *data_dir)
 {
-	XedSpellLanguageDialog *dlg;
+    XedSpellLanguageDialog *dlg;
 
-	g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+    g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
 
-	dlg = g_object_new (XED_TYPE_SPELL_LANGUAGE_DIALOG, NULL);
+    dlg = g_object_new (XED_TYPE_SPELL_LANGUAGE_DIALOG, NULL);
 
-	create_dialog (dlg, data_dir);
+    create_dialog (dlg, data_dir);
 
-	populate_language_list (dlg, cur_lang);
+    populate_language_list (dlg, cur_lang);
 
-	gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
-	gtk_widget_grab_focus (dlg->languages_treeview);					     
+    gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
+    gtk_widget_grab_focus (dlg->languages_treeview);
 
-	return GTK_WIDGET (dlg);
+    return GTK_WIDGET (dlg);
 }
 
 const XedSpellCheckerLanguage *
 xed_spell_language_get_selected_language (XedSpellLanguageDialog *dlg)
 {
-	GValue value = {0, };
-	const XedSpellCheckerLanguage* lang;
+    GValue value = {0, };
+    const XedSpellCheckerLanguage* lang;
 
-	GtkTreeIter iter;
-	GtkTreeSelection *selection;
+    GtkTreeIter iter;
+    GtkTreeSelection *selection;
 
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->languages_treeview));
-	g_return_val_if_fail (selection != NULL, NULL);
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->languages_treeview));
+    g_return_val_if_fail (selection != NULL, NULL);
 
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
-		return NULL;
+    if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
+    {
+        return NULL;
+    }
 
-	gtk_tree_model_get_value (dlg->model,
-				  &iter,
-				  COLUMN_LANGUAGE_POINTER,
-				  &value);
+    gtk_tree_model_get_value (dlg->model, &iter, COLUMN_LANGUAGE_POINTER, &value);
 
-	lang = (const XedSpellCheckerLanguage* ) g_value_get_pointer (&value);
+    lang = (const XedSpellCheckerLanguage* ) g_value_get_pointer (&value);
 
-	return lang;
+    return lang;
 }
 

plugins/spell/xed-spell-language-dialog.h

@@ -3,7 +3,7 @@
  * xed-spell-language-dialog.h
  * This file is part of xed
  *
- * Copyright (C) 2002 Paolo Maggi 
+ * Copyright (C) 2002 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
@@ -17,14 +17,14 @@
  *
  * 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. 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
- 
+
 /*
- * Modified by the xed Team, 2002. See the AUTHORS file for a 
- * list of people on the xed Team.  
- * See the ChangeLog files for a list of changes. 
+ * Modified by the xed Team, 2002. See the AUTHORS file for a
+ * list of people on the xed Team.
+ * See the ChangeLog files for a list of changes.
  */
 
 #ifndef __XED_SPELL_LANGUAGE_DIALOG_H__
@@ -44,22 +44,20 @@ G_BEGIN_DECLS
 
 
 typedef struct _XedSpellLanguageDialog XedSpellLanguageDialog;
-
 typedef struct _XedSpellLanguageDialogClass XedSpellLanguageDialogClass;
 
-struct _XedSpellLanguageDialogClass 
+struct _XedSpellLanguageDialogClass
 {
-	GtkDialogClass parent_class;
+    GtkDialogClass parent_class;
 };
 
-GType		 xed_spell_language_dialog_get_type		(void) G_GNUC_CONST;
+GType xed_spell_language_dialog_get_type (void) G_GNUC_CONST;
 
-GtkWidget	*xed_spell_language_dialog_new		(GtkWindow			 *parent,
-								 const XedSpellCheckerLanguage *cur_lang,
-								 const gchar *data_dir);
+GtkWidget *xed_spell_language_dialog_new (GtkWindow                     *parent,
+                                          const XedSpellCheckerLanguage *cur_lang,
+                                          const gchar                   *data_dir);
 
-const XedSpellCheckerLanguage *
-		 xed_spell_language_get_selected_language	(XedSpellLanguageDialog *dlg);
+const XedSpellCheckerLanguage *xed_spell_language_get_selected_language (XedSpellLanguageDialog *dlg);
 
 G_END_DECLS
 

plugins/spell/xed-spell-plugin.h

@@ -1,7 +1,7 @@
 /*
  * xed-spell-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,52 +25,37 @@
 
 #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_SPELL_PLUGIN		(xed_spell_plugin_get_type ())
-#define XED_SPELL_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_SPELL_PLUGIN, XedSpellPlugin))
-#define XED_SPELL_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_SPELL_PLUGIN, XedSpellPluginClass))
-#define XED_IS_SPELL_PLUGIN(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_SPELL_PLUGIN))
-#define XED_IS_SPELL_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_SPELL_PLUGIN))
-#define XED_SPELL_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_SPELL_PLUGIN, XedSpellPluginClass))
+#define XED_TYPE_SPELL_PLUGIN           (xed_spell_plugin_get_type ())
+#define XED_SPELL_PLUGIN(o)             (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_SPELL_PLUGIN, XedSpellPlugin))
+#define XED_SPELL_PLUGIN_CLASS(k)       (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_SPELL_PLUGIN, XedSpellPluginClass))
+#define XED_IS_SPELL_PLUGIN(o)          (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_SPELL_PLUGIN))
+#define XED_IS_SPELL_PLUGIN_CLASS(k)    (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_SPELL_PLUGIN))
+#define XED_SPELL_PLUGIN_GET_CLASS(o)   (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_SPELL_PLUGIN, XedSpellPluginClass))
 
-/* Private structure type */
-typedef struct _XedSpellPluginPrivate	XedSpellPluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _XedSpellPlugin	XedSpellPlugin;
+typedef struct _XedSpellPlugin          XedSpellPlugin;
+typedef struct _XedSpellPluginPrivate   XedSpellPluginPrivate;
+typedef struct _XedSpellPluginClass     XedSpellPluginClass;
 
 struct _XedSpellPlugin
 {
-	XedPlugin parent_instance;
+    PeasExtensionBase parent_instance;
 
-	XedSpellPluginPrivate *priv;
+    XedSpellPluginPrivate *priv;
 };
 
-/*
- * Class definition
- */
-typedef struct _XedSpellPluginClass	XedSpellPluginClass;
-
 struct _XedSpellPluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
-/*
- * Public methods
- */
-GType	xed_spell_plugin_get_type		(void) G_GNUC_CONST;
+GType xed_spell_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/spell/xed-spell-setup-dialog.ui

@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--*- mode: xml -*-->
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <object class="GtkDialog" id="spell_dialog">
+  <requires lib="gtk+" version="3.12"/>
+  <object class="GtkDialog" id="dialog1">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">_Configure Spell Checker plugin...</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">8</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="button3">
+                <property name="label" translatable="yes">button</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -32,13 +28,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button3">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">button</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -47,13 +41,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button4">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">button</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -64,42 +56,208 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="spell_dialog_content">
+          <object class="GtkBox" id="spell_dialog_content">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_bottom">12</property>
+            <property name="border_width">8</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Autocheck spelling on document load...</property>
+                <property name="label" translatable="yes">Autocheck settings</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="autocheck_never">
-                <property name="label" translatable="yes">_Never autocheck</property>
+              <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">30</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkRadioButton" id="autocheck_never">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="height">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Never</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Never autocheck spelling on document load</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkRadioButton" id="autocheck_document">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">autocheck_never</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="height">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Remember by document</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Remembers the setting for each  document on load</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkRadioButton" id="autocheck_always">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">autocheck_never</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="height">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Always</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Always autocheck on document load</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -107,42 +265,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkRadioButton" id="autocheck_document">
-                <property name="label" translatable="yes">_Remember autocheck by document</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">autocheck_never</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="autocheck_always">
-                <property name="label" translatable="yes">_Always autocheck</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">autocheck_never</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -152,10 +274,5 @@
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="0">button1</action-widget>
-      <action-widget response="0">button3</action-widget>
-      <action-widget response="0">button4</action-widget>
-    </action-widgets>
   </object>
 </interface>

plugins/spell/xed-spell-utils.c

@@ -16,14 +16,14 @@
  *
  * 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, 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
 #include <string.h>
 
 #include "xed-spell-utils.h"
-#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksource.h>
 
 gboolean
 xed_spell_utils_is_digit (const char *text, gssize length)

plugins/taglist/Makefile.am

@@ -15,7 +15,7 @@ AM_CPPFLAGS = 							\
 	-I$(top_srcdir) 					\
 	$(XED_CFLAGS) 					\
 	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED_CFLAGS)	
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 plugin_LTLIBRARIES = libtaglist.la
 
@@ -30,9 +30,9 @@ libtaglist_la_SOURCES = \
 libtaglist_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtaglist_la_LIBADD  = $(XED_LIBS)
 
-plugin_in_files = taglist.xed-plugin.desktop.in
+plugin_in_files = taglist.plugin.desktop.in
 
-%.xed-plugin: %.xed-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 GZIP_ENV = -9
@@ -41,7 +41,7 @@ GZIP_ENV = -9
 	LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache
 	GZIP=$(GZIP_ENV) gzip -n -f $(@:.gz=)
 
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = \
 	$(taglist_in_files) $(taglist_DATA)	\

plugins/taglist/taglist.plugin.desktop.in

@@ -1,4 +1,4 @@
-[Xed Plugin]
+[Plugin]
 Module=taglist
 IAge=2
 _Name=Tag list

plugins/taglist/xed-taglist-plugin-panel.c

@@ -39,7 +39,6 @@
 
 #include <xed/xed-utils.h>
 #include <xed/xed-debug.h>
-#include <xed/xed-plugin.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -65,11 +64,11 @@ struct _XedTaglistPluginPanelPrivate
 	GtkWidget *preview;
 
 	TagGroup *selected_tag_group;
-	
+
 	gchar *data_dir;
 };
 
-XED_PLUGIN_DEFINE_TYPE (XedTaglistPluginPanel, xed_taglist_plugin_panel, GTK_TYPE_BOX)
+G_DEFINE_DYNAMIC_TYPE (XedTaglistPluginPanel, xed_taglist_plugin_panel, GTK_TYPE_BOX)
 
 enum
 {
@@ -133,7 +132,7 @@ static void
 xed_taglist_plugin_panel_finalize (GObject *object)
 {
 	XedTaglistPluginPanel *panel = XED_TAGLIST_PLUGIN_PANEL (object);
-	
+
 	g_free (panel->priv->data_dir);
 
 	G_OBJECT_CLASS (xed_taglist_plugin_panel_parent_class)->finalize (object);
@@ -160,6 +159,12 @@ xed_taglist_plugin_panel_class_init (XedTaglistPluginPanelClass *klass)
 	g_type_class_add_private (object_class, sizeof(XedTaglistPluginPanelPrivate));
 }
 
+static void
+xed_taglist_plugin_panel_class_finalize (XedTaglistPluginPanelClass *klass)
+{
+    /* dummy function - used by G_DEFINE_DYNAMIC_TYPE */
+}
+
 static void
 insert_tag (XedTaglistPluginPanel *panel,
 	    Tag                     *tag,
@@ -431,7 +436,7 @@ selected_group_changed (GtkComboBox             *combo,
 
 		populate_tags_list (panel);
 	}
-	
+
 	/* Clean up preview */
 	gtk_label_set_text (GTK_LABEL (panel->priv->preview),
 			    "");
@@ -634,8 +639,8 @@ add_preview_widget (XedTaglistPluginPanel *panel)
 
 	gtk_widget_set_halign (panel->priv->preview, GTK_ALIGN_START);
 	gtk_widget_set_valign (panel->priv->preview, GTK_ALIGN_START);
-	gtk_widget_set_margin_left (panel->priv->preview, 6);
-	gtk_widget_set_margin_right (panel->priv->preview, 6);
+	gtk_widget_set_margin_start (panel->priv->preview, 6);
+	gtk_widget_set_margin_end (panel->priv->preview, 6);
 	gtk_widget_set_margin_top (panel->priv->preview, 6);
 	gtk_widget_set_margin_bottom (panel->priv->preview, 6);
 
@@ -781,8 +786,14 @@ xed_taglist_plugin_panel_new (XedWindow *window,
 	panel = g_object_new (XED_TYPE_TAGLIST_PLUGIN_PANEL,
 			      "window", window,
 			      NULL);
-	
+
 	panel->priv->data_dir = g_strdup (data_dir);
-	
+
 	return GTK_WIDGET (panel);
 }
+
+void
+_xed_taglist_plugin_panel_register_type (GTypeModule *type_module)
+{
+    xed_taglist_plugin_panel_register_type (type_module);
+}

plugins/taglist/xed-taglist-plugin-panel.h

@@ -2,7 +2,7 @@
  * xed-taglist-plugin-panel.h
  * This file is part of xed
  *
- * Copyright (C) 2005 - Paolo Maggi 
+ * Copyright (C) 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
@@ -16,14 +16,14 @@
  *
  * 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, 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
- 
+
 /*
- * Modified by the xed Team, 2005. See the AUTHORS file for a 
- * list of people on the xed Team.  
- * See the ChangeLog files for a list of changes. 
+ * Modified by the xed Team, 2005. See the AUTHORS file for a
+ * list of people on the xed Team.
+ * See the ChangeLog files for a list of changes.
  *
  * $Id$
  */
@@ -56,12 +56,12 @@ typedef struct _XedTaglistPluginPanelPrivate XedTaglistPluginPanelPrivate;
  */
 typedef struct _XedTaglistPluginPanel XedTaglistPluginPanel;
 
-struct _XedTaglistPluginPanel 
+struct _XedTaglistPluginPanel
 {
-	GtkBox vbox;
+    GtkBox vbox;
 
-	/*< private > */
-	XedTaglistPluginPanelPrivate *priv;
+    /*< private > */
+    XedTaglistPluginPanelPrivate *priv;
 };
 
 /*
@@ -69,20 +69,20 @@ struct _XedTaglistPluginPanel
  */
 typedef struct _XedTaglistPluginPanelClass XedTaglistPluginPanelClass;
 
-struct _XedTaglistPluginPanelClass 
+struct _XedTaglistPluginPanelClass
 {
-	GtkBoxClass parent_class;
+    GtkBoxClass parent_class;
 };
 
 /*
  * Public methods
  */
-GType		 xed_taglist_plugin_panel_register_type	(GTypeModule *module);
-							
-GType 		 xed_taglist_plugin_panel_get_type		(void) G_GNUC_CONST;
+void         _xed_taglist_plugin_panel_register_type    (GTypeModule *module);
 
-GtkWidget	*xed_taglist_plugin_panel_new 		(XedWindow *window,
-								 const gchar *data_dir);
+GType        xed_taglist_plugin_panel_get_type      (void) G_GNUC_CONST;
+
+GtkWidget   *xed_taglist_plugin_panel_new       (XedWindow *window,
+                                 const gchar *data_dir);
 
 G_END_DECLS
 

plugins/taglist/xed-taglist-plugin-parser.c

@@ -44,7 +44,6 @@
 #include "xed-taglist-plugin-parser.h"
 
 /* we screwed up so we still look here for compatibility */
-#define USER_XED_TAGLIST_PLUGIN_LOCATION_LEGACY ".xed/plugins/taglist/"
 #define USER_XED_TAGLIST_PLUGIN_LOCATION "xed/taglist/"
 
 TagList* taglist = NULL;
@@ -603,32 +602,11 @@ TagList* create_taglist(const gchar* data_dir)
 	}
 
 	const gchar* home;
-	const gchar* envvar;
 
 	/* load user's taglists */
 
-	/* legacy dir */
 	home = g_get_home_dir ();
 	if (home != NULL)
-	{
-		pdir = g_build_filename (home,
-					 USER_XED_TAGLIST_PLUGIN_LOCATION_LEGACY,
-					 NULL);
-		parse_taglist_dir (pdir);
-		g_free (pdir);
-	}
-
-	/* Support old libmate env var */
-	envvar = g_getenv ("MATE22_USER_DIR");
-	if (envvar != NULL)
-	{
-		pdir = g_build_filename (envvar,
-					 USER_XED_TAGLIST_PLUGIN_LOCATION,
-					 NULL);
-		parse_taglist_dir (pdir);
-		g_free (pdir);
-	}
-	else if (home != NULL)
 	{
 		pdir = g_build_filename(home, ".config", USER_XED_TAGLIST_PLUGIN_LOCATION, NULL);
 		parse_taglist_dir(pdir);

plugins/taglist/xed-taglist-plugin.c

@@ -1,6 +1,6 @@
 /*
  * xed-taglist-plugin.h
- * 
+ *
  * Copyright (C) 2002-2005 - Paolo Maggi
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,9 +20,9 @@
  */
 
 /*
- * Modified by the xed Team, 2002-2005. See the AUTHORS file for a 
- * list of people on the xed Team.  
- * See the ChangeLog files for a list of changes. 
+ * Modified by the xed Team, 2002-2005. See the AUTHORS file for a
+ * list of people on the xed Team.
+ * See the ChangeLog files for a list of changes.
  *
  * $Id$
  */
@@ -36,125 +36,190 @@
 #include "xed-taglist-plugin-parser.h"
 
 #include <glib/gi18n-lib.h>
-#include <gmodule.h>
 
-#include <xed/xed-plugin.h>
+#include <xed/xed-window.h>
+#include <xed/xed-window-activatable.h>
 #include <xed/xed-debug.h>
 
-#define WINDOW_DATA_KEY "XedTaglistPluginWindowData"
-
 #define XED_TAGLIST_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginPrivate))
 
 struct _XedTaglistPluginPrivate
 {
-	gpointer dummy;
+    XedWindow *window;
+
+    GtkWidget *taglist_panel;
 };
 
-XED_PLUGIN_REGISTER_TYPE_WITH_CODE (XedTaglistPlugin, xed_taglist_plugin,
-	xed_taglist_plugin_panel_register_type (module);
+static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
+
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTaglistPlugin,
+                                xed_taglist_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init) \
+                                                                                                  \
+                                _xed_taglist_plugin_panel_register_type (type_module);            \
 )
 
+enum
+{
+    PROP_0,
+    PROP_WINDOW
+};
+
 static void
 xed_taglist_plugin_init (XedTaglistPlugin *plugin)
 {
-	plugin->priv = XED_TAGLIST_PLUGIN_GET_PRIVATE (plugin);
+    plugin->priv = XED_TAGLIST_PLUGIN_GET_PRIVATE (plugin);
 
-	xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin initializing");
+    xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin initializing");
+}
+
+static void
+xed_taglist_plugin_dispose (GObject *object)
+{
+    XedTaglistPlugin *plugin = XED_TAGLIST_PLUGIN (object);
+
+    xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin disposing");
+
+    g_clear_object (&plugin->priv->window);
+
+    G_OBJECT_CLASS (xed_taglist_plugin_parent_class)->dispose (object);
 }
 
 static void
 xed_taglist_plugin_finalize (GObject *object)
 {
-/*
-	XedTaglistPlugin *plugin = XED_TAGLIST_PLUGIN (object);
-*/
-	xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin finalizing");
 
-	free_taglist ();
-	
-	G_OBJECT_CLASS (xed_taglist_plugin_parent_class)->finalize (object);
+    free_taglist ();
+
+    G_OBJECT_CLASS (xed_taglist_plugin_parent_class)->finalize (object);
 }
 
 static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
+xed_taglist_plugin_activate (XedWindowActivatable *activatable)
 {
-	XedPanel *side_panel;
-	GtkWidget *taglist_panel;
-	gchar *data_dir;
-	
-	xed_debug (DEBUG_PLUGINS);
-	
-	g_return_if_fail (g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY) == NULL);
-	
-	side_panel = xed_window_get_side_panel (window);
-	
-	data_dir = xed_plugin_get_data_dir (plugin);
-	taglist_panel = xed_taglist_plugin_panel_new (window, data_dir);
-	g_free (data_dir);
-	
-	xed_panel_add_item_with_stock_icon (side_panel, 
-					      taglist_panel, 
-					      _("Tags"), 
-					      GTK_STOCK_ADD);
+    XedTaglistPluginPrivate *priv;
+    XedPanel *side_panel;
+    gchar *data_dir;
 
-	g_object_set_data (G_OBJECT (window), 
-			   WINDOW_DATA_KEY,
-			   taglist_panel);
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_TAGLIST_PLUGIN (activatable)->priv;
+    side_panel = xed_window_get_side_panel (priv->window);
+
+    data_dir = peas_extension_base_get_data_dir (PEAS_EXTENSION_BASE (activatable));
+    priv->taglist_panel = xed_taglist_plugin_panel_new (priv->window, data_dir);
+    g_free (data_dir);
+
+    xed_panel_add_item (side_panel, priv->taglist_panel, _("Tags"), "list-add");
 }
 
 static void
-impl_deactivate	(XedPlugin *plugin,
-		 XedWindow *window)
+xed_taglist_plugin_deactivate (XedWindowActivatable *activatable)
 {
-	XedPanel *side_panel;
-	gpointer data;
-	
-	xed_debug (DEBUG_PLUGINS);
-	
-	data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-	
-	side_panel = xed_window_get_side_panel (window);
+    XedTaglistPluginPrivate *priv;
+    XedPanel *side_panel;
 
-	xed_panel_remove_item (side_panel, 
-			      	 GTK_WIDGET (data));
-			      
-	g_object_set_data (G_OBJECT (window), 
-			   WINDOW_DATA_KEY,
-			   NULL);
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_TAGLIST_PLUGIN (activatable)->priv;
+    side_panel = xed_window_get_side_panel (priv->window);
+
+    xed_panel_remove_item (side_panel, priv->taglist_panel);
 }
 
 static void
-impl_update_ui	(XedPlugin *plugin,
-		 XedWindow *window)
+xed_taglist_plugin_update_state (XedWindowActivatable *activatable)
 {
-	gpointer data;
-	XedView *view;
-	
-	xed_debug (DEBUG_PLUGINS);
-	
-	data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-	
-	view = xed_window_get_active_view (window);
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (data),
-				  (view != NULL) &&
-				  gtk_text_view_get_editable (GTK_TEXT_VIEW (view)));
+    XedTaglistPluginPrivate *priv;
+    XedView *view;
+
+    xed_debug (DEBUG_PLUGINS);
+
+    priv = XED_TAGLIST_PLUGIN (activatable)->priv;
+    view = xed_window_get_active_view (priv->window);
+
+    gtk_widget_set_sensitive (priv->taglist_panel,
+                              (view != NULL) &&
+                              gtk_text_view_get_editable (GTK_TEXT_VIEW (view)));
+}
+
+static void
+xed_taglist_plugin_set_property (GObject      *object,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+    XedTaglistPlugin *plugin = XED_TAGLIST_PLUGIN (object);
+
+    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
+xed_taglist_plugin_get_property (GObject    *object,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+    XedTaglistPlugin *plugin = XED_TAGLIST_PLUGIN (object);
+
+    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
 xed_taglist_plugin_class_init (XedTaglistPluginClass *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_taglist_plugin_finalize;
+    object_class->finalize = xed_taglist_plugin_finalize;
+    object_class->dispose = xed_taglist_plugin_dispose;
+    object_class->set_property = xed_taglist_plugin_set_property;
+    object_class->get_property = xed_taglist_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");
 
-	g_type_class_add_private (object_class, sizeof (XedTaglistPluginPrivate));
+    g_type_class_add_private (object_class, sizeof (XedTaglistPluginPrivate));
+}
+
+static void
+xed_taglist_plugin_class_finalize (XedTaglistPluginClass *klass)
+{
+    /* dummy function - used by G_DEFINE_DYNAMIC_TYPE_EXTENDED */
+}
+
+static void
+xed_window_activatable_iface_init (XedWindowActivatableInterface *iface)
+{
+    iface->activate = xed_taglist_plugin_activate;
+    iface->deactivate = xed_taglist_plugin_deactivate;
+    iface->update_state = xed_taglist_plugin_update_state;
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+    xed_taglist_plugin_register_type (G_TYPE_MODULE (module));
+
+    peas_object_module_register_extension_type (module,
+                                                XED_TYPE_WINDOW_ACTIVATABLE,
+                                                XED_TYPE_TAGLIST_PLUGIN);
 }

plugins/taglist/xed-taglist-plugin.h

@@ -1,6 +1,6 @@
 /*
  * xed-taglist-plugin.h
- * 
+ *
  * Copyright (C) 2002-2005 - Paolo Maggi
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,65 +20,51 @@
  */
 
 /*
- * Modified by the xed Team, 2002-2005. See the AUTHORS file for a 
- * list of people on the xed Team.  
- * See the ChangeLog files for a list of changes. 
- *
- * $Id$
+ * Modified by the xed Team, 2002-2005. See the AUTHORS file for a
+ * list of people on the xed Team.
+ * See the ChangeLog files for a list of changes.
  */
- 
+
 #ifndef __XED_TAGLIST_PLUGIN_H__
 #define __XED_TAGLIST_PLUGIN_H__
 
 #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_TAGLIST_PLUGIN		(xed_taglist_plugin_get_type ())
-#define XED_TAGLIST_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPlugin))
-#define XED_TAGLIST_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginClass))
-#define XED_IS_TAGLIST_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_TAGLIST_PLUGIN))
-#define XED_IS_TAGLIST_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_TAGLIST_PLUGIN))
-#define XED_TAGLIST_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginClass))
+#define XED_TYPE_TAGLIST_PLUGIN         (xed_taglist_plugin_get_type ())
+#define XED_TAGLIST_PLUGIN(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPlugin))
+#define XED_TAGLIST_PLUGIN_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginClass))
+#define XED_IS_TAGLIST_PLUGIN(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_TAGLIST_PLUGIN))
+#define XED_IS_TAGLIST_PLUGIN_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_TAGLIST_PLUGIN))
+#define XED_TAGLIST_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginClass))
 
-/* Private structure type */
-typedef struct _XedTaglistPluginPrivate	XedTaglistPluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _XedTaglistPlugin		XedTaglistPlugin;
+typedef struct _XedTaglistPlugin        XedTaglistPlugin;
+typedef struct _XedTaglistPluginPrivate XedTaglistPluginPrivate;
+typedef struct _XedTaglistPluginClass   XedTaglistPluginClass;
 
 struct _XedTaglistPlugin
 {
-	XedPlugin parent_instance;
+    PeasExtensionBase parent_instance;
 
-	/*< private >*/
-	XedTaglistPluginPrivate *priv;
+    /*< private >*/
+    XedTaglistPluginPrivate *priv;
 };
 
-/*
- * Class definition
- */
-typedef struct _XedTaglistPluginClass	XedTaglistPluginClass;
-
 struct _XedTaglistPluginClass
 {
-	XedPluginClass parent_class;
+    PeasExtensionBaseClass parent_class;
 };
 
-/*
- * Public methods
- */
-GType	xed_taglist_plugin_get_type		(void) G_GNUC_CONST;
+GType xed_taglist_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/textsize/Makefile.am

@@ -0,0 +1,16 @@
+# Textsize Plugin
+SUBDIRS = textsize
+plugindir = $(XED_PLUGINS_LIBS_DIR)
+
+plugin_in_files = textsize.plugin.desktop.in
+%.plugin: %.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:.plugin.desktop.in=.plugin)
+
+EXTRA_DIST =            \
+    $(plugin_in_files)
+
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
+
+-include $(top_srcdir)/git.mk

plugins/textsize/textsize.plugin.desktop.in

@@ -0,0 +1,11 @@
+[Plugin]
+Loader=python3
+Module=textsize
+IAge=3
+_Name=Text Size
+_Description=Allow controlling the zoom levels of the text
+Icon=gnome-mime-text-x-python
+Authors=Steve Frécinaux <steve@istique.net>;Linux Mint team
+Copyright=Copyright © 2017 by the authors
+Website=https://github.com/linuxmint
+Builtin=true

plugins/textsize/textsize/Makefile.am

@@ -0,0 +1,11 @@
+plugindir = $(XED_PLUGINS_LIBS_DIR)/textsize
+
+plugin_PYTHON =         \
+    __init__.py         \
+    signals.py          \
+    documenthelper.py
+
+CLEANFILES =
+DISTCLEANFILES =
+
+-include $(top_srcdir)/git.mk

plugins/textsize/textsize/__init__.py

@@ -0,0 +1,233 @@
+# -*- coding: utf-8 -*-
+#
+#  __init__.py - Text size plugin
+#
+#  Copyright (C) 2008 - Konstantin Mikhaylov <jtraub.devel@gmail.com>
+#  Copyright (C) 2009 - Wouter Bolsterlee <wbolster@gnome.org>
+#  Copyright (C) 2010 - Ignacio Casal Quinteiro <icq@gnome.org>
+#  Copyright (C) 2010 - Jesse van den Kieboom <jessevdk@gnome.org>
+#  Copyright (C) 2017 - Linux Mint team <https://github.com/linuxmint>
+#
+#  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.
+
+from gi.repository import GObject, Gio, Gtk, Gdk, Xed
+from .documenthelper import DocumentHelper
+
+MENU_PATH = "/MenuBar/ViewMenu/ViewOps_1"
+
+class TextSizePlugin(GObject.Object, Xed.WindowActivatable):
+    __gtype_name__ = "TextSizePlugin"
+
+    window = GObject.property(type=Xed.Window)
+
+    def __init__(self):
+        GObject.Object.__init__(self)
+
+    def do_activate(self):
+        self._views  = {}
+
+        # Insert menu items
+        self._insert_menu()
+
+        # Insert document helpers
+        for view in self.window.get_views():
+            self.add_document_helper(view)
+
+        self.window.connect('tab-added', self.on_tab_added)
+        self.window.connect('tab-removed', self.on_tab_removed)
+
+        self._accel_group = Gtk.AccelGroup()
+        self.window.add_accel_group(self._accel_group)
+
+        self._proxy_callback_map = {
+            'LargerTextAction': self.on_larger_text_accel,
+            'SmallerTextAction': self.on_smaller_text_accel,
+            'NormalSizeAction': self.on_normal_size_accel
+        }
+
+        self._proxy_mapping = {}
+        self._init_proxy_accels()
+        self._accel_map_handler_id = Gtk.AccelMap.get().connect('changed', self.on_accel_map_changed)
+
+    def _install_proxy(self, action):
+        if not isinstance(action, Gtk.Action):
+            action = self._action_group.get_action(str(action))
+
+        if not action:
+            return
+
+        entry = Gtk.AccelMap.lookup_entry(action.get_accel_path())
+
+        if not entry:
+            return
+
+        mapping = {
+            Gdk.KEY_equal: Gdk.KEY_KP_Equal,
+            Gdk.KEY_KP_Equal: Gdk.KEY_equal,
+            Gdk.KEY_minus: Gdk.KEY_KP_Subtract,
+            Gdk.KEY_KP_Subtract: Gdk.KEY_minus,
+            Gdk.KEY_0: Gdk.KEY_KP_0,
+            Gdk.KEY_KP_0: Gdk.KEY_0
+        }
+
+        if entry[0] in mapping:
+            key = mapping[entry[0]]
+            mod = entry[1]
+
+            callback = self._proxy_callback_map[action.get_name()]
+
+            self._accel_group.connect_group(key, mod, Gtk.ACCEL_LOCKED, callback)
+            self._proxy_mapping[action] = (key, mod)
+
+    def _init_proxy_accels(self):
+        self._install_proxy('LargerTextAction')
+        self._install_proxy('SmallerTextAction')
+        self._install_proxy('NormalSizeAction')
+
+    def do_deactivate(self):
+        # Remove any installed menu items
+        self._remove_menu()
+
+        for view in self.window.get_views():
+            self.remove_document_helper(view)
+
+        self.window.remove_accel_group(self._accel_group)
+
+        Gtk.AccelMap.get().disconnect(self._accel_map_handler_id)
+
+        self._accel_group = None
+        self._action_group = None
+
+    def _insert_menu(self):
+        # Get the GtkUIManager
+        manager = self.window.get_ui_manager()
+
+        # Create a new action group
+        self._action_group = Gtk.ActionGroup("XedTextSizePluginActions")
+        self._action_group.add_actions([("LargerTextAction", None, _("_Larger Text"),
+                                         "<Ctrl>equal", None,
+                                         self.on_larger_text_activate),
+                                         ("SmallerTextAction", None, _("S_maller Text"),
+                                         "<Ctrl>minus", None,
+                                         self.on_smaller_text_activate),
+                                         ("NormalSizeAction", None, _("_Normal size"),
+                                         "<Ctrl>0", None,
+                                         self.on_normal_size_activate)])
+
+        # Insert the action group
+        manager.insert_action_group(self._action_group)
+
+        self._ui_id = manager.new_merge_id();
+
+        manager.add_ui(self._ui_id,
+                       MENU_PATH,
+                       "LargerTextAction",
+                       "LargerTextAction",
+                       Gtk.UIManagerItemType.MENUITEM,
+                       False)
+
+        manager.add_ui(self._ui_id,
+                       MENU_PATH,
+                       "SmallerTextAction",
+                       "SmallerTextAction",
+                       Gtk.UIManagerItemType.MENUITEM,
+                       False)
+
+        manager.add_ui(self._ui_id,
+                       MENU_PATH,
+                       "NormalSizeAction",
+                       "NormalSizeAction",
+                       Gtk.UIManagerItemType.MENUITEM,
+                       False)
+
+    def _remove_menu(self):
+        # Get the GtkUIManager
+        manager = self.window.get_ui_manager()
+
+        # Remove the ui
+        manager.remove_ui(self._ui_id)
+
+        # Remove the action group
+        manager.remove_action_group(self._action_group)
+
+        # Make sure the manager updates
+        manager.ensure_update()
+
+    def do_update_state(self):
+        self._action_group.set_sensitive(self.window.get_active_document() != None)
+
+    def get_helper(self, view):
+        if not hasattr(view, "textsize_document_helper"):
+            return None
+        return view.textsize_document_helper
+
+    def add_document_helper(self, view):
+        if self.get_helper(view) != None:
+            return
+
+        DocumentHelper(view)
+
+    def remove_document_helper(self, view):
+        helper = self.get_helper(view)
+
+        if helper != None:
+            helper.stop()
+
+    def call_helper(self, cb):
+        view = self.window.get_active_view()
+
+        if view:
+            cb(self.get_helper(view))
+
+    # Menu activate handlers
+    def on_larger_text_activate(self, action, user_data=None):
+        self.call_helper(lambda helper: helper.larger_text())
+
+    def on_smaller_text_activate(self, action, user_data=None):
+        self.call_helper(lambda helper: helper.smaller_text())
+
+    def on_normal_size_activate(self, action, user_data=None):
+        self.call_helper(lambda helper: helper.normal_size())
+
+    def on_larger_text_accel(self, group, accel, key, mod):
+        self.call_helper(lambda helper: helper.larger_text())
+
+    def on_smaller_text_accel(self, group, accel, key, mod):
+        self.call_helper(lambda helper: helper.smaller_text())
+
+    def on_normal_size_accel(self, group, accel, key, mod):
+        self.call_helper(lambda helper: helper.normal_size())
+
+    def on_tab_added(self, window, tab):
+        self.add_document_helper(tab.get_view())
+
+    def on_tab_removed(self, window, tab):
+        self.remove_document_helper(tab.get_view())
+
+    def _remap_proxy(self, action):
+        # Remove previous proxy
+
+        if action in self._proxy_mapping:
+            item = self._proxy_mapping[action]
+            self._accel_group.disconnect_key(item[0], item[1])
+
+        self._install_proxy(action)
+
+    def on_accel_map_changed(self, accelmap, path, key, mod):
+        for action in self._action_group.list_actions():
+            if action.get_accel_path() == path:
+                self._remap_proxy(action)
+                return

plugins/textsize/textsize/documenthelper.py

@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+#
+#  documenthelper.py - Document helper
+#
+#  Copyright (C) 2010 - Jesse van den Kieboom
+#  Copyright (C) 2017 - Linux Mint team
+#
+#  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.
+
+
+from .signals import Signals
+from gi.repository import Gtk, Gdk, Pango
+
+class DocumentHelper(Signals):
+    def __init__(self, view):
+        Signals.__init__(self)
+
+        self._view = view
+
+        self.connect_signal(self._view, 'scroll-event', self.on_scroll_event)
+        self.connect_signal(self._view, 'button-press-event', self.on_button_press_event)
+
+        self._view.textsize_document_helper = self
+
+        self._default_font = None
+        self._last_font = None
+        self._font_tags = {}
+
+    def stop(self):
+        if self._default_font:
+            self._view.override_font(self._default_font)
+
+        self.remove_font_tags()
+        self.disconnect_signals(self._view)
+
+        self._view.textsize_document_helper = None
+
+    def remove_font_tags(self):
+        buf = self._view.get_buffer()
+        table = buf.get_tag_table()
+
+        # Remove all the font tags
+        for size in self._font_tags:
+            tag = self._font_tags[size]
+            table.remove(tag)
+
+        self._font_tags = {}
+
+    def update_default_font(self):
+        context = self._view.get_style_context()
+        description = context.get_font(context.get_state()).copy()
+
+        if not self._last_font or description.hash() != self._last_font.hash():
+            self._default_font = description
+
+    def get_font_tags(self, start, end):
+        tags = set()
+
+        # Check all the know font tags
+        for size in self._font_tags:
+            tag = self._font_tags[size]
+
+            if start.has_tag(tag):
+                tags.add(tag)
+            else:
+                cp = start.copy()
+
+                if cp.forward_to_tag_toggle(tag) and cp.compare(end) < 0:
+                    tags.add(tag)
+
+        return list(tags)
+
+    def set_font_size(self, amount):
+        self.update_default_font()
+
+        context = self._view.get_style_context()
+        description = context.get_font(context.get_state()).copy()
+
+        buf = self._view.get_buffer()
+        bounds = buf.get_selection_bounds()
+        size = description.get_size() / Pango.SCALE
+
+        if not bounds:
+            description.set_size(max(1, (size + amount)) * Pango.SCALE)
+
+            self._view.override_font(description)
+            self._last_font = description
+        else:
+            start = bounds[0]
+            end = bounds[1]
+
+            tags = self.get_font_tags(start, end)
+
+            if not tags:
+                # Simply use the overall font size as the base
+                newsize = size + amount
+            elif len(tags) == 1:
+                newsize = tags[0].props.font_desc.get_size() / Pango.SCALE + amount
+            else:
+                newsize = 0
+
+                for tag in tags:
+                    newsize += tag.props.font_desc.get_size() / Pango.SCALE
+
+                newsize = round(newsize / len(tags))
+
+            newsize = int(max(1, newsize))
+
+            if not newsize in self._font_tags:
+                newtag = buf.create_tag(None)
+
+                desc = description
+                desc.set_size(newsize * Pango.SCALE)
+
+                newtag.props.font_desc = desc
+                self._font_tags[newsize] = newtag
+            else:
+                newtag = self._font_tags[newsize]
+
+            # Remove all the previous mix of tags
+            for tag in tags:
+                buf.remove_tag(tag, start, end)
+
+            buf.apply_tag(newtag, start, end)
+
+    def larger_text(self):
+        self.set_font_size(1)
+
+    def smaller_text(self):
+        self.set_font_size(-1)
+
+    def normal_size(self):
+        self.update_default_font()
+
+        buf = self._view.get_buffer()
+        bounds = buf.get_selection_bounds()
+
+        if not bounds:
+            self.remove_font_tags()
+
+            self._view.override_font(self._default_font)
+            self._last_font = self._default_font
+        else:
+            tags = self.get_font_tags(bounds[0], bounds[1])
+
+            for tag in tags:
+                buf.remove_tag(tag, bounds[0], bounds[1])
+
+    def on_scroll_event(self, view, event):
+        state = event.state & Gtk.accelerator_get_default_mod_mask()
+
+        if state != Gdk.ModifierType.CONTROL_MASK:
+            return False
+
+        if event.direction == Gdk.ScrollDirection.UP:
+            self.larger_text()
+            return True
+        elif event.direction == Gdk.ScrollDirection.DOWN:
+            self.smaller_text()
+            return True
+        elif event.direction == Gdk.ScrollDirection.SMOOTH:
+            if event.delta_y > 0:
+                self.smaller_text()
+            elif event.delta_y < 0:
+                self.larger_text()
+
+        return False
+
+    def on_button_press_event(self, view, event):
+        state = event.state & Gtk.accelerator_get_default_mod_mask()
+
+        if state == Gdk.ModifierType.CONTROL_MASK and event.button == 2:
+            self.normal_size()
+            return True
+        else:
+            return False

plugins/textsize/textsize/signals.py

@@ -0,0 +1,69 @@
+class Signals(object):
+    def __init__(self):
+        self._signals = {}
+
+    def _connect(self, obj, name, handler, connector):
+        ret = self._signals.setdefault(obj, {})
+
+        hid = connector(name, handler)
+        ret.setdefault(name, []).append(hid)
+
+        return hid
+
+    def connect_signal(self, obj, name, handler):
+        return self._connect(obj, name, handler, obj.connect)
+
+    def connect_signal_after(self, obj, name, handler):
+        return self._connect(obj, name, handler, obj.connect_after)
+
+    def disconnect_signals(self, obj):
+        if obj not in self._signals:
+            return False
+
+        for name in self._signals[obj]:
+            for hid in self._signals[obj][name]:
+                obj.disconnect(hid)
+
+        del self._signals[obj]
+        return True
+
+    def block_signal(self, obj, name):
+        if obj not in self._signals:
+            return False
+
+        if name not in self._signals[obj]:
+            return False
+
+        for hid in self._signals[obj][name]:
+            obj.handler_block(hid)
+
+        return True
+
+    def unblock_signal(self, obj, name):
+        if obj not in self._signals:
+            return False
+
+        if name not in self._signals[obj]:
+            return False
+
+        for hid in self._signals[obj][name]:
+            obj.handler_unblock(hid)
+
+        return True
+
+    def disconnect_signal(self, obj, name):
+        if obj not in self._signals:
+            return False
+
+        if name not in self._signals[obj]:
+            return False
+
+        for hid in self._signals[obj][name]:
+            obj.disconnect(hid)
+
+        del self._signals[obj][name]
+
+        if len(self._signals[obj]) == 0:
+            del self._signals[obj]
+
+        return True