[geany/geany-plugins] 8289df: Merge branch 'build-fixes'

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 15 Oct 2014 23:12:17 UTC
Commit:      8289df89a2f0547decd8d4e02010254e2ead55e6
             https://github.com/geany/geany-plugins/commit/8289df89a2f0547decd8d4e02010254e2ead55e6

Log Message:
-----------
Merge branch 'build-fixes'

This fixes all build issues and distcheck.


Modified Paths:
--------------
    configure.ac
    multiterm/src/Makefile.am
    multiterm/src/plugin.vala

Modified: configure.ac
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
 AC_PREREQ([2.61])
 dnl Don't forget when updating version number to do GP_CHECK_GEANY also
 AC_INIT([geany-plugins], [1.25])
-AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 


Modified: multiterm/src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -6,7 +6,7 @@ plugin = multiterm
 geanyplugins_LTLIBRARIES = multiterm.la
 
 multiterm_la_VALAFLAGS = \
-	--vapidir $(top_srcdir)/multiterm/src/vapi \
+	--vapidir $(abs_top_srcdir)/multiterm/src/vapi \
 	--pkg gtk+-2.0 \
 	--pkg geany \
 	--pkg vte \


Modified: multiterm/src/plugin.vala
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -28,7 +28,7 @@ public Data			geany_data;
 public Functions	geany_functions;
 
 /* Widgets to clean up when the plugin is unloaded */
-private List<Widget> toplevel_widgets = new List<Widget>();
+private List<Widget> toplevel_widgets = null;
 
 /* Geany calls this to determine min. required API/ABI version */
 public int plugin_version_check(int abi_version)
@@ -57,6 +57,8 @@ public void plugin_init(Geany.Data data)
 	 * unregistering and re-registering new types */
 	geany_plugin.module_make_resident();
 
+	toplevel_widgets = new List<Widget>();
+
 	/* Initialize plugin's configuration directory/file */
 	config_dir = Path.build_filename(geany_data.app.config_dir, "plugins", "multiterm");
 	config_file = Path.build_filename(config_dir, "multiterm.conf");
@@ -107,4 +109,5 @@ public void plugin_cleanup ()
 {
 	foreach (Widget wid in toplevel_widgets)
 		wid.destroy();
+	toplevel_widgets = null;
 }



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).