SF.net SVN: geany:[5775] trunk

[colombanw at users.sourceforge.net]

Revision: 5775
          http://geany.svn.sourceforge.net/geany/?rev=5775&view=rev
Author:   colombanw
Date:     2011-05-09 13:22:02 +0000 (Mon, 09 May 2011)

Log Message:
-----------
Enable SplitWindow build on Windows again

Re-apply r5638 now the SplitWindow plugin is fixed for real.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/Makefile.am
    trunk/plugins/makefile.win32
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-05-09 13:21:45 UTC (rev 5774)
+++ trunk/ChangeLog	2011-05-09 13:22:02 UTC (rev 5775)
@@ -3,6 +3,8 @@
  * plugins/splitwindow.c:
    Remove widget reparenting in Split Window plugin. This fixes plugin
    issues on Windows (patch by Matthew Brush, thanks - closes #2725342).
+ * plugins/Makefile.am, plugins/makefile.win32, wscript:
+   Enable SplitWindow build on Windows again (re-apply Enrico's patch).
 
 
 2011-05-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2011-05-09 13:21:45 UTC (rev 5774)
+++ trunk/plugins/Makefile.am	2011-05-09 13:22:02 UTC (rev 5775)
@@ -50,9 +50,8 @@
 	htmlchars.dll \
 	export.dll \
 	saveactions.dll \
+	splitwindow.dll \
 	filebrowser.dll
-# Split Window is broken on Windows
-#	splitwindow.dll
 
 .c.dll:
 	$(CC) $(MINGW_CFLAGS) -o $@.o -c $<

Modified: trunk/plugins/makefile.win32
===================================================================
--- trunk/plugins/makefile.win32	2011-05-09 13:21:45 UTC (rev 5774)
+++ trunk/plugins/makefile.win32	2011-05-09 13:22:02 UTC (rev 5775)
@@ -56,10 +56,9 @@
 		classbuilder.dll \
 		export.dll \
 		saveactions.dll \
+		splitwindow.dll \
 		filebrowser.dll
 
-# Split Window is broken on Windows
-#		splitwindow.dll
 
 clean:
 	-$(RM) deps.mak *.o *.dll

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2011-05-09 13:21:45 UTC (rev 5774)
+++ trunk/wscript	2011-05-09 13:22:02 UTC (rev 5775)
@@ -352,7 +352,7 @@
         build_plugin('filebrowser')
         build_plugin('htmlchars')
         build_plugin('saveactions')
-        build_plugin('splitwindow', not is_win32)
+        build_plugin('splitwindow')
 
     # Translations
     if bld.env['INTLTOOL']:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.