Author: kelnos
Date: 2006-11-27 03:24:41 +0000 (Mon, 27 Nov 2006)
New Revision: 23973
Modified:
xfmedia/trunk/Makefile.am
xfmedia/trunk/configure.ac.in
xfmedia/trunk/src/xfmedia-plugin.c
xfmedia/trunk/xfmedia/xfmedia-plugin.h
Log:
* don't build or include the plugins/ subdir, as the only plugin there is
mostly broken anyway
* bump the plugin API major version to avoid crashes with old stale plugins
(bug 2524).
* bind plugin symbols locally instead of globally
Modified: xfmedia/trunk/Makefile.am
===================================================================
--- xfmedia/trunk/Makefile.am 2006-11-27 03:07:26 UTC (rev 23972)
+++ xfmedia/trunk/Makefile.am 2006-11-27 03:24:41 UTC (rev 23973)
@@ -3,11 +3,13 @@
SUBDIRS = \
pixmaps \
xfmedia \
- plugins \
po \
src \
doc
+# plugins don't really work right now
+# plugins \
+
appsdir = $(datadir)/applications
apps_in_files = xfmedia.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
@@ -43,7 +45,7 @@
ACLOCAL_AMFLAGS = -I m4
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac.in
[ -x $(top_srcdir)/autogen.sh ] && cd $(top_srcdir) && NOCONFIGURE=1
./autogen.sh || /bin/true
checksums: dist
Modified: xfmedia/trunk/configure.ac.in
===================================================================
--- xfmedia/trunk/configure.ac.in 2006-11-27 03:07:26 UTC (rev 23972)
+++ xfmedia/trunk/configure.ac.in 2006-11-27 03:24:41 UTC (rev 23973)
@@ -232,11 +232,13 @@
doc/C/Makefile
doc/C/xml/Makefile
pixmaps/Makefile
-plugins/Makefile
-plugins/infopipe/Makefile
po/Makefile.in
src/Makefile
xfmedia/Makefile
xfmedia/xfmedia-plugin.pc
xfmedia.spec
])
+
+dnl plugins don't really do anything now
+dnl plugins/Makefile
+dnl plugins/infopipe/Makefile
Modified: xfmedia/trunk/src/xfmedia-plugin.c
===================================================================
--- xfmedia/trunk/src/xfmedia-plugin.c 2006-11-27 03:07:26 UTC (rev 23972)
+++ xfmedia/trunk/src/xfmedia-plugin.c 2006-11-27 03:24:41 UTC (rev 23973)
@@ -486,7 +486,7 @@
continue;
g_snprintf(fullpath, PATH_MAX, "%s/%s", plugin_dirs[i], file);
- gm = g_module_open(fullpath, 0);
+ gm = g_module_open(fullpath, G_MODULE_BIND_LOCAL);
if(!gm)
continue;
Modified: xfmedia/trunk/xfmedia/xfmedia-plugin.h
===================================================================
--- xfmedia/trunk/xfmedia/xfmedia-plugin.h 2006-11-27 03:07:26 UTC (rev
23972)
+++ xfmedia/trunk/xfmedia/xfmedia-plugin.h 2006-11-27 03:24:41 UTC (rev
23973)
@@ -29,9 +29,9 @@
G_BEGIN_DECLS
-#define XFMEDIA_PLUGIN_API_VERSION "2.1.0"
-#define XFMEDIA_PLUGIN_API_MAJOR 2
-#define XFMEDIA_PLUGIN_API_MINOR 2
+#define XFMEDIA_PLUGIN_API_VERSION "3.0.0"
+#define XFMEDIA_PLUGIN_API_MAJOR 3
+#define XFMEDIA_PLUGIN_API_MINOR 0
#define XFMEDIA_PLUGIN_API_MICRO 0
/* all plugins must call this macro */
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
