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 index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/kerry/src/kcm/Makefile.am b/kerry/src/kcm/Makefile.am index 8905dd1..2f03459 100644 --- a/kerry/src/kcm/Makefile.am +++ b/kerry/src/kcm/Makefile.am @@ -9,7 +9,7 @@ kcm_beagle_la_SOURCES = main.cpp beagle.cpp kerry.cpp indexing.cpp backends.cpp select_privacy_resource.ui kcm_beagle_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_beagle_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_TDECORE) -lDCOP +kcm_beagle_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_TDECORE) -lDCOP xdg_apps_DATA = kcmbeagle.desktop diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index 1e13cae..bf62762 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -715,7 +715,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde item->insertHeaderWidget(2,headerEmailLabel); connect(headerEmailLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(slotMailTo(const TQString&))); } - else if ((*(result->uri)).startsWith("kabc:/")) { + else if ((*(result->uri)).startsWith("tdeabc:/")) { item->setIcon("kaddressbook"); TQStringList _properties(result->properties); @@ -1273,7 +1273,7 @@ void SearchDlg::slotOpen() { slotOpenThunderbird(item->uri()); } - else if (item->uri().startsWith("kabc:/") ) + else if (item->uri().startsWith("tdeabc:/") ) { slotOpenKAddressBook(item->uri().mid(8,10)); } @@ -1735,7 +1735,7 @@ void SearchDlg::searchAddressbook() continue; } - if (checkUriInResults("kabc:///"+(*it).uid())) { + if (checkUriInResults("tdeabc:///"+(*it).uid())) { it++; continue; } @@ -1746,7 +1746,7 @@ void SearchDlg::searchAddressbook() BeagleSearch::beagle_result_struct *result = new BeagleSearch::beagle_result_struct; result->mime_type=new TQString("text/html"); - result->uri=new TQString("kabc:///"+(*it).uid()); + result->uri=new TQString("tdeabc:///"+(*it).uid()); *(result->properties).append("vCard:FN="+realName); *(result->properties).append("vCard:EMAIL="+(*it).preferredEmail()); result->tilegroup = BeagleSearch::Contact; diff --git a/po/ca/kcmbeagle.po b/po/ca/kcmbeagle.po index 13d0cdf..2d696d9 100644 --- a/po/ca/kcmbeagle.po +++ b/po/ca/kcmbeagle.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-10-27 08:41+0200\n" "PO-Revision-Date: 2006-11-08 01:39+0100\n" "Last-Translator: Pau Tallada Crespí \n" -"Language-Team: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/ca/kerry.po b/po/ca/kerry.po index 70159d8..3bdaddc 100644 --- a/po/ca/kerry.po +++ b/po/ca/kerry.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-11-21 08:45+0100\n" "PO-Revision-Date: 2006-11-07 00:30+0100\n" "Last-Translator: Pau Tallada Crespí \n" -"Language-Team: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de/kcmbeagle.po b/po/de/kcmbeagle.po index f61770a..d988296 100644 --- a/po/de/kcmbeagle.po +++ b/po/de/kcmbeagle.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-10-27 08:41+0200\n" "PO-Revision-Date: 2006-10-29 11:28+0100\n" "Last-Translator: Jannick Kuhr \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de/kerry.po b/po/de/kerry.po index 8e0bb76..4bbbcbc 100644 --- a/po/de/kerry.po +++ b/po/de/kerry.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2006-11-21 08:45+0100\n" "PO-Revision-Date: 2006-11-10 08:55+0100\n" "Last-Translator: Jannick Kuhr \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it/kerry.po b/po/it/kerry.po index 2472754..8ea1ed3 100644 --- a/po/it/kerry.po +++ b/po/it/kerry.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2006-11-21 08:45+0100\n" "PO-Revision-Date: 2006-05-16 14:25+0200\n" "Last-Translator: Nicola Ruggero \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl/kcmbeagle.po b/po/nl/kcmbeagle.po index 24c124c..6c1e777 100644 --- a/po/nl/kcmbeagle.po +++ b/po/nl/kcmbeagle.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-10-27 08:41+0200\n" "PO-Revision-Date: 2006-10-29 20:35+0100\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl/kerry.po b/po/nl/kerry.po index 45b685e..9da8c85 100644 --- a/po/nl/kerry.po +++ b/po/nl/kerry.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2006-11-21 08:45+0100\n" "PO-Revision-Date: 2006-11-27 00:12+0100\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt/kcmbeagle.po b/po/pt/kcmbeagle.po index 56b612b..7685380 100644 --- a/po/pt/kcmbeagle.po +++ b/po/pt/kcmbeagle.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2006-10-27 08:41+0200\n" "PO-Revision-Date: 2006-10-27 14:18+0100\n" "Last-Translator: José Nuno Coelho Pires \n" -"Language-Team: pt \n" +"Language-Team: pt \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"