François Andriot
5 years ago
parent
411aad4790
commit
cd8eb9fd74
@ -1,92 +0,0 @@
|
||||
# Default version for this component
|
||||
%define tde_pkg fusion-icon
|
||||
%if "%{?tde_version}" == ""
|
||||
%define tde_version 14.0.0
|
||||
%endif
|
||||
|
||||
%if "%{?python2_sitelib}" == ""
|
||||
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
|
||||
%endif
|
||||
|
||||
|
||||
# TDE specific building variables
|
||||
%define tde_prefix /opt/trinity
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{tde_pkg}
|
||||
Summary: tray icon to launch and manage Compiz Fusion [Trinity]
|
||||
Version: 0.0.0+git20071028
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
|
||||
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: python
|
||||
Requires: python
|
||||
Requires: trinity-compizconfig-backend-kconfig
|
||||
|
||||
%description
|
||||
The OpenCompositing Project brings 3D desktop visual effects that
|
||||
improve the usability and eye candy of the X Window System and provide
|
||||
increased productivity.
|
||||
|
||||
This package contains a tray icon that can launch Compiz and its
|
||||
decorators.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR QTINC QTLIB
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
|
||||
%__make
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install \
|
||||
DESTDIR=%{buildroot} \
|
||||
PREFIX=%{tde_prefix}
|
||||
|
||||
# Removes 'egg-info'
|
||||
find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_bindir}/fusion-icon
|
||||
%{python2_sitelib}/FusionIcon/
|
||||
%{tde_datadir}/applications/fusion-icon.desktop
|
||||
%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
|
||||
%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
|
||||
|
||||
|
||||
%changelog
|
||||
@ -1,39 +0,0 @@
|
||||
diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
|
||||
index 981d0b6..71e2cd2 100644
|
||||
--- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp
|
||||
+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
|
||||
@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc
|
||||
if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX;
|
||||
|
||||
entry.setPermissions(p);
|
||||
+
|
||||
+ return(p);
|
||||
}
|
||||
|
||||
bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry)
|
||||
diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp
|
||||
index 126fad7..fac681f 100644
|
||||
--- a/kftpgrabber/src/misc/desencryptor.cpp
|
||||
+++ b/kftpgrabber/src/misc/desencryptor.cpp
|
||||
@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
|
||||
char *o_message = (char*) malloc(8);
|
||||
char *o_output = (char*) malloc(8);
|
||||
|
||||
- memset(o_message, 0, 9);
|
||||
- memset(o_output, 0, 9);
|
||||
+ memset(o_message, 0, sizeof o_message);
|
||||
+ memset(o_output, 0, sizeof o_output);
|
||||
//out.resize(in.size() * 2);
|
||||
|
||||
while (i < in.size()) {
|
||||
@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
|
||||
i += 8;
|
||||
|
||||
// Clear everything
|
||||
- memset(o_message, 0, 9);
|
||||
- memset(o_output, 0, 9);
|
||||
+ memset(o_message, 0, sizeof o_message);
|
||||
+ memset(o_output, 0, sizeof o_output);
|
||||
}
|
||||
|
||||
free(o_message);
|
||||
@ -0,0 +1,151 @@
|
||||
#
|
||||
# spec file for package kstreamripper (version R14)
|
||||
#
|
||||
# Copyright (c) 2014 Trinity Desktop Environment
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
|
||||
#
|
||||
|
||||
%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# TDE variables
|
||||
%define tde_epoch 2
|
||||
%if "%{?tde_version}" == ""
|
||||
%define tde_version 14.0.7
|
||||
%endif
|
||||
%define tde_pkg kstreamripper
|
||||
%define tde_prefix /opt/trinity
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_tdeappdir %{tde_datadir}/applications/tde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
|
||||
Name: trinity-%{tde_pkg}
|
||||
Epoch: %{tde_epoch}
|
||||
Version: 0.3.4
|
||||
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
|
||||
Summary: TDE frontend for streamripper
|
||||
Group: Applications/Utilities
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
%if 0%{?suse_version}
|
||||
License: GPL-2.0+
|
||||
%else
|
||||
License: GPLv2+
|
||||
%endif
|
||||
|
||||
#Vendor: Trinity Desktop
|
||||
#Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
|
||||
Source1: scons-local-2.5.1.tar.gz
|
||||
|
||||
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
|
||||
BuildRequires: trinity-tdebase-devel >= %{tde_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: fdupes
|
||||
|
||||
# SUSE desktop files utility
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
|
||||
%if 0%{?opensuse_bs} && 0%{?suse_version}
|
||||
# for xdg-menu script
|
||||
BuildRequires: brp-check-trinity
|
||||
%endif
|
||||
|
||||
#BuildRequires: scons
|
||||
|
||||
# PYTHON support
|
||||
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
|
||||
%define python python2
|
||||
%define __python %__python2
|
||||
%else
|
||||
%define python python
|
||||
%endif
|
||||
BuildRequires: %{python}
|
||||
|
||||
|
||||
%description
|
||||
KStreamRipper is a small frontend for the streamripper command
|
||||
line utility. Streamripper captures internet shoutcast radio streams
|
||||
on your harddisk and splits them up in mp3 files. KStreamRipper helps
|
||||
you with managing/ripping your preferred streams.
|
||||
|
||||
|
||||
##########
|
||||
|
||||
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
##########
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1
|
||||
%__rm -f kde.py
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR QTINC QTLIB
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
|
||||
export QTDIR=/usr
|
||||
%__python ./scons.py configure prefix="%{_prefix}"
|
||||
%__python ./scons.py %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
DESTDIR="%{?buildroot}" %__python ./scons.py install
|
||||
|
||||
# Missing icon file will make this fail.
|
||||
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
|
||||
|
||||
# Updates applications categories for openSUSE
|
||||
%if 0%{?suse_version}
|
||||
%suse_update_desktop_file kstreamripper Audio Recorder
|
||||
%endif
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_bindir}/kstreamripper
|
||||
%{tde_tdeappdir}/kstreamripper.desktop
|
||||
%{tde_datadir}/apps/kstreamripper/
|
||||
%{tde_tdedocdir}/HTML/en/kstreamripper/
|
||||
|
||||
|
||||
%changelog
|
||||
Binary file not shown.
@ -0,0 +1,168 @@
|
||||
#
|
||||
# spec file for package kuickshow (version R14)
|
||||
#
|
||||
# Copyright (c) 2014 Trinity Desktop Environment
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
|
||||
#
|
||||
|
||||
# TDE variables
|
||||
%define tde_epoch 2
|
||||
%if "%{?tde_version}" == ""
|
||||
%define tde_version 14.0.7
|
||||
%endif
|
||||
%define tde_pkg kuickshow
|
||||
%define tde_prefix /opt/trinity
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_tdeappdir %{tde_datadir}/applications/tde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
|
||||
Name: trinity-%{tde_pkg}
|
||||
Epoch: %{tde_epoch}
|
||||
Version: 0.8.13
|
||||
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
|
||||
Summary: Quick picture viewer for TDE
|
||||
Group: Applications/Utilities
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
%if 0%{?suse_version}
|
||||
License: GPL-2.0+
|
||||
%else
|
||||
License: GPLv2+
|
||||
%endif
|
||||
|
||||
#Vendor: Trinity Desktop
|
||||
#Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
|
||||
|
||||
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
|
||||
BuildRequires: trinity-tdebase-devel >= %{tde_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: fdupes
|
||||
|
||||
# SUSE desktop files utility
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
|
||||
%if 0%{?opensuse_bs} && 0%{?suse_version}
|
||||
# for xdg-menu script
|
||||
BuildRequires: brp-check-trinity
|
||||
%endif
|
||||
|
||||
# IMLIB1 support
|
||||
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
|
||||
BuildRequires: imlib-devel
|
||||
%endif
|
||||
%if 0%{?mgaversion}
|
||||
BuildRequires: imlib1-devel
|
||||
%endif
|
||||
|
||||
# GIF support
|
||||
%if 0%{?suse_version} || 0%{?fedora} >= 28
|
||||
BuildRequires: giflib-devel
|
||||
%else
|
||||
BuildRequires: libungif-devel
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
Kuickshow is a picture viewer for TDE. It displays the directory structure,
|
||||
displaying images as thumbnails.
|
||||
Clicking on an image shows the image in its normal size.
|
||||
|
||||
|
||||
##########
|
||||
|
||||
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
##########
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
|
||||
|
||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR QTINC QTLIB
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
\
|
||||
--disable-dependency-tracking \
|
||||
--disable-debug \
|
||||
--enable-final \
|
||||
--enable-new-ldflags \
|
||||
--enable-closure \
|
||||
--enable-rpath \
|
||||
--disable-gcc-hidden-visibility
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{?buildroot}
|
||||
|
||||
# Missing category will make this fail.
|
||||
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING
|
||||
%{tde_bindir}/kuickshow
|
||||
%{tde_datadir}/applications/*/*.desktop
|
||||
%{tde_datadir}/apps/kuickshow/
|
||||
%{tde_datadir}/icons/hicolor/*/*/*
|
||||
%{tde_libdir}/libtdeinit_%{tde_pkg}.so
|
||||
%{tde_libdir}/*.la
|
||||
%{tde_tdelibdir}/*.so
|
||||
%{tde_tdelibdir}/*.la
|
||||
%{tde_tdedocdir}/HTML/en/kuickshow/
|
||||
|
||||
|
||||
%changelog
|
||||
@ -1,19 +0,0 @@
|
||||
--- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI 2013-07-20 12:35:51.155931996 +0200
|
||||
+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am 2013-07-20 12:37:49.601226585 +0200
|
||||
@@ -57,13 +57,13 @@
|
||||
|
||||
|
||||
install-data-local:
|
||||
- $(mkinstalldirs) $(kde_appsdir)/
|
||||
- $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
|
||||
+ $(mkinstalldirs) $(xdg_appsdir)/
|
||||
+ $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
|
||||
$(mkinstalldirs) $(kde_datadir)/kvpnc/
|
||||
$(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
|
||||
$(mkinstalldirs) $(kde_datadir)/kvpnc/
|
||||
$(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
|
||||
- $(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
|
||||
+ $(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
|
||||
$(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
|
||||
$(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
|
||||
# $(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
|
||||
@ -1,19 +0,0 @@
|
||||
--- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI 2013-07-20 12:35:51.155931996 +0200
|
||||
+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am 2013-07-20 12:37:49.601226585 +0200
|
||||
@@ -57,13 +57,13 @@
|
||||
|
||||
|
||||
install-data-local:
|
||||
- $(mkinstalldirs) $(kde_appsdir)/
|
||||
- $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
|
||||
+ $(mkinstalldirs) $(xdg_appsdir)/
|
||||
+ $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
|
||||
$(mkinstalldirs) $(kde_datadir)/kvpnc/
|
||||
$(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
|
||||
$(mkinstalldirs) $(kde_datadir)/kvpnc/
|
||||
$(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
|
||||
- $(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
|
||||
+ $(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
|
||||
$(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
|
||||
$(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
|
||||
# $(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
|
||||
@ -0,0 +1,14 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Laptops & Power
|
||||
Name[br]=Gremm
|
||||
Name[el]=Ισχύς
|
||||
Name[it]=Energia
|
||||
Name[mt]=Elettriku
|
||||
Name[nl]=Energie
|
||||
Name[pa]=ਊਰਜਾ(power)
|
||||
Name[pt_BR]=Energia
|
||||
Name[ru]=Управление питанием
|
||||
Name[sv]=Effekt
|
||||
Icon=energy
|
||||
OnlyShowIn=TDE;
|
||||
@ -1,57 +0,0 @@
|
||||
--- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3 2013-12-30 17:57:05.867723485 +0100
|
||||
+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt 2014-09-16 21:49:29.774968683 +0200
|
||||
@@ -45,19 +45,6 @@
|
||||
cache/DatabaseException.cpp
|
||||
)
|
||||
|
||||
-# IF (SQLITE_FOUND)
|
||||
- MESSAGE(STATUS "Build own sqlite3 database modul")
|
||||
- SET(SOURCES
|
||||
- ${SOURCES}
|
||||
- cache/sqlite3/qsqlcachedresult.cpp
|
||||
- cache/sqlite3/qsql_sqlite3.cpp
|
||||
- cache/sqlite3/qsqlcachedresult.h
|
||||
- cache/sqlite3/qsql_sqlite3.h
|
||||
- )
|
||||
-# ELSE (SQLITE_FOUND)
|
||||
-# MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
|
||||
-# ENDIF (SQLITE_FOUND)
|
||||
-
|
||||
SET(CACHEINST_HEADERS
|
||||
cache/LogCache.hpp
|
||||
cache/ReposLog.hpp
|
||||
@@ -150,7 +137,7 @@
|
||||
|
||||
# IF (SQLITE_FOUND)
|
||||
TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
|
||||
- INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
|
||||
+ INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
|
||||
# ELSE (SQLITE_FOUND)
|
||||
# TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
|
||||
# ENDIF (SQLITE_FOUND)
|
||||
--- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3 2014-01-28 20:25:28.711539518 +0100
|
||||
+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp 2014-09-16 21:51:37.826387614 +0200
|
||||
@@ -10,9 +10,10 @@
|
||||
#include "svnqt/cache/DatabaseException.hpp"
|
||||
|
||||
#ifndef NO_SQLITE3
|
||||
-#include "sqlite3/qsql_sqlite3.h"
|
||||
+#include <qsql_sqlite3.h>
|
||||
#define SQLTYPE "QSQLITE3"
|
||||
#else
|
||||
+#include <qsql_sqlite.h>
|
||||
#define SQLTYPE "QSQLITE"
|
||||
#endif
|
||||
|
||||
@@ -262,11 +263,6 @@
|
||||
|
||||
void LogCache::setupMainDb()
|
||||
{
|
||||
-#ifndef NO_SQLITE3
|
||||
- if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
|
||||
- TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
|
||||
- }
|
||||
-#endif
|
||||
TQDataBase mainDB = m_CacheData->getMainDB();
|
||||
if (!mainDB || !mainDB->open()) {
|
||||
tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));
|
||||
@ -1,193 +0,0 @@
|
||||
diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c
|
||||
index 68a4377..35aef48 100644
|
||||
--- a/src/add-caldav-object.c
|
||||
+++ b/src/add-caldav-object.c
|
||||
@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c
|
||||
index 9a85168..ea5733f 100644
|
||||
--- a/src/delete-caldav-object.c
|
||||
+++ b/src/delete-caldav-object.c
|
||||
@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
g_free(search);
|
||||
curl_slist_free_all(http_header);
|
||||
@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
caldav_unlock_object(
|
||||
@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
g_free(search);
|
||||
curl_slist_free_all(http_header);
|
||||
@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
caldav_unlock_object(
|
||||
diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c
|
||||
index d916259..0021cb8 100644
|
||||
--- a/src/get-caldav-report.c
|
||||
+++ b/src/get-caldav-report.c
|
||||
@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/get-display-name.c b/src/get-display-name.c
|
||||
index 8fc0ff8..c205efd 100644
|
||||
--- a/src/get-display-name.c
|
||||
+++ b/src/get-display-name.c
|
||||
@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c
|
||||
index f75ab92..40a5a3c 100644
|
||||
--- a/src/get-freebusy-report.c
|
||||
+++ b/src/get-freebusy-report.c
|
||||
@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c
|
||||
index 30f2d20..6845551 100644
|
||||
--- a/src/lock-caldav-object.c
|
||||
+++ b/src/lock-caldav-object.c
|
||||
@@ -107,7 +107,6 @@ gchar* caldav_lock_object(
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
if (res != 0) {
|
||||
@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI,
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
if (res != 0) {
|
||||
diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c
|
||||
index fb3a4d0..f3563d8 100644
|
||||
--- a/src/modify-caldav-object.c
|
||||
+++ b/src/modify-caldav-object.c
|
||||
@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
http_header = NULL;
|
||||
@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
|
||||
strlen(settings->file));
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
http_header = NULL;
|
||||
@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
|
||||
strlen(settings->file));
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c
|
||||
index 1d97d04..0045afe 100644
|
||||
--- a/src/options-caldav-server.c
|
||||
+++ b/src/options-caldav-server.c
|
||||
@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res == 0) {
|
||||
gchar* head;
|
||||
@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
|
||||
}
|
||||
else if (
|
||||
(res == CURLE_SSL_CONNECT_ERROR ||
|
||||
- CURLE_PEER_FAILED_VERIFICATION ||
|
||||
CURLE_SSL_ENGINE_NOTFOUND ||
|
||||
CURLE_SSL_ENGINE_SETFAILED ||
|
||||
CURLE_SSL_CERTPROBLEM ||
|
||||
CURLE_SSL_CIPHER ||
|
||||
CURLE_SSL_CACERT ||
|
||||
- CURLE_SSL_CACERT_BADFILE ||
|
||||
- CURLE_SSL_CRL_BADFILE ||
|
||||
- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
|
||||
+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
|
||||
error->code = -2;
|
||||
error->str = g_strdup(error_buf);
|
||||
}
|
||||
@ -1,164 +0,0 @@
|
||||
diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
|
||||
index 5574991..a1586d8 100644
|
||||
--- a/src/add-carddav-object.c
|
||||
+++ b/src/add-carddav-object.c
|
||||
@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
|
||||
index 96b9033..6984a82 100644
|
||||
--- a/src/delete-carddav-object.c
|
||||
+++ b/src/delete-carddav-object.c
|
||||
@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
g_free(search);
|
||||
curl_slist_free_all(http_header);
|
||||
@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
carddav_unlock_object(
|
||||
@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error)
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
carddav_unlock_object(
|
||||
diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
|
||||
index b44fd2c..7655b29 100644
|
||||
--- a/src/get-carddav-report.c
|
||||
+++ b/src/get-carddav-report.c
|
||||
@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error)
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
|
||||
curl_easy_cleanup(curl);
|
||||
g_free(dav_file_listing);
|
||||
return result;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/src/get-display-name.c b/src/get-display-name.c
|
||||
index 9e782e0..16c3e4b 100644
|
||||
--- a/src/get-display-name.c
|
||||
+++ b/src/get-display-name.c
|
||||
@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != 0) {
|
||||
error->code = -1;
|
||||
diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
|
||||
index 163264c..2292cad 100644
|
||||
--- a/src/lock-carddav-object.c
|
||||
+++ b/src/lock-carddav-object.c
|
||||
@@ -109,7 +109,6 @@ gchar* carddav_lock_object(
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
if (res != 0) {
|
||||
@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI,
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
if (res != 0) {
|
||||
diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
|
||||
index 1822068..a8b6de2 100644
|
||||
--- a/src/modify-carddav-object.c
|
||||
+++ b/src/modify-carddav-object.c
|
||||
@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
res = curl_easy_perform(curl);
|
||||
curl_slist_free_all(http_header);
|
||||
http_header = NULL;
|
||||
@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
|
||||
strlen(settings->file));
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error)
|
||||
strlen(settings->file));
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
|
||||
res = curl_easy_perform(curl);
|
||||
if (LOCKSUPPORT && lock_token) {
|
||||
diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
|
||||
index b774401..b44aae2 100644
|
||||
--- a/src/options-carddav-server.c
|
||||
+++ b/src/options-carddav-server.c
|
||||
@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
|
||||
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
|
||||
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
|
||||
if (settings->debug) {
|
||||
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
|
||||
}
|
||||
@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
|
||||
}
|
||||
else if (
|
||||
(res == CURLE_SSL_CONNECT_ERROR ||
|
||||
- CURLE_PEER_FAILED_VERIFICATION ||
|
||||
CURLE_SSL_ENGINE_NOTFOUND ||
|
||||
CURLE_SSL_ENGINE_SETFAILED ||
|
||||
CURLE_SSL_CERTPROBLEM ||
|
||||
CURLE_SSL_CIPHER ||
|
||||
CURLE_SSL_CACERT ||
|
||||
- CURLE_SSL_CACERT_BADFILE ||
|
||||
- CURLE_SSL_CRL_BADFILE ||
|
||||
- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
|
||||
+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
|
||||
error->code = -2;
|
||||
error->str = g_strdup(error_buf);
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Exec=tqassistant
|
||||
Name=TQt3 Assistant
|
||||
Name[de]=TQt3 Assistent
|
||||
GenericName=Document Browser
|
||||
Comment=TQt3 Helpcenter
|
||||
Comment[de]= TQt3 Hilfezentrum
|
||||
MimeType=application/x-assistant;
|
||||
Icon=tqassistant
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Qt;Development;
|
||||
@ -1,26 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Exec=tqlinguist
|
||||
Name=TQt3 Linguist
|
||||
Name[de]=TQt3-Linguist
|
||||
Name[eo]=TQt3-Lingvisto
|
||||
Name[es]=Lingüista TQt3
|
||||
Name[ko]=TQt3 언어학자
|
||||
Name[lv]=TQt3 Lingvists
|
||||
GenericName=Translation Tool
|
||||
Comment=Tool for translating message catalogues of TQt3 based programs
|
||||
Comment[da]=Redskab til at oversætte TQt3 baserede programmer
|
||||
Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
|
||||
Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj
|
||||
Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3
|
||||
Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
|
||||
Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához
|
||||
Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
|
||||
Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās
|
||||
Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
|
||||
Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
|
||||
Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program
|
||||
MimeType=application/x-linguist;
|
||||
Terminal=false
|
||||
Icon=tqlinguist
|
||||
Type=Application
|
||||
Categories=Qt;Development
|
||||
@ -1,13 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Exec=tqtconfig
|
||||
Name=TQt3 Configuration
|
||||
Name[de]=TQt3 Konfiguration
|
||||
GenericName=Configuration Utility
|
||||
Comment=A graphical configuration tool for programs using TQt 3
|
||||
Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
|
||||
MimeType=application/x-qtconfig;
|
||||
Terminal=false
|
||||
Icon=tqtconfig
|
||||
Type=Application
|
||||
Categories=Qt;Settings;
|
||||
@ -1,23 +1,23 @@
|
||||
[trinity-3.5.13]
|
||||
name=trinity-3.5.13
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
[trinity-3.5.13-noarch]
|
||||
name=trinity-3.5.13-noarch
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
[trinity-3.5.13-source]
|
||||
name=trinity-3.5.13-source
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
|
||||
enabled=0
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
[trinity-3.5.13]
|
||||
name=trinity-3.5.13
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
[trinity-3.5.13-noarch]
|
||||
name=trinity-3.5.13-noarch
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
[trinity-3.5.13-source]
|
||||
name=trinity-3.5.13-noarch
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
|
||||
#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
|
||||
mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
|
||||
enabled=0
|
||||
gpgcheck=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
|
||||
|
||||
@ -0,0 +1 @@
|
||||
pamd.kcheckpass-trinity.el7
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
@ -0,0 +1 @@
|
||||
pamd.kcheckpass-trinity.pclos2018
|
||||
@ -0,0 +1 @@
|
||||
pamd.kdm-trinity-np.el7
|
||||
@ -0,0 +1,16 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_permit.so
|
||||
auth include postlogin
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
session optional pam_console.so
|
||||
-session optional pam_ck_connector.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include system-auth
|
||||
session include postlogin
|
||||
@ -0,0 +1 @@
|
||||
pamd.kdm-trinity-np.pclos2018
|
||||
@ -0,0 +1 @@
|
||||
pamd.kdm-trinity.el7
|
||||
@ -0,0 +1,23 @@
|
||||
#%PAM-1.0
|
||||
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
|
||||
auth required pam_env.so
|
||||
auth substack system-auth
|
||||
-auth optional pam_gnome_keyring.so
|
||||
-auth optional pam_kwallet.so
|
||||
-auth optional pam_kwallet5.so
|
||||
auth include postlogin
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
session optional pam_console.so
|
||||
-session optional pam_ck_connector.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include system-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet.so
|
||||
-session optional pam_kwallet5.so
|
||||
session include postlogin
|
||||
@ -0,0 +1 @@
|
||||
pamd.kdm-trinity.pclos2018
|
||||
@ -0,0 +1 @@
|
||||
pamd.kscreensaver-trinity.el7
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
@ -0,0 +1 @@
|
||||
pamd.kscreensaver-trinity.pclos2018
|
||||
@ -0,0 +1 @@
|
||||
tdm.el7.pp
|
||||
Binary file not shown.
@ -0,0 +1 @@
|
||||
tdm.service.el7
|
||||
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=The Trinity login manager
|
||||
Conflicts=getty@tty1.service
|
||||
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/opt/trinity/bin/kdm
|
||||
Restart=always
|
||||
IgnoreSIGPIPE=no
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Trinity Display Manager
|
||||
Documentation=man:tdm(1)
|
||||
Conflicts=getty@tty1.service
|
||||
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/opt/trinity/bin/tdm
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Trinity Display Manager
|
||||
Documentation=man:tdm(1)
|
||||
Conflicts=getty@tty1.service
|
||||
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/opt/trinity/bin/tdm
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@ -1,31 +0,0 @@
|
||||
diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
|
||||
index b5fddb8..1269c36 100644
|
||||
--- a/tdecore/tdeglobal.h
|
||||
+++ b/tdecore/tdeglobal.h
|
||||
@@ -25,8 +25,10 @@ class KCharsets;
|
||||
class TDEConfig;
|
||||
class TDESharedConfig;
|
||||
class TDEIconLoader;
|
||||
+#ifdef __TDE_HAVE_TDEHWLIB
|
||||
class TDEHardwareDevices;
|
||||
class TDEGlobalNetworkManager;
|
||||
+#endif
|
||||
class TDELocale;
|
||||
class TDEStandardDirs;
|
||||
class KStaticDeleterBase;
|
||||
@@ -79,6 +81,7 @@ public:
|
||||
*/
|
||||
static TDEIconLoader *iconLoader();
|
||||
|
||||
+#ifdef __TDE_HAVE_TDEHWLIB
|
||||
/**
|
||||
* Returns a TDEHardwareDevices object.
|
||||
* @return the global hardware devices object
|
||||
@@ -90,6 +93,7 @@ public:
|
||||
* @return the global network manager object
|
||||
*/
|
||||
static TDEGlobalNetworkManager *networkManager();
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* Returns the global locale object.
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
|
||||
index 4d9c4a4..fed951b 100644
|
||||
--- a/tdecore/CMakeLists.txt
|
||||
+++ b/tdecore/CMakeLists.txt
|
||||
@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC
|
||||
EMBED tdecorenetwork-static ${TDEHW_LIB}
|
||||
LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
|
||||
${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
|
||||
- ${LIBBFD_LIBRARIES} ${LIB_UTIL}
|
||||
+ ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES}
|
||||
DEPENDENCIES dcopidl dcopidl2cpp
|
||||
DESTINATION ${LIB_INSTALL_DIR}
|
||||
)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
tdemultimedia-14.0.0-cmake.spec
|
||||
@ -1,90 +0,0 @@
|
||||
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
|
||||
index aa01c96..d27f041 100644
|
||||
--- a/kmail/kmkernel.cpp
|
||||
+++ b/kmail/kmkernel.cpp
|
||||
@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
|
||||
connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
|
||||
"selectFolder(TQString)", false );
|
||||
|
||||
- mNetworkManager = TDEGlobal::networkManager();
|
||||
- if (mNetworkManager) {
|
||||
- connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
|
||||
- this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
|
||||
- if (networkStateConnected()) {
|
||||
- resumeNetworkJobs();
|
||||
- }
|
||||
- else {
|
||||
- stopNetworkJobs();
|
||||
- }
|
||||
- }
|
||||
+ // Assume connected
|
||||
+ resumeNetworkJobs();
|
||||
}
|
||||
|
||||
KMKernel::~KMKernel ()
|
||||
@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const
|
||||
|
||||
bool KMKernel::networkStateConnected()
|
||||
{
|
||||
- if (mNetworkManager) {
|
||||
- TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus();
|
||||
- if ((networkStatus & TDENetworkGlobalManagerFlags::Connected)
|
||||
- || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable)
|
||||
- || (networkStatus == TDENetworkGlobalManagerFlags::Unknown)
|
||||
- ){
|
||||
- // Connected or no backend available
|
||||
- return true;
|
||||
- }
|
||||
- else {
|
||||
- // Not connected
|
||||
- return false;
|
||||
- }
|
||||
- }
|
||||
- else {
|
||||
- // Assume connected
|
||||
- return true;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)
|
||||
-{
|
||||
- if (networkStateConnected()) {
|
||||
- resumeNetworkJobs();
|
||||
- }
|
||||
- else {
|
||||
- stopNetworkJobs();
|
||||
- }
|
||||
+ // Assume connected
|
||||
+ return true;
|
||||
}
|
||||
|
||||
Wallet *KMKernel::wallet() {
|
||||
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
|
||||
index 0dc4644..37a3eec 100644
|
||||
--- a/kmail/kmkernel.h
|
||||
+++ b/kmail/kmkernel.h
|
||||
@@ -14,8 +14,6 @@
|
||||
#include <tdeimproxy.h>
|
||||
#include <tdepimmacros.h>
|
||||
|
||||
-#include <tdenetworkconnections.h>
|
||||
-
|
||||
#include "kmailIface.h"
|
||||
#include "kmmsgbase.h"
|
||||
#include "globalsettings.h"
|
||||
@@ -436,7 +434,6 @@ public slots:
|
||||
protected slots:
|
||||
void slotDataReq(TDEIO::Job*,TQByteArray&);
|
||||
void slotResult(TDEIO::Job*);
|
||||
- void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
|
||||
|
||||
signals:
|
||||
void configChanged();
|
||||
@@ -527,7 +524,6 @@ private:
|
||||
TQString mAddMessageLastFolder;
|
||||
KMFolder *mAddMsgCurrentFolder;
|
||||
|
||||
- TDEGlobalNetworkManager *mNetworkManager;
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Reference in new issue