[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenonbeta/kopete/plugins/webpresence
From: Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date: 2003-01-31 23:40:43
[Download RAW message or body]
CVS commit by wstephens:
make the code compile when libxslt + co are not present
M +1 -1 Makefile.am 1.5
M +1 -1 configure.in.in 1.2
M +8 -2 webpresenceplugin.cpp 1.11
M +6 -0 webpresencepreferences.cpp 1.5
--- kdenonbeta/kopete/plugins/webpresence/Makefile.am #1.4:1.5
@@ -8,4 +8,4 @@
kopete_webpresence_la_LIBADD = ../../libkopete/libkopete.la \
$(LIBXML_LIBS) $(LIBXSLT_LIBS)
-data_DATA = webpresence.plugin webpresencedefault.xsl
+data_DATA = webpresence.plugin webpresencedefault.xsl wpimages.xsl
datadir = $(kde_datadir)/kopete
--- kdenonbeta/kopete/plugins/webpresence/configure.in.in #1.1:1.2
@@ -47,5 +47,5 @@
LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | sed -e "s/-L/-R/g"`
LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-
+ AC_DEFINE(HAVE_XSLT, 1, [Define if you have xslt libraries and \
header files]) else
AC_MSG_WARN([You need at least libxslt 1.0.7])
--- kdenonbeta/kopete/plugins/webpresence/webpresenceplugin.cpp #1.10:1.11
@@ -34,4 +34,5 @@
#include <klocale.h>
+#ifdef HAVE_XSLT
#include <libxml/xmlmemory.h>
#include <libxml/debugXML.h>
@@ -45,4 +46,5 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
+#endif
#include "kopetecontactlist.h"
@@ -183,4 +185,6 @@ KTempFile* WebPresencePlugin::generateFi
bool WebPresencePlugin::transform( KTempFile* src, KTempFile* dest )
{
+#ifdef HAVE_XSLT
+ QString error = "";
xmlSubstituteEntitiesDefault( 1 );
xmlLoadExtDtdDefaultValue = 1;
@@ -192,5 +196,4 @@ bool WebPresencePlugin::transform( KTemp
sheet.setName( m_prefs->userStyleSheet() );
- QString error = "";
if ( sheet.exists() )
{
@@ -247,4 +250,7 @@ bool WebPresencePlugin::transform( KTemp
return false;
}
+#else
+ return false;
+#endif
}
--- kdenonbeta/kopete/plugins/webpresence/webpresencepreferences.cpp \
#1.4:1.5 @@ -52,4 +52,10 @@ WebPresencePreferences::WebPresencePrefe
\
m_prefsDialog->m_rbUserStyleSheet->setChecked( true );
+#ifndef HAVE_XSLT
+ m_prefsDialog->m_rbNoFormat->setChecked( true );
+ m_prefsDialog->m_rbDefaultStyleSheet->setEnabled( false );
+ m_prefsDialog->m_rbUserStyleSheet->setEnabled( false );
+#endif
+
if ( theConfig->readBoolEntry( "UseIMName" ) )
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic