summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-04-23 16:55:47 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-04-23 16:55:47 +0200
commitb052b8420216059890bc30dc05f821678d33a17e (patch)
treea9e3e9813d7047561cf67b0f47d82abccd1efb24
parent24ada9c764f9b8e09e8d2b00b2162ea4c8fcd13a (diff)
downloadberyl-premerge-b052b8420216059890bc30dc05f821678d33a17e.tar.gz
beryl-premerge-b052b8420216059890bc30dc05f821678d33a17e.tar.bz2
fixed build/xml name issues
-rw-r--r--metadata/Makefile.am2
-rw-r--r--metadata/imgjpeg.xml (renamed from metadata/jpeg.xml)2
-rw-r--r--src/Makefile.am10
-rw-r--r--src/imgjpeg.c (renamed from src/jpeg.c)6
4 files changed, 10 insertions, 10 deletions
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 660658d..703ad60 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -6,7 +6,7 @@ meta_DATA = \
extrawm.xml \
fadedesktop.xml \
group.xml \
- jpeg.xml \
+ imgjpeg.xml \
mblur.xml \
neg.xml \
opacify.xml \
diff --git a/metadata/jpeg.xml b/metadata/imgjpeg.xml
index 3c715d5..a2f1a6c 100644
--- a/metadata/jpeg.xml
+++ b/metadata/imgjpeg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<compiz>
- <plugin name="jpeg" useBcop="true">
+ <plugin name="imgjpeg" useBcop="true">
<short>JPEG</short>
<long>JPEG image format plugin</long>
<feature>imageext:jpeg</feature>
diff --git a/src/Makefile.am b/src/Makefile.am
index a2dfc24..34db3ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ endif
if JPEG_PLUGIN
libimgjpeg_la_LDFLAGS = $(PFLAGS)
libimgjpeg_la_LIBADD = @COMPIZ_LIBS@ @WALL_LIBS@ -ljpeg
-libimgjpeg_la_SOURCES = jpeg_options.c jpeg.c
+libimgjpeg_la_SOURCES = imgjpeg_options.c imgjpeg.c
libimgjpeg_module = libimgjpeg.la
endif
@@ -74,9 +74,9 @@ libmblur_la_LDFLAGS = $(PFLAGS)
libmblur_la_LIBADD = @COMPIZ_LIBS@
libmblur_la_SOURCES = mblur_options.c mblur.c
-libreflection_la_LDFLAGS = $(PFLAGS)
-libreflection_la_LIBADD = @COMPIZ_LIBS@
-libreflection_la_SOURCES = reflex_options.c reflex.c
+libreflex_la_LDFLAGS = $(PFLAGS)
+libreflex_la_LIBADD = @COMPIZ_LIBS@
+libreflex_la_SOURCES = reflex_options.c reflex.c
libput_la_LDFLAGS = $(PFLAGS)
libput_la_LIBADD = @COMPIZ_LIBS@
@@ -117,7 +117,7 @@ module_LTLIBRARIES = \
libneg.la \
libring.la \
libput.la \
- libreflection.la \
+ libreflex.la \
libmblur.la \
libsplash.la \
libthumbnail.la \
diff --git a/src/jpeg.c b/src/imgjpeg.c
index 8e667fe..39d0d91 100644
--- a/src/jpeg.c
+++ b/src/imgjpeg.c
@@ -26,7 +26,7 @@
#include <compiz.h>
#include <jpeglib.h>
-#include "jpeg_options.h"
+#include "imgjpeg_options.h"
static int displayPrivateIndex;
@@ -176,7 +176,7 @@ static Bool writeJPEG(CompDisplay * d, void *buffer, FILE * file,
cinfo.in_color_space = JCS_RGB;
jpeg_set_defaults(&cinfo);
- jpeg_set_quality(&cinfo, jpegGetQuality(d), TRUE);
+ jpeg_set_quality(&cinfo, imgjpegGetQuality(d), TRUE);
jpeg_start_compress(&cinfo, TRUE);
while (cinfo.next_scanline < cinfo.image_height)
@@ -367,7 +367,7 @@ CompPluginFeature JPEGFeatures[] = {
};
CompPluginVTable JPEGVTable = {
- "jpeg",
+ "imgjpeg",
N_("JPEG"),
N_("JPEG image format plugin"),
JPEGGetVersion,