Fix bug 3557458 -- when encrypting selected text a 0 byte gets added …

…to the text that's being encrypted

Makefile.am

@@ -1,39 +1,131 @@
-plugins = \
-	addons \
-	codenav \
-	debugger \
-	devhelp \
-	geanydoc \
-	geanyextrasel \
-	geanygdb \
-	geanygendoc \
-	geanyinsertnum \
-	geanylatex \
-	geanylipsum \
-	geanylua \
-	geanymacro \
-	geanyminiscript \
-	geanynumberedbookmarks \
-	geanypg \
-	geanyprj \
-	geanysendmail \
-	geanyvc \
-	gproject \
-	multiterm \
-	pretty-printer \
-	shiftcolumn \
-	spellcheck \
-	tableconvert \
-	treebrowser \
-	updatechecker \
-	webhelper \
-	xmlsnippets
-
 ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled --install
 
-SUBDIRS = \
-	po \
-	$(plugins)
+SUBDIRS = po
+
+if ENABLE_ADDONS
+SUBDIRS += addons
+endif
+
+if ENABLE_CODENAV
+SUBDIRS += codenav
+endif
+
+if ENABLE_COMMANDER
+SUBDIRS += commander
+endif
+
+if ENABLE_DEBUGGER
+SUBDIRS += debugger
+endif
+
+if ENABLE_DEVHELP
+SUBDIRS += devhelp
+endif
+
+if ENABLE_GEANYDOC
+SUBDIRS += geanydoc
+endif
+
+if ENABLE_GEANYEXTRASEL
+SUBDIRS += geanyextrasel
+endif
+
+if ENABLE_GEANYGDB
+SUBDIRS += geanygdb
+endif
+
+if ENABLE_GEANYGENDOC
+SUBDIRS += geanygendoc
+endif
+
+if ENABLE_GEANYINSERTNUM
+SUBDIRS += geanyinsertnum
+endif
+
+if ENABLE_GEANYLATEX
+SUBDIRS += geanylatex
+endif
+
+if ENABLE_GEANYLIPSUM
+SUBDIRS += geanylipsum
+endif
+
+if ENABLE_GEANYLUA
+SUBDIRS += geanylua
+endif
+
+if ENABLE_GEANYMACRO
+SUBDIRS += geanymacro
+endif
+
+if ENABLE_GEANYMINISCRIPT
+SUBDIRS += geanyminiscript
+endif
+
+if ENABLE_GEANYNUMBEREDBOOKMARKS
+SUBDIRS += geanynumberedbookmarks
+endif
+
+if ENABLE_GEANYPG
+SUBDIRS += geanypg
+endif
+
+if ENABLE_GEANYPRJ
+SUBDIRS += geanyprj
+endif
+
+if ENABLE_GEANYSENDMAIL
+SUBDIRS += geanysendmail
+endif
+
+if ENABLE_GEANYVC
+SUBDIRS += geanyvc
+endif
+
+if ENABLE_GENIUSPASTE
+SUBDIRS += geniuspaste
+endif
+
+if ENABLE_GPROJECT
+SUBDIRS += gproject
+endif
+
+if ENABLE_MULTITERM
+SUBDIRS += multiterm
+endif
+
+if ENABLE_PRETTY_PRINTER
+SUBDIRS += pretty-printer
+endif
+
+if ENABLE_SHIFTCOLUMN
+SUBDIRS += shiftcolumn
+endif
+
+if ENABLE_SPELLCHECK
+SUBDIRS += spellcheck
+endif
+
+if ENABLE_TABLECONVERT
+SUBDIRS += tableconvert
+endif
+
+if ENABLE_TREEBROWSER
+SUBDIRS += treebrowser
+endif
+
+if ENABLE_UPDATECHECKER
+SUBDIRS += updatechecker
+endif
+
+if ENABLE_WEBHELPER
+SUBDIRS += webhelper
+endif
+
+if ENABLE_XMLSNIPPETS
+SUBDIRS += xmlsnippets
+endif
+
 
 EXTRA_DIST = \
 	build/__init__.py \

NEWS

@@ -1,3 +1,74 @@
+Geany Plugins 1.22 (2012-07-10)
+
+    General:
+    * Autotools build system improvements
+    * Add new plugin GeanyMiniScript
+    * Add new plugin GeniusPaste
+    * Add new plugin MultiTerm
+    * Disable GeanyGDB by default on build with autotools
+
+    Addons:
+    * Add word wrapping addon
+
+    Debugger:
+    * Fix build with --as-needed
+    * Fix crash on 64 bit platform (#3449480)
+    * Use asynchronous methods when possible not to freeze the UI
+    * Display thread information in the stack window
+    * Properly handle spaces in filenames
+    * Various other bugfixes and improvements
+
+    Devhelp:
+    * Bundle libdevhelp 2.32
+    * Remove support for Google Code Search
+
+    GeanyLaTeX:
+    * Fix crash with recent Geany versions
+    * Ignore files autogenerated by biblatex in suggestions for cite
+
+    GeanyLua:
+    * Fix build with recent GLib
+
+    GeanyMacro:
+    * Add support for editing macros events
+    * Support search next/search prev
+
+    GeanyNumberedBookmarks:
+    * Only save file status if non-empty
+    * Add support for saving file status next to the file itself
+    * Save non-numbered bookmarks too
+
+    GeanyPG:
+    * Fix build with --as-needed
+    * Fix encryption to an untrusted key
+
+    GeanyPrj:
+    * Add "find in project" keybinding
+    * Add a setting to hide the sidebar
+
+    GeanyVC:
+    * Go to the selected line upon blame
+    * Add support for displaying the VC menu in the menubar
+
+    GProject:
+    * Fix a crash when a project file is missing
+    * Support Geany 1.22
+
+    Tableconvert:
+    * Fix SQL tables generation
+
+    TreeBrowser:
+    * Fix permissions on new files (#3415045)
+    * Add "create new file" and "create new directory" keybindings
+
+    WebHelper:
+    * Fix crash with recent versions of WebKitGTK
+    * Save and restore inspector docking state
+
+    Internationalisation:
+    * Update translations: de, ja, nl, tr
+
+
 Geany Plugins 0.21.1 (2011-10-30)
 
     General:

README

@@ -5,6 +5,8 @@ Geany-Plugins
 Installation
 ------------
 
+You can build the plugins using either autotools or waf. 
+
 Building with autotools
 ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -36,13 +38,15 @@ automatically based on whether the dependency exists on your system.
 to fail with an error message if you have missing
 dependencies. --disable-<option> causes the feature to be forcefully disabled.
 
+Avaialble plugins are:
+
 * addons -- the Addons plugin
 * codenav -- the CodeNav plugin
 * debugger -- the Debugger plugin
 * devhelp -- the devhelp plugin
 * geanydoc -- the GeanyDoc plugin
 * geanyextrasel -- the GeanyExtraSel plugin
-* geanygdb -- the GeanyGDB plugin
+* geanygdb -- the GeanyGDB plugin (disabled by default)
 * geanygendoc -- the GeanyGenDoc plugin
 * geanyinsertnum -- the GeanyInsertNum plugin
 * geanylatex -- the GeanyLaTeX plugin
@@ -53,6 +57,7 @@ dependencies. --disable-<option> causes the feature to be forcefully disabled.
 * geanyprj -- the GeanyPrj plugin
 * geanysendmail -- the GeanySendmail plugin
 * geanyvc -- the GeanyVC plugin
+* geniuspaste -- the paste to a pastebin plugin
 * gproject -- the GProject plugin
 * gtkspell -- GeanyVC's spell-check support
 * pretty_printer -- the pretty-printer plugin

addons/Makefile.am

@@ -1,8 +1,4 @@
-if ENABLE_ADDONS
 include $(top_srcdir)/build/vars.auxfiles.mk
-else
-include $(top_srcdir)/build/vars.docs.mk
-endif
 
 SUBDIRS = src
 plugin = addons

addons/README

@@ -1,11 +1,11 @@
 Addons
 ======
 
-.. image:: http://img534.imageshack.us/img534/94/addonssmall.png
+.. image:: http://plugins.geany.org/images/plugins/addons/addonssmall.png
    :width: 400
-   :alt: image of a plugin in work (if applicable)
+   :alt: Demonstration of the Addons plugin (Tasks, Bookmark List, Occurrence Highlighting, ...)
    :align: right
-   :target: http://img594.imageshack.us/img594/3962/addonsb.png
+   :target: http://plugins.geany.org/images/plugins/addons/addonsb.png
 
 .. contents::
 
@@ -84,11 +84,11 @@ replacing a selection.
 ^^^^^^^^^^^^^^^^^^^^^^^^
 Provides two methods for enclosing selected text in characters.  If the 'Enclose
 selection automatically' option is checked in Preferences, selected text will
-be surrounded when certain characters are pressed (e.g. highlight a string and 
-press ", the string will be surrounded in double quotes).  Also allows you to 
-define up to eight of your own opening and closing character pairs, which can 
+be surrounded when certain characters are pressed (e.g. highlight a string and
+press ", the string will be surrounded in double quotes).  Also allows you to
+define up to eight of your own opening and closing character pairs, which can
 then be linked to a keybinding (e.g. set [ and ] to be Enclose Pair 1 and the
-keybinding to ctrl+[ , highlight some text and press ctrl+[ to surround the 
+keybinding to ctrl+[ , highlight some text and press ctrl+[ to surround the
 selected text in brackets).
 
 Requirements

addons/src/Makefile.am

@@ -1,10 +1,6 @@
 include $(top_srcdir)/build/vars.build.mk
 
-if ENABLE_ADDONS
 geanyplugins_LTLIBRARIES = addons.la
-else
-EXTRA_LTLIBRARIES = addons.la
-endif
 
 addons_la_SOURCES = \
 	addons.h \

addons/src/ao_wrapwords.c

@@ -155,6 +155,8 @@ void ao_enclose_words_init (gchar *config_file_name, GeanyKeyGroup *key_group)
 
 	}
 
+	g_key_file_free(config);
+
 	plugin_signal_connect(geany_plugin, G_OBJECT(geany->main_widgets->window), "key-press-event",
 			FALSE, G_CALLBACK(on_key_press), NULL);
 }

autogen.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 mkdir -p build/cache
 intltoolize -c -f

build/commander.m4

@@ -0,0 +1,15 @@
+AC_DEFUN([GP_CHECK_COMMANDER],
+[
+    GP_ARG_DISABLE([Commander], [auto])
+
+    GP_CHECK_PLUGIN_DEPS([Commander], [COMMANDER],
+                         [gtk+-2.0 >= 2.16
+                          glib-2.0 >= 2.4])
+
+    GP_STATUS_PLUGIN_ADD([Commander], [$enable_commander])
+
+    AC_CONFIG_FILES([
+        commander/Makefile
+        commander/src/Makefile
+    ])
+])

build/debugger.m4

@@ -7,7 +7,6 @@ AC_DEFUN([GP_CHECK_DEBUGGER],
     AC_CONFIG_FILES([
         debugger/Makefile
         debugger/src/Makefile
-        debugger/src/xpm/Makefile
         debugger/img/Makefile
     ])
 ])

build/geany-plugins.nsi

@@ -31,14 +31,14 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Geany-Plugins"
-!define PRODUCT_VERSION "1.22"
-!define PRODUCT_VERSION_ID "1.22.0.0"
+!define PRODUCT_VERSION "1.23"
+!define PRODUCT_VERSION_ID "1.23.0.0"
 !define PRODUCT_PUBLISHER "The Geany developer team"
 !define PRODUCT_WEB_SITE "http://www.geany.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins"
 !define GEANY_DIR_REGKEY "Software\Geany"
-!define REQUIRED_GEANY_VERSION "0.21"
+!define REQUIRED_GEANY_VERSION "1.23"
 !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}"
 
 ;;;;;;;;;;;;;;;;;;;;;
@@ -48,7 +48,7 @@ VIProductVersion "${PRODUCT_VERSION_ID}"
 VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
 VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
-VIAddVersionKey "LegalCopyright" "Copyright 2009-2011 by the Geany developer team"
+VIAddVersionKey "LegalCopyright" "Copyright 2009-2012 by the Geany developer team"
 VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer"
 
 BrandingText "$(^NAME) installer (NSIS 2.46)"

build/geanygdb.m4

@@ -1,6 +1,6 @@
 AC_DEFUN([GP_CHECK_GEANYGDB],
 [
-    GP_ARG_DISABLE([GeanyGDB], [yes])
+    GP_ARG_DISABLE([GeanyGDB], [no])
     GP_STATUS_PLUGIN_ADD([GeanyGDB], [$enable_geanygdb])
     AC_CHECK_HEADERS([elf.h])
     AC_CHECK_HEADERS([elf_abi.h])