summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--acinclude.m424
m---------admin0
-rw-r--r--keep/app/Makefile.am4
-rw-r--r--keep/kded/Makefile.am2
-rw-r--r--po/it/keep.po2
-rw-r--r--po/nl/keep.po2
-rw-r--r--po/pt/keep.po2
8 files changed, 19 insertions, 19 deletions
diff --git a/TODO b/TODO
index e5bc425..562c85a 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@ Keep TODO
=====================
VERSION 0.5.0
- KIO integration
+ TDEIO integration
Improve notifications
Network located backups
Improve wording and usability
diff --git a/acinclude.m4 b/acinclude.m4
index 108d485..621ee30 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-ltdeutils")
+ AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+ AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-ltdednssd")
- AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+ AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
- AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/keep/app/Makefile.am b/keep/app/Makefile.am
index a6e2651..78cd105 100644
--- a/keep/app/Makefile.am
+++ b/keep/app/Makefile.am
@@ -11,8 +11,8 @@ keep_SOURCES = main.cpp keepmainwindow.cpp backuplistwidget.cpp\
addbackupwizard1view.ui addbackupwizard2view.ui\
addbackupwizard3view.ui restorebackupwizard1view.ui\
restorebackupwizard2view.ui restorebackupwizard3view.ui backuplistview.ui
-keep_LDADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
-keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+keep_LDADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
+keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = keepmainwindow.h addbackupwizard.h logdialog.h\
restorebackupwizard.h forcebackupdialog.h\
diff --git a/keep/kded/Makefile.am b/keep/kded/Makefile.am
index 26f9cd4..7c004b0 100644
--- a/keep/kded/Makefile.am
+++ b/keep/kded/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/keep/common -I$(top_builddir)/keep/common $(all_inclu
kde_module_LTLIBRARIES = kded_keep.la
kded_keep_la_LDFLAGS = -module -avoid-version $(all_libraries)
-kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
kded_keep_la_SOURCES = keepkded.cpp keepkded.skel
noinst_HEADERS = keepkded.h
diff --git a/po/it/keep.po b/po/it/keep.po
index 4eb5533..f8df27e 100644
--- a/po/it/keep.po
+++ b/po/it/keep.po
@@ -7,7 +7,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-24 08:46+0200\n"
"PO-Revision-Date: 2006-04-02 13:41+0200\n"
"Last-Translator: Nicola Ruggero <nixprog.adsl@tiscali.it>\n"
-"Language-Team: Italian <tde-i18n-it@kde.org>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nl/keep.po b/po/nl/keep.po
index 5c4ae90..70843da 100644
--- a/po/nl/keep.po
+++ b/po/nl/keep.po
@@ -7,7 +7,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-24 08:46+0200\n"
"PO-Revision-Date: 2006-10-04 13:23+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
-"Language-Team: Dutch <tde-i18n-nl@kde.org>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt/keep.po b/po/pt/keep.po
index 4fa84fb..873ba80 100644
--- a/po/pt/keep.po
+++ b/po/pt/keep.po
@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-24 08:46+0200\n"
"PO-Revision-Date: 2006-09-25 19:08+0100\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
-"Language-Team: pt <tde-i18n-pt@kde.org>\n"
+"Language-Team: pt <kde-i18n-pt@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"