November 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kdewebdev4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdewebdev4 checked in at Fri Nov 2 01:30:15 CET 2007. -------- --- KDE/kdewebdev4/kdewebdev4.changes 2007-10-02 16:06:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdewebdev4/kdewebdev4.changes 2007-11-01 13:06:19.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 13:06:19 CET 2007 - dmueller(a)suse.de + +- update to 3.95.0.svn731649 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.Rok477/_old 2007-11-02 01:29:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Rok477/_new 2007-11-02 01:29:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdewebdev4 (Version 3.94.0.svn725623) +# spec file for package kdewebdev4 (Version 3.95.0.svn731649) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/GUI/KDE Summary: kdewebdev base package Url: http://quanta.sf.net -Version: 3.94.0.svn725623 +Version: 3.95.0.svn731649 Release: 1 Source0: kdewebdev.tar.bz2 Source1: _upstream @@ -316,6 +316,8 @@ %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- update to 3.95.0.svn731649 * Tue Oct 02 2007 - stbinner(a)suse.de - update to 3.93.0.svn720129 * Wed Sep 26 2007 - stbinner(a)suse.de ++++++ kdewebdev.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/cmake/modules/FindLibTidy.cmake new/kdewebdev/cmake/modules/FindLibTidy.cmake --- old/kdewebdev/cmake/modules/FindLibTidy.cmake 2007-08-07 22:28:57.000000000 +0200 +++ new/kdewebdev/cmake/modules/FindLibTidy.cmake 2007-10-31 18:45:58.000000000 +0100 @@ -55,6 +55,8 @@ else (LIBTIDY_FOUND) if (LibTidy_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find LIBTIDY") + else (LibTidy_FIND_REQUIRED) + message(STATUS "Could NOT find LIBTIDY") endif (LibTidy_FIND_REQUIRED) endif (LIBTIDY_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/CMakeLists.txt new/kdewebdev/CMakeLists.txt --- old/kdewebdev/CMakeLists.txt 2007-06-07 15:16:57.000000000 +0200 +++ new/kdewebdev/CMakeLists.txt 2007-10-31 18:47:58.000000000 +0100 @@ -6,12 +6,14 @@ include (KDE4Defaults) include (MacroLibrary) include (MacroOptionalAddSubdirectory) -include (FindKDevPlatform) +include (FindKDevPlatform OPTIONAL) include (ConfigureChecks.cmake) find_package(LibXml2 REQUIRED) find_package(LibXslt REQUIRED) + macro_optional_find_package(LibTidy) +macro_bool_to_01(LIBTIDY_FOUND HAVE_LIBTIDY) add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_definitions( ${QT_QTDBUS_DEFINITIONS} ${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) @@ -21,10 +23,7 @@ include_directories( ${KDEWIN32_INCLUDES} ) endif(WIN32) -if(LIBTIDY_FOUND) - macro_optional_add_subdirectory(klinkstatus) -endif(LIBTIDY_FOUND) - +macro_optional_add_subdirectory(klinkstatus) macro_optional_add_subdirectory(kfilereplace) macro_optional_add_subdirectory(kxsldbg) macro_optional_add_subdirectory(kimagemapeditor) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplacepart.cpp new/kdewebdev/kfilereplace/kfilereplacepart.cpp --- old/kdewebdev/kfilereplace/kfilereplacepart.cpp 2007-10-05 11:14:03.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplacepart.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -831,7 +831,7 @@ { KConfigGroup cg( m_config,"Directories"); #if KDE_IS_VERSION(3,1,3) - QString locationsEntryList = cg.readPathEntry(rcDirectoriesList); + QString locationsEntryList = cg.readPathEntry(rcDirectoriesList, QString()); #else QString locationsEntryList = cg.readEntry(rcDirectoriesList); #endif @@ -846,7 +846,7 @@ { KConfigGroup cg( m_config,"Filters"); #if KDE_IS_VERSION(3,1,3) - QString filtersEntryList = cg.readPathEntry(rcFiltersList); + QString filtersEntryList = cg.readPathEntry(rcFiltersList, QString()); #else QString filtersEntryList = cg.readEntry(rcFiltersList); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplacepart.desktop new/kdewebdev/kfilereplace/kfilereplacepart.desktop --- old/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-09-27 11:36:06.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-10-20 08:46:52.000000000 +0200 @@ -69,7 +69,7 @@ GenericName[is]=Texta útskiptingarsýn GenericName[it]=Vista di sostituzione file GenericName[ja]=ファイル置換ビュー -GenericName[lt]=Keitimų bylose vaizdas +GenericName[lt]=Keitimų failuose vaizdas GenericName[ms]=Paparan Ganti Fail GenericName[nds]=Datei-Utwesselansicht GenericName[ne]=फाइल बदल्ने दृश्य diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/koptionsdlg.cpp new/kdewebdev/kfilereplace/koptionsdlg.cpp --- old/kdewebdev/kfilereplace/koptionsdlg.cpp 2007-10-06 06:35:35.000000000 +0200 +++ new/kdewebdev/kfilereplace/koptionsdlg.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -105,19 +105,17 @@ void KOptionsDlg::slotChbConfirmStrings(bool b) { - KConfigGroup grp(m_config, m_config->group()); + KConfigGroup grp(m_config, "Notification Messages"); if(b) { m_chbShowConfirmDialog->setEnabled(true); m_chbShowConfirmDialog->setChecked(true); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcDontAskAgain,"no"); } else { m_chbShowConfirmDialog->setEnabled(false); m_chbShowConfirmDialog->setChecked(false); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcDontAskAgain,"yes"); } } @@ -125,7 +123,6 @@ void KOptionsDlg::slotChbShowConfirmDialog(bool b) { KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); if(b) { grp.writeEntry(rcDontAskAgain,"no"); @@ -141,7 +138,6 @@ { m_config->sync(); KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); m_option->m_notifyOnErrors = grp.readEntry(rcNotifyOnErrors, true); QString dontAskAgain = grp.readEntry(rcDontAskAgain, QString("no")); @@ -216,7 +212,6 @@ m_option->m_notifyOnErrors = m_chbNotifyOnErrors->isChecked(); KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcNotifyOnErrors, m_option->m_notifyOnErrors); m_config->sync(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/CMakeLists.txt new/kdewebdev/kimagemapeditor/CMakeLists.txt --- old/kdewebdev/kimagemapeditor/CMakeLists.txt 2007-07-29 14:46:59.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/CMakeLists.txt 2007-10-24 10:00:41.000000000 +0200 @@ -25,7 +25,7 @@ set_target_properties(kimagemapeditor_bin PROPERTIES OUTPUT_NAME kimagemapeditor) -target_link_libraries(kimagemapeditor_bin ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor_bin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor_bin DESTINATION ${BIN_INSTALL_DIR} ) @@ -39,7 +39,7 @@ -target_link_libraries(kimagemapeditor ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp --- old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-10-05 11:14:03.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -401,9 +401,9 @@ } void KImageMapEditor::openLastURL(const KConfigGroup & config) { - KUrl lastURL ( config.readPathEntry("lastopenurl") ); + KUrl lastURL ( config.readPathEntry("lastopenurl", QString()) ); QString lastMap = config.readEntry("lastactivemap"); - QString lastImage = config.readPathEntry("lastactiveimage"); + QString lastImage = config.readPathEntry("lastactiveimage", QString()); // kDebug() << "loading from group : " << config.group(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/actionmanager.cpp new/kdewebdev/klinkstatus/src/actionmanager.cpp --- old/kdewebdev/klinkstatus/src/actionmanager.cpp 2007-10-10 15:45:27.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/actionmanager.cpp 2007-11-01 02:52:15.000000000 +0100 @@ -107,7 +107,7 @@ action = d->actionCollection->addAction( "close_tab" ); action->setText(i18n("Close Session")); - action->setIcon(KIcon("tab-remove") ); + action->setIcon(KIcon("tab-close") ); action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Close)); connect(action, SIGNAL(triggered(bool) ), d->part, SLOT(slotClose())); action->setEnabled(false); @@ -155,13 +155,13 @@ // *************** View menu ********************* // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget - KToggleAction *toggle_action = new KToggleAction(KIcon("goto-page"), i18n("&Follow last Link checked"), this); + KToggleAction *toggle_action = new KToggleAction(KIcon("go-jump"), i18n("&Follow last Link checked"), this); toggle_action->setToolTip("Follow last Link checked (slower)"); actionCollection()->addAction("follow_last_link_checked", toggle_action ); connect(toggle_action, SIGNAL(triggered(bool)), d->tabWidgetSession, SLOT(slotFollowLastLinkChecked())); toggle_action->setShortcut(KShortcut("Ctrl+f")); toggle_action->setChecked(KLSConfig::followLastLinkChecked()); - KGuiItem item(i18n("&Do not follow last Link checked"), "goto-page", "Do not follow last Link checked (faster)"); + KGuiItem item(i18n("&Do not follow last Link checked"), "go-jump", "Do not follow last Link checked (faster)"); toggle_action->setCheckedState(item); // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget @@ -272,7 +272,7 @@ // *************** Toolbar ********************* - d->gotoViewAction = new KToolBarPopupAction(KIcon("file-import"), "", this); + d->gotoViewAction = new KToolBarPopupAction(KIcon("view-choose"), "", this); actionCollection()->addAction("next_view_list", d->gotoViewAction); // action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Back)); d->gotoViewAction->setToolTip("Change View"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/CMakeLists.txt new/kdewebdev/klinkstatus/src/CMakeLists.txt --- old/kdewebdev/klinkstatus/src/CMakeLists.txt 2007-09-03 18:23:16.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/CMakeLists.txt 2007-11-01 00:43:21.000000000 +0100 @@ -22,10 +22,6 @@ ${CMAKE_SOURCE_DIR}/klinkstatus/src/engine/interfaces/isearchmanager.cpp ) -set(libtidy_SRCS - ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp -) - set(libui_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/documentrootdialog.cpp ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/klshistorycombo.cpp @@ -49,12 +45,14 @@ ${CMAKE_BINARY_DIR}/klinkstatus/src ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} - ${LIBTIDY_INCLUDE_DIR} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/threadweaver ${QT_INCLUDES} ) +if(LIBTIDY_FOUND) + include_directories(${LIBTIDY_INCLUDE_DIR}) +endif(LIBTIDY_FOUND) ########### next target ############### @@ -62,7 +60,6 @@ ${libutils_SRCS} ${libparser_SRCS} ${libengine_SRCS} - ${libtidy_SRCS} ${libuisettings_SRCS} ${libui_SRCS} global.cpp @@ -71,6 +68,11 @@ klsfactory.cpp ) +if(LIBTIDY_FOUND) + set(libtidy_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp) + set(klinkstatuspart_PART_SRCS ${klinkstatuspart_PART_SRCS} ${libtidy_SRCS}) +endif(LIBTIDY_FOUND) + kde4_add_ui_files(klinkstatuspart_PART_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/sessionwidgetbase.ui ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/unreferreddocumentswidget.ui @@ -92,7 +94,6 @@ target_link_libraries(klinkstatuspart ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} - ${LIBTIDY_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS} @@ -100,6 +101,11 @@ ${KDE4_THREADWEAVER_LIBRARY} ) +if(LIBTIDY_FOUND) + target_link_libraries(klinkstatuspart ${LIBTIDY_LIBRARIES}) +endif(LIBTIDY_FOUND) + + install(TARGETS klinkstatuspart DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES engine/interfaces/org.kdewebdev.klinkstatus.ISearchManager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp new/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp --- old/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp 2007-05-11 12:08:18.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -58,7 +58,7 @@ void ISearchManager::initSearchManager(SearchManager* searchManager, QString const& optionsFilePath) { - KConfig config(optionsFilePath, KConfig::OnlyLocal); + KConfig config(optionsFilePath, KConfig::SimpleConfig); KConfigGroup group = config.group(QString()); KUrl url(group.readEntry("URL")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/linkstatus.h new/kdewebdev/klinkstatus/src/engine/linkstatus.h --- old/kdewebdev/klinkstatus/src/engine/linkstatus.h 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/linkstatus.h 2007-10-31 18:44:33.000000000 +0100 @@ -30,7 +30,9 @@ class QDomElement; #include "parser/http.h" +#ifdef HAVE_LIBTIDY #include "tidy/markupvalidator.h" +#endif class Node; class TreeView; class TreeViewItem; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp new/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp --- old/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp 2007-04-26 18:38:56.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp 2007-11-01 02:52:15.000000000 +0100 @@ -22,7 +22,7 @@ #include <kcharsets.h> -#include <qdom.h> +#include <QDomElement> #include <QSet> @@ -203,10 +203,12 @@ void LinkStatusHelper::validateMarkup(LinkStatus* linkstatus) { +#ifdef HAVE_LIBTIDY Tidy::MarkupValidator markup_validator(linkstatus->absoluteUrl(), linkstatus->docHtml()); markup_validator.validate(); (linkstatus->tidy_info_).has_errors = markup_validator.hasErrors(); (linkstatus->tidy_info_).has_warnings = markup_validator.hasWarnings(); // tidy_messages_ = markup_validator.messages(); +#endif } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/global.cpp new/kdewebdev/klinkstatus/src/global.cpp --- old/kdewebdev/klinkstatus/src/global.cpp 2007-08-27 20:29:15.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/global.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -26,7 +26,6 @@ #include <kdebug.h> #include <kapplication.h> -#include <k3staticdeleter.h> #include <kurl.h> #include <KStatusBar> #include <kparts/statusbarextension.h> @@ -35,42 +34,49 @@ #include <sys/types.h> #include <unistd.h> +class GlobalPrivate : public QObject +{ + Q_OBJECT +public: + GlobalPrivate(); + + void setKLinkStatusPart(ReadOnlyPart* part); + KStatusBar* statusBar() const; +// static ReadOnlyPart* getKLinkStatusPart(); + +// static StatusBarExtension* getStatusBarExtension(); -Global* Global::m_self_ = 0; -ReadOnlyPart* Global::m_klinkStatusPart = 0; -StatusBarExtension* Global::m_statusBarExtension = 0; + void setStatusBarText(QString const& text, bool permanent = false); + void addStatusBarPermanentItem(QWidget* widget); -static K3StaticDeleter<Global> staticDeleter; +private slots: + void slotRemoveStatusBarLabel(); + void slotStatusBarTimeout(); + +private: + static ReadOnlyPart* m_klinkStatusPart; + static StatusBarExtension* m_statusBarExtension; + QLabel* m_statusBarLabel; + // This timer is a workaround for cleaning the temporary messages of tree items (statusTip) + // which sometimes don't get hidden + QTimer m_statusBarTimer; +}; +ReadOnlyPart* GlobalPrivate::m_klinkStatusPart = 0; +StatusBarExtension* GlobalPrivate::m_statusBarExtension = 0; -Global* Global::self() -{ - if (!m_self_) - { - staticDeleter.setObject(m_self_, new Global()); - } +K_GLOBAL_STATIC(GlobalPrivate, global_instance) - return m_self_; -} - -Global::Global(QObject *parent) - : QObject(parent), m_statusBarLabel(0) +GlobalPrivate::GlobalPrivate() + : QObject(0), m_statusBarLabel(0) { - m_self_ = this; - connect(&m_statusBarTimer, SIGNAL(timeout()), this, SLOT(slotStatusBarTimeout())); m_statusBarTimer.start(1500); } -Global::~Global() -{ - if(m_self_ == this) - staticDeleter.setObject(m_self_, 0, false); -} - -void Global::setKLinkStatusPart(ReadOnlyPart* part) +void GlobalPrivate::setKLinkStatusPart(ReadOnlyPart* part) { m_klinkStatusPart = part; @@ -80,7 +86,13 @@ m_statusBarLabel = new QLabel(statusBar()); } -KStatusBar* Global::statusBar() const + +void Global::setKLinkStatusPart(ReadOnlyPart* part) +{ + global_instance->setKLinkStatusPart(part); +} + +KStatusBar* GlobalPrivate::statusBar() const { if(!m_statusBarExtension) return 0; @@ -88,7 +100,13 @@ return m_statusBarExtension->statusBar(); } -void Global::setStatusBarText(QString const& text, bool permanent) + +KStatusBar* Global::statusBar() +{ + return global_instance->statusBar(); +} + +void GlobalPrivate::setStatusBarText(QString const& text, bool permanent) { if(!m_statusBarExtension) return; @@ -102,7 +120,13 @@ QTimer::singleShot(1000 * 3, this, SLOT(slotRemoveStatusBarLabel())); } -void Global::addStatusBarPermanentItem(QWidget* widget) + +void Global::setStatusBarText(QString const& text, bool permanent) +{ + global_instance->setStatusBarText(text, permanent); +} + +void GlobalPrivate::addStatusBarPermanentItem(QWidget* widget) { if(!m_statusBarExtension) return; @@ -110,12 +134,19 @@ m_statusBarExtension->addStatusBarItem(widget, 0, true); } -void Global::slotRemoveStatusBarLabel() + +void Global::addStatusBarPermanentItem(QWidget* widget) +{ + global_instance->addStatusBarPermanentItem(widget); +} + +void GlobalPrivate::slotRemoveStatusBarLabel() { m_statusBarExtension->removeStatusBarItem(m_statusBarLabel); } -void Global::slotStatusBarTimeout() + +void GlobalPrivate::slotStatusBarTimeout() { m_statusBarExtension->statusBar()->clearMessage(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/global.h new/kdewebdev/klinkstatus/src/global.h --- old/kdewebdev/klinkstatus/src/global.h 2007-03-31 15:27:39.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/global.h 2007-10-31 16:32:57.000000000 +0100 @@ -36,37 +36,14 @@ /** @author Paulo Moura Guedes */ -class Global : public QObject +class Global { - Q_OBJECT public: - static Global* self(); - ~Global(); - - void setKLinkStatusPart(ReadOnlyPart* part); - KStatusBar* statusBar() const; -// static ReadOnlyPart* getKLinkStatusPart(); - -// static StatusBarExtension* getStatusBarExtension(); + static void setKLinkStatusPart(ReadOnlyPart* part); + static KStatusBar* statusBar(); - void setStatusBarText(QString const& text, bool permanent = false); - void addStatusBarPermanentItem(QWidget* widget); - -private slots: - void slotRemoveStatusBarLabel(); - void slotStatusBarTimeout(); - -private: - Global(QObject *parent = 0); - -private: - static Global* m_self_; - static ReadOnlyPart* m_klinkStatusPart; - static StatusBarExtension* m_statusBarExtension; - QLabel* m_statusBarLabel; - // This timer is a workaround for cleaning the temporary messages of tree items (statusTip) - // which sometimes don't get hidden - QTimer m_statusBarTimer; + static void setStatusBarText(QString const& text, bool permanent = false); + static void addStatusBarPermanentItem(QWidget* widget); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/klinkstatus_part.cpp new/kdewebdev/klinkstatus/src/klinkstatus_part.cpp --- old/kdewebdev/klinkstatus/src/klinkstatus_part.cpp 2007-09-24 16:45:05.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/klinkstatus_part.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -73,7 +73,7 @@ openURL(KUrl("")); - Global::self()->setKLinkStatusPart(this); + Global::setKLinkStatusPart(this); } KLinkStatusPart::~KLinkStatusPart() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp new/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp --- old/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp 2007-10-01 17:12:50.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp 2007-10-20 01:11:41.000000000 +0200 @@ -67,7 +67,7 @@ QToolButton* clearButton = new QToolButton(this); clearButton->setIcon(KIcon(QApplication::layoutDirection() == Qt::RightToLeft ? - "locationbar-erase" : "locationbar-erase")); + "edit-clear-locationbar-rtl" : "edit-clear-locationbar")); clearButton->setAutoRaise(true); d->layout->addWidget(clearButton); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp new/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp --- old/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -460,7 +460,7 @@ resetPendingActions(); emit signalUpdateActions(); - Global::self()->setStatusBarText(i18n("Finished checking") + ' ' + Global::setStatusBarText(i18n("Finished checking") + ' ' + combobox_url->currentText(), false); emit signalSearchFinnished(); @@ -498,7 +498,7 @@ resetPendingActions(); emit signalUpdateActions(); - Global::self()->setStatusBarText(i18n("Paused"), false); + Global::setStatusBarText(i18n("Paused"), false); emit signalSearchPaused(); } @@ -688,7 +688,7 @@ resetPendingActions(); - Global::self()->setStatusBarText(i18n("Resuming"), false); + Global::setStatusBarText(i18n("Resuming"), false); } } @@ -778,7 +778,7 @@ textlabel_elapsed_time_value->setText(QTime(0, 0).toString("hh:mm:ss")); elapsed_time_timer_.start(); - Global::self()->setStatusBarText(i18n("Checking") + ' ' + combobox_url->currentText(), false); + Global::setStatusBarText(i18n("Checking") + ' ' + combobox_url->currentText(), false); } void SessionWidget::slotLinkRecheck(LinkStatus* ls) @@ -806,7 +806,7 @@ kError(23100) << "Is redirection: " << ls->isRedirection() << endl; } if(!in_progress_) - Global::self()->setStatusBarText(i18n("Done rechecking ") + ls->absoluteUrl().prettyUrl()); + Global::setStatusBarText(i18n("Done rechecking ") + ls->absoluteUrl().prettyUrl()); } KUrl const& SessionWidget::urlToCheck() const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp new/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp --- old/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp 2007-10-22 02:11:17.000000000 +0200 @@ -63,7 +63,7 @@ tabs_close_ = new QToolButton(this); tabs_close_->setShortcut(QKeySequence("Ctrl+W")); connect(tabs_close_, SIGNAL(clicked()), this, SLOT(closeSession())); - tabs_close_->setIcon(KIcon("tab-remove")); + tabs_close_->setIcon(KIcon("tab-close")); tabs_close_->adjustSize(); tabs_close_->setToolTip(i18n("Close the current tab")); setCornerWidget(tabs_close_, Qt::TopRightCorner); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/treeview.cpp new/kdewebdev/klinkstatus/src/ui/treeview.cpp --- old/kdewebdev/klinkstatus/src/ui/treeview.cpp 2007-10-12 16:08:35.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/treeview.cpp 2007-10-31 18:44:33.000000000 +0100 @@ -38,7 +38,9 @@ #include "engine/linkstatus.h" #include "engine/linkfilter.h" +#ifdef HAVE_LIBTIDY #include "tidy/markupvalidator.h" +#endif #include "global.h" #include "klsconfig.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/editor/functionsimpl.cpp new/kdewebdev/kommander/editor/functionsimpl.cpp --- old/kdewebdev/kommander/editor/functionsimpl.cpp 2007-07-18 16:28:25.000000000 +0200 +++ new/kdewebdev/kommander/editor/functionsimpl.cpp 2007-10-20 01:11:41.000000000 +0200 @@ -38,7 +38,7 @@ bool a_modal) : FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList) { - clearButton->setPixmap(KIconLoader::global()->loadIcon("locationbar-erase", KIcon::Toolbar)); + clearButton->setPixmap(KIconLoader::global()->loadIcon("edit-clear-locationbar", KIcon::Toolbar)); copyButton->setPixmap(KIconLoader::global()->loadIcon("arrow-down", KIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/x-kommander.desktop new/kdewebdev/kommander/x-kommander.desktop --- old/kdewebdev/kommander/x-kommander.desktop 2007-09-21 08:29:13.000000000 +0200 +++ new/kdewebdev/kommander/x-kommander.desktop 2007-10-20 08:46:52.000000000 +0200 @@ -19,7 +19,7 @@ Comment[is]=Kommander skrá Comment[it]=File di Kommander Comment[ja]=Kommander ファイル -Comment[lt]=Kommander byla +Comment[lt]=Kommander failas Comment[ms]=Fail Kommander Comment[nds]=Kommander-Datei Comment[ne]=कमाण्डर फाइल diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/CMakeLists.txt new/kdewebdev/kxsldbg/CMakeLists.txt --- old/kdewebdev/kxsldbg/CMakeLists.txt 2007-07-23 09:16:40.000000000 +0200 +++ new/kdewebdev/kxsldbg/CMakeLists.txt 2007-10-25 09:57:29.000000000 +0200 @@ -103,7 +103,7 @@ kde4_add_executable(kxsldbg ${kxsldbg_SRCS}) -target_link_libraries(kxsldbg ktexteditor exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kxsldbg ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kxsldbg DESTINATION ${BIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt new/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt --- old/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt 2007-10-25 09:57:29.000000000 +0200 @@ -21,7 +21,7 @@ -target_link_libraries(kxsldbgpart ktexteditor exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kxsldbgpart ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kxsldbgpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp new/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp --- old/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp 2007-08-19 16:06:51.000000000 +0200 +++ new/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp 2007-10-21 23:40:12.000000000 +0200 @@ -142,7 +142,7 @@ connect(action, SIGNAL(triggered(bool)), SLOT(stepCmd_activated())); action->setShortcut(QKeySequence(Qt::Key_F8)); - action = new KAction(KIcon("find-next"), i18n("Next"), this); + action = new KAction(KIcon("edit-find-next"), i18n("Next"), this); actionCollection()->addAction("nextCmd", action ); connect(action, SIGNAL(triggered(bool)), SLOT(nextCmd_activated())); action->setShortcut(QKeySequence(Qt::Key_F10)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/data/config/quanta_preview_config.desktop new/kdewebdev/quanta/data/config/quanta_preview_config.desktop --- old/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-10-09 07:47:33.000000000 +0200 +++ new/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-10-16 00:24:08.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Service -Exec=kcmshell --caption %c %i khtml_behavior khtml_java_js khtml_fonts cookies cache proxy kcmcss crypto useragent khtml_plugins +Exec=kcmshell4 --caption %c %i khtml_behavior khtml_java_js khtml_fonts cookies cache proxy kcmcss crypto useragent khtml_plugins Icon=konqueror DocPath=konqueror/index.html Name=Configure KHTML Browser Part diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/lib/basetreeview.cpp new/kdewebdev/quanta/lib/basetreeview.cpp --- old/kdewebdev/quanta/lib/basetreeview.cpp 2007-10-01 12:29:42.000000000 +0200 +++ new/kdewebdev/quanta/lib/basetreeview.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -959,7 +959,7 @@ int maxBranch = configGroup.readEntry("NumOpenFolderList", 0); for (int i = 1; i <= maxBranch; ++i) { - QStringList folderList = configGroup.readPathListEntry("OpenFolderList" + QString::number(i)); + QStringList folderList = configGroup.readPathEntry("OpenFolderList" + QString::number(i), QStringList()); if (folderList.count() > 1) { KUrl rootURL = folderList.takeFirst(); // remove the root URL KFileTreeBranchIterator it( branches() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/lib/CMakeLists.txt new/kdewebdev/quanta/lib/CMakeLists.txt --- old/kdewebdev/quanta/lib/CMakeLists.txt 2007-07-23 09:16:40.000000000 +0200 +++ new/kdewebdev/quanta/lib/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -40,7 +40,7 @@ kde4_add_library(kdevquanta SHARED ${kdevquanta_LIB_SRCS}) -target_link_libraries(kdevquanta kdevplatforminterfaces kdevplatformshell kdevplatformeditor ktexteditor ${KDE4_KFILE_LIBS}) +target_link_libraries(kdevquanta kdevplatforminterfaces kdevplatformshell kdevplatformeditor ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS}) set_target_properties(kdevquanta PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install(TARGETS kdevquanta DESTINATION ${LIB_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/filestree/CMakeLists.txt new/kdewebdev/quanta/plugins/filestree/CMakeLists.txt --- old/kdewebdev/quanta/plugins/filestree/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/filestree/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -25,7 +25,7 @@ -target_link_libraries(kdevquantafilestree kdevquanta kdevplatforminterfaces kde3support ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kdevquantafilestree kdevquanta kdevplatforminterfaces ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ) install(TARGETS kdevquantafilestree DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/filestree/filestreeview.cpp new/kdewebdev/quanta/plugins/filestree/filestreeview.cpp --- old/kdewebdev/quanta/plugins/filestree/filestreeview.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/filestree/filestreeview.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -64,7 +64,6 @@ FilesTreeView::~FilesTreeView() { - m_config->setGroup(metaObject()->className()); KConfigGroup configGroup(m_config, metaObject()->className()); configGroup.writePathEntry("Top folders", topURLAliases.keys()); configGroup.writePathEntry("Top folder aliases", topURLAliases.values()); @@ -299,10 +298,9 @@ void FilesTreeView::restoreBranches() { - m_config->setGroup(metaObject()->className()); KConfigGroup configGroup(m_config, metaObject()->className()); - QStringList topStrList = configGroup.readPathListEntry("Top folders"); - QStringList topStrAliasList = configGroup.readPathListEntry("Top folder aliases"); + QStringList topStrList = configGroup.readPathEntry("Top folders", QStringList()); + QStringList topStrAliasList = configGroup.readPathEntry("Top folder aliases", QStringList()); for (int i = 0; i < topStrList.count(); i++) { if (i < topStrAliasList.count()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/preview/CMakeLists.txt new/kdewebdev/quanta/plugins/preview/CMakeLists.txt --- old/kdewebdev/quanta/plugins/preview/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/preview/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -24,7 +24,7 @@ -target_link_libraries(kdevhtmlpreview kdevplatforminterfaces kdevplatformshell ktexteditor ${KDE4_KHTML_LIBS} ) +target_link_libraries(kdevhtmlpreview kdevplatforminterfaces kdevplatformshell ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kdevhtmlpreview DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt new/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt --- old/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -28,7 +28,7 @@ -target_link_libraries(kdevstructuretree kdevquanta kdevplatforminterfaces kde3support ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kdevstructuretree kdevquanta kdevplatforminterfaces ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ) install(TARGETS kdevstructuretree DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp new/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp --- old/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -199,15 +199,14 @@ addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); - KConfigGroup grp(dtdConfig, "General"); - dtdConfig->setGroup("General"); + KConfig dtdConfig(dtdTag->parentDTD->fileName); + KConfigGroup grp(&dtdConfig, "General"); int numOfPages = grp.readEntry("NumOfPages", 0); extraPageList = new QList<Tagxml*>; for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(QString("Page%1").arg(i)); + grp.changeGroup(QString("Page%1").arg(i)); QString title = grp.readEntry("Title"); QStringList groupList = grp.readEntry("Groups", QStringList()); QDomDocument extraDoc; //build an internal tag XML for the groups diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp new/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp --- old/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -131,11 +131,10 @@ } if (dotFileInfo.exists()) { - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); QString s = grp.readEntry("Type"); tvi->setText(1, typeToi18n[s]); - delete config; } } @@ -532,14 +531,13 @@ QFileInfo dotFileInfo(QFileInfo(startDir).path() + "/.dirinfo"); - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); dirInfo.mimeType = grp.readEntry("Type"); dirInfo.preText = grp.readEntry("PreText"); dirInfo.postText = grp.readEntry("PostText"); dirInfo.usePrePostText = grp.readEntry("UsePrePostText", false); - delete config; return dirInfo; } @@ -565,15 +563,14 @@ QFileInfo dotFileInfo(QFileInfo(startDir).path()+"/.dirinfo"); bool success = false; - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); grp.writeEntry("Type", m_dirInfo.mimeType); grp.writeEntry("PreText", m_dirInfo.preText); grp.writeEntry("PostText", m_dirInfo.postText); grp.writeEntry("UsePrePostText", m_dirInfo.usePrePostText); - config->sync(); + config.sync(); success = true; - delete config; return success; } @@ -662,7 +659,6 @@ QString name = url.path() + TMPL; KConfig config(name); KConfigGroup grp(&config, "Filtering"); - config.setGroup("Filtering"); name = grp.readEntry("Action", NONE); if ( name == NONE ) name = i18n(NONE); @@ -870,7 +866,6 @@ QString fileName = currentUrl().path() + TMPL; KConfig config(fileName); KConfigGroup grp(&config, "Filtering"); - config.setGroup("Filtering"); if ( m_quantaProperties->actionCombo->currentText() == i18n(NONE) ) grp.writeEntry("Action", NONE); else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp --- old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp 2007-08-05 14:00:06.000000000 +0200 +++ new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp 2007-10-29 13:03:06.000000000 +0100 @@ -29,7 +29,7 @@ // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) static void silenceQToolBar(QtMsgType, const char *){} -QWidget *ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, int &id) +QWidget *ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, QAction* &action) { // kDebug(24000) << "createContainer: this=" << this << " parent=" << parent; QWidget *container = 0L; @@ -74,7 +74,7 @@ if (m_separateToolbars) { - container = KXMLGUIBuilder::createContainer(parent, index, element, id); + container = KXMLGUIBuilder::createContainer(parent, index, element, action); static_cast<KToolBar*>(container)->setWindowTitle(i18n(tabname.toUtf8())); toolbarTab->parentWidget()->parentWidget()->hide(); } else @@ -83,7 +83,7 @@ } } else { - container = KXMLGUIBuilder::createContainer(parent, index, element, id); + container = KXMLGUIBuilder::createContainer(parent, index, element, action); } // kDebug(24000) << "container " << element.attribute("name") << " created: " << container; @@ -98,7 +98,7 @@ return container; } -void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id) +void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, QAction* action) { QString s; QTextStream str(&s, IO_ReadWrite); @@ -120,7 +120,7 @@ if (tb) { if (tb->separate()) - KXMLGUIBuilder::removeContainer(container, parent, element, id); + KXMLGUIBuilder::removeContainer(container, parent, element, action); toolbarTab->removePage(tb); if (toolbarTab->count() == 0 && toolbarTab->parentWidget()->parentWidget()) toolbarTab->parentWidget()->parentWidget()->hide(); @@ -128,6 +128,6 @@ } } - KXMLGUIBuilder::removeContainer(container, parent, element, id); + KXMLGUIBuilder::removeContainer(container, parent, element, action); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h --- old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h 2005-11-13 21:24:52.000000000 +0100 +++ new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h 2007-10-29 13:03:06.000000000 +0100 @@ -17,17 +17,17 @@ /** Builder for the toolbar XML gui client objects. It handles putting and removing the toolbar - on a tabwidget inside a toolbar. + on a tabwidget inside a toolbar. @author Andras Mantia <amantia(a)kde.org> */ -class ToolbarGUIBuilder:public KXMLGUIBuilder +class ToolbarGUIBuilder:public KXMLGUIBuilder { public: /** * The builder is a singleton. You can access it via this method. - * @param widget the argument passes to the KXMLGUIBuilder constructor + * @param widget the argument passes to the KXMLGUIBuilder constructor * @return a pointer to the KXMLGUIBuilder object */ static ToolbarGUIBuilder* const ref(QWidget *widget = 0L) @@ -36,18 +36,18 @@ if (!m_ref) m_ref = new ToolbarGUIBuilder(widget); return m_ref; } - + /** - * Called when a new XML gui client is added to the gui factory. - * Reimplemented from KXMLGUIBuilder in order to create the toolbar inside + * Called when a new XML gui client is added to the gui factory. + * Reimplemented from KXMLGUIBuilder in order to create the toolbar inside * a tabwidget, not as a standalone toolbar. */ - virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, int &id); + virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, QAction*& action); /** - * Called when a XML gui client is removed the gui factory. + * Called when a XML gui client is removed the gui factory. * Reimplemented from KXMLGUIBuilder in order to remove out customly built toolbar. */ - virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id); + virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, QAction* action); /** * Sets the toolbar mode. @@ -58,9 +58,9 @@ private: /** - * The private constructor. + * The private constructor. * @param widget passed to the KXMLGUIBuilder constructor - * @return + * @return */ ToolbarGUIBuilder(QWidget *widget):KXMLGUIBuilder(widget){ m_separateToolbars = false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp --- old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -87,7 +87,6 @@ void DTEPEditDlg::readGeneral() { KConfigGroup grp(m_config, "General"); - m_config->setGroup("General"); nameEdit->setText(grp.readEntry("Name")); nickNameEdit->setText(grp.readEntry("NickName")); m_family = grp.readEntry("Family", 1) - 1; @@ -110,8 +109,8 @@ doctypeEdit->setText(grp.readEntry("DoctypeString")); topLevel->setChecked(grp.readEntry("TopLevel", false)); - m_config->setGroup("Toolbars"); - toolbarFolderEdit->setText(grp.readPathEntry("Location")); + grp.changeGroup("Toolbars"); + toolbarFolderEdit->setText(grp.readPathEntry("Location", QString())); toolbarsEdit->setText(grp.readEntry("Names")); } @@ -122,7 +121,6 @@ while (m_config->hasGroup(QString("Page%1").arg(i)) && i < 6) { KConfigGroup grp(m_config, QString("Page%1").arg(i)); - m_config->setGroup(QString("Page%1").arg(i)); QString title = grp.readEntry("Title"); QString groups = grp.readEntry("Groups"); if (i == 1) @@ -162,7 +160,6 @@ void DTEPEditDlg::readParserRules() { KConfigGroup grp(m_config, "Extra rules"); - m_config->setGroup("Extra rules"); enableMinusInWords->setChecked(grp.readEntry("MinusAllowedInWord", false)); attributeSeparatorEdit->setText(grp.readEntry("AttributeSeparator")); tagSeparatorEdit->setText(grp.readEntry("TagSeparator")); @@ -180,7 +177,7 @@ membersAfterEdit->setText(grp.readEntry("MemberAutoCompleteAfter")); } - m_config->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); commentsEdit->setText(grp.readEntry("Comments")); mayContainEdit->setText(grp.readEntry("MayContain")); @@ -237,7 +234,6 @@ void DTEPEditDlg::writeGeneral(KConfig *config) { KConfigGroup grp(config, "General"); - config->setGroup("General"); grp.writeEntry("Name", nameEdit->text()); grp.writeEntry("NickName", nickNameEdit->text()); grp.writeEntry("Family", typeCombo->currentIndex() + 1); @@ -250,7 +246,7 @@ if (m_family == 1) grp.writeEntry("TopLevel", topLevel->isChecked()); - config->setGroup("Toolbars"); + grp.changeGroup("Toolbars"); grp.writeEntry("Location", toolbarFolderEdit->text()); grp.writeEntry("Names", toolbarsEdit->text()); } @@ -265,39 +261,39 @@ if (enablePage1->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit1->text()); grp.writeEntry("Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit2->text()); grp.writeEntry("Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit3->text()); grp.writeEntry("Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit4->text()); grp.writeEntry("Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit5->text()); grp.writeEntry("Groups", groupsEdit5->text()); } - config->setGroup("General"); + grp.changeGroup("General"); grp.writeEntry("NumOfPages", num); } } @@ -305,7 +301,6 @@ void DTEPEditDlg::writeParserRules(KConfig *config) { KConfigGroup grp(config, "Extra rules"); - config->setGroup("Extra rules"); grp.writeEntry("MinusAllowedInWord", enableMinusInWords->isChecked()); grp.writeEntry("AttributeSeparator", attributeSeparatorEdit->text()); grp.writeEntry("TagSeparator", tagSeparatorEdit->text()); @@ -323,7 +318,7 @@ grp.writeEntry("MemberAutoCompleteAfter", membersAfterEdit->text()); } - config->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); grp.writeEntry("Comments", commentsEdit->text()); grp.writeEntry("MayContain", mayContainEdit->text()); @@ -348,7 +343,6 @@ void DTEPEditDlg::readStructures() { KConfigGroup grp(m_config, "Extra rules"); - m_config->setGroup("Extra rules"); int variableGroupId = grp.readEntry("VariableGroupIndex", -1); int functionGroupId = grp.readEntry("FunctionGroupIndex", -1); int classGroupId = grp.readEntry("ClassGroupIndex", -1); @@ -358,7 +352,7 @@ while (m_config->hasGroup(QString("StructGroup_%1").arg(i))) { StructGroup group; - m_config->setGroup(QString("StructGroup_%1").arg(i)); + grp.changeGroup(QString("StructGroup_%1").arg(i)); group.name = grp.readEntry("Name"); group.noName = grp.readEntry("No_Name"); group.icon = grp.readEntry("Icon"); @@ -393,14 +387,13 @@ void DTEPEditDlg::writeStructures(KConfig *config) { KConfigGroup grp(config, "Extra rules"); - config->setGroup("Extra rules"); grp.writeEntry("StructGroupsCount", m_structGroups.count()); int i = 1; for (QList<StructGroup>::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(QString("StructGroup_%1").arg(i)); + grp.changeGroup(QString("StructGroup_%1").arg(i)); grp.writeEntry("Name", group.name); grp.writeEntry("No_Name", group.noName); grp.writeEntry("Icon", group.icon); @@ -421,22 +414,22 @@ grp.writeEntry("RemoveFromAutoCompleteWord", group.removeRx); if (group.variableGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("VariableGroupIndex", i); } else if (group.functionGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("FunctionGroupIndex", i); } else if (group.classGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("ClassGroupIndex", i); } else if (group.objectGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("ObjectGroupIndex", i); } } @@ -563,14 +556,4 @@ } } -void DTEPEditDlg::writeEntry(KConfig *config, const QString &key, const QString &value) -{ - KConfigGroup grp(config, config->group()); - if (value.isEmpty()) - grp.deleteEntry(key); - else - grp.writeEntry(key, value); -} - - #include "dtepeditdlg.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h --- old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h 2006-08-31 14:09:39.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h 2007-10-24 14:42:24.000000000 +0200 @@ -77,7 +77,6 @@ void writePages(KConfig *config); void writeParserRules(KConfig *config); void writeStructures(KConfig *config); - void writeEntry(KConfig *config, const QString &key, const QString &value); QString m_descriptionFile; KConfig *m_config; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dtds.cpp new/kdewebdev/quanta/quantacore/dtds.cpp --- old/kdewebdev/quanta/quantacore/dtds.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dtds.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -147,13 +147,11 @@ QString tmpStr = dirName + m_rcFilename; if (!QFile::exists(tmpStr)) return false; - KConfig *dtdConfig = new KConfig(tmpStr); - KConfigGroup grp(dtdConfig, "General"); - dtdConfig->setGroup("General"); + KConfig dtdConfig(tmpStr); + KConfigGroup grp(&dtdConfig, "General"); QString dtdName = grp.readEntry("Name", "Unknown"); if (m_dict->contains(dtdName.toLower())) { - delete dtdConfig; kDebug(24000) << "dtds::readTagDir from " << dirName << " canceled, DTD " << dtdName << " found in memory" << endl; return false; @@ -175,7 +173,7 @@ dtd->commonAttrs = 0L; //Read the areas that define the areas - dtdConfig->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); QStringList definitionAreaBorders = grp.readEntry("AreaBorders", QStringList()); for (int i = 0; i < definitionAreaBorders.count(); i++) { @@ -194,7 +192,6 @@ kDebug(24000) << "DTD loaded: " << dtdName << " pointer " << dtd; m_dict->insert(dtdName.toLower(), dtd); //insert the structure into the dictionary - delete dtdConfig; if (!loadAll) { @@ -218,10 +215,9 @@ kapp->setOverrideCursor( QCursor(Qt::WaitCursor) ); - KConfig *dtdConfig = new KConfig(dtd->fileName); - KConfigGroup grp(dtdConfig, "General"); + KConfig dtdConfig(dtd->fileName); + KConfigGroup grp(&dtdConfig, "General"); //read the general DTD info - dtdConfig->setGroup("General"); dtd->commonAttrs = new AttributeListDict(); bool caseSensitive = grp.readEntry("CaseSensitive", false); @@ -265,8 +261,8 @@ } //read the toolbars - dtdConfig->setGroup("Toolbars"); - tmpStr = grp.readPathEntry("Location"); //holds the location of the toolbars + grp.changeGroup("Toolbars"); + tmpStr = grp.readPathEntry("Location", QString()); //holds the location of the toolbars if (!tmpStr.endsWith('/') && !tmpStr.isEmpty()) { tmpStr.append('/'); @@ -278,7 +274,7 @@ } //read the extra tags and their attributes - dtdConfig->setGroup("Extra tags"); + grp.changeGroup("Extra tags"); dtd->defaultAttrType = grp.readEntry("DefaultAttrType","input"); QStringList extraTagsList = grp.readEntry("List", QStringList()); QString option; @@ -344,7 +340,7 @@ /**** Code for the new parser *****/ - dtdConfig->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); //Which DTD can be present in this one? dtd->insideDTDs = grp.readEntry("MayContain", QStringList()); for (int i = 0; i < dtd->insideDTDs.count(); i++) @@ -418,7 +414,7 @@ /**** End of code for the new parser *****/ //read the definition of a structure, and the structure keywords - QStringList structKeywords = grp.readEntry("StructKeywords", QStringList(), ','); + QStringList structKeywords = grp.readEntry("StructKeywords", QStringList()); if (structKeywords.count() !=0 ) { tmpStr = "\\b("; @@ -434,7 +430,7 @@ } dtd->structKeywordsRx.setPattern(tmpStr); - structKeywords = grp.readEntry("LocalScopeKeywords", QStringList(),','); + structKeywords = grp.readEntry("LocalScopeKeywords", QStringList()); if (structKeywords.count() !=0 ) { tmpStr = "\\b("; @@ -455,7 +451,7 @@ dtd->structEndStr = grp.readEntry("StructEndStr","}").trimmed(); - dtdConfig->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); dtd->minusAllowedInWord = grp.readEntry("MinusAllowedInWord", false); tmpStr = grp.readEntry("TagAutoCompleteAfter", "<").trimmed(); if (tmpStr.toUpper() == "NONE") @@ -507,7 +503,7 @@ QString tagStr; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(QString("StructGroup_%1").arg(index)); + grp.changeGroup(QString("StructGroup_%1").arg(index)); //new code group.name = grp.readEntry("Name").trimmed(); group.noName = grp.readEntry("No_Name").trimmed(); @@ -557,7 +553,7 @@ QString tagName; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(QString("StructGroup_%1").arg(index)); + grp.changeGroup(QString("StructGroup_%1").arg(index)); group.name = grp.readEntry("Name").trimmed(); group.noName = grp.readEntry("No_Name").trimmed(); group.icon = grp.readEntry("Icon").trimmed(); @@ -581,7 +577,6 @@ } } - delete dtdConfig; dtd->loaded = true; resolveInherited(dtd); kapp->restoreOverrideCursor(); @@ -881,7 +876,6 @@ QString dirName = dtdParser.dirName(); KConfig dtdcfg(dirName + m_rcFilename); KConfigGroup grp(&dtdcfg, "General"); - dtdcfg.setGroup("General"); QString dtdName = grp.readEntry("Name"); QString nickName = grp.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->value(dtdName) ; @@ -914,7 +908,6 @@ dirName += '/'; KConfig dtdcfg(dirName + m_rcFilename); KConfigGroup grp(&dtdcfg, "General"); - dtdcfg.setGroup("General"); QString dtdName = grp.readEntry("Name"); QString nickName = grp.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->value(dtdName) ; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp new/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp --- old/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -185,7 +185,6 @@ { KConfig config(DTD::dirName + "description.rc"); KConfigGroup grp(&config, "General"); - config.setGroup("General"); grp.writeEntry("Name", m_name); grp.writeEntry("NickName", m_nickName); grp.writeEntry("DoctypeString", m_doctype); @@ -193,7 +192,7 @@ grp.writeEntry("DefaultExtension", m_defaultExtension); grp.writeEntry("Family", "1"); grp.writeEntry("CaseSensitive", m_caseSensitive); - config.setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); grp.writeEntry("SpecialAreas",",<?xml ?>,<!DOCTYPE >"); grp.writeEntry("SpecialAreaNames","comment,XML PI,DTD"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdevelop4 checked in at Fri Nov 2 01:29:46 CET 2007. -------- --- KDE/kdevelop4/kdevelop4.changes 2007-10-21 10:43:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevelop4/kdevelop4.changes 2007-11-01 14:54:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 14:54:00 CET 2007 - dmueller(a)suse.de + +- update to 3.95.0.svn731662 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.r31788/_old 2007-11-02 01:29:36.000000000 +0100 +++ /var/tmp/diff_new_pack.r31788/_new 2007-11-02 01:29:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdevelop4 (Version 3.94.0.svn727388) +# spec file for package kdevelop4 (Version 3.95.0.svn731662) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ Group: Development/Tools/IDE Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME Url: http://www.kdevelop.org -Version: 3.94.0.svn727388 -Release: 2 +Version: 3.95.0.svn731662 +Release: 1 Source0: kdevelop.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -133,6 +133,8 @@ %_kde_share_dir/services/kdev* %_kde_share_dir/apps/kdevcmakebuilder %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- update to 3.95.0.svn731662 * Sun Oct 21 2007 - dmueller(a)suse.de - file list fixes * Sat Oct 20 2007 - stbinner(a)suse.de ++++++ kdevelop.tar.bz2 ++++++ ++++ 5055 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeutils4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdeutils4 checked in at Fri Nov 2 01:29:45 CET 2007. -------- --- KDE/kdeutils4/kdeutils4.changes 2007-10-26 13:37:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-11-01 00:41:10.983907000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 00:41:02 CET 2007 - dmueller(a)suse.de + +- fix free() call + +------------------------------------------------------------------- New: ---- r731538.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.S31683/_old 2007-11-02 01:29:34.000000000 +0100 +++ /var/tmp/diff_new_pack.S31683/_new 2007-11-02 01:29:34.000000000 +0100 @@ -22,13 +22,14 @@ Summary: Base Package of KDE Utility Programs Url: http://www.kde.org Version: 3.95.0 -Release: 1 +Release: 2 %define rversion 3.95.0 Source0: kdeutils-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime Patch: desktop-files.diff +Patch1: r731538.diff Suggests: kde4-ark Suggests: kde4-kcalc Suggests: kde4-kcharselect @@ -59,6 +60,7 @@ %prep %setup -q -n kdeutils-%rversion %patch +%patch1 %build %cmake_kde4 -d build @@ -613,6 +615,8 @@ %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- fix free() call * Fri Oct 26 2007 - dmueller(a)suse.de - update to KDE 4.0 beta4 * Thu Oct 18 2007 - dmueller(a)suse.de ++++++ r731538.diff ++++++ ------------------------------------------------------------------------ r731538 | mueller | 2007-11-01 00:26:33 +0100 (Thu, 01 Nov 2007) | 2 lines fix free() call ------------------------------------------------------------------------ --- ark/plugins/bk/bkRead.c +++ ark/plugins/bk/bkRead.c @@ -945,7 +945,7 @@ int readPosixFileMode(VolInfo* volInfo, rc = read(volInfo->imageForReading, suFields, lenSU); if(rc != lenSU) { - free (lenSU); + free (suFields); return BKERROR_READ_GENERIC; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdesdk4 checked in at Fri Nov 2 01:29:30 CET 2007. -------- --- KDE/kdesdk4/kdesdk4.changes 2007-10-11 11:39:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2007-10-31 23:39:31.424482000 +0100 @@ -1,0 +2,10 @@ +Wed Oct 31 23:39:16 CET 2007 - dmueller(a)suse.de + +- update to KDE 4.0 Beta4 + +------------------------------------------------------------------- +Sat Oct 20 17:58:01 CEST 2007 - dmueller(a)suse.de + +- update to 3.94.1 + +------------------------------------------------------------------- Old: ---- kdesdk-3.94.0.tar.bz2 New: ---- kdesdk-3.95.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.V27207/_old 2007-11-02 01:26:54.000000000 +0100 +++ /var/tmp/diff_new_pack.V27207/_new 2007-11-02 01:26:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdesdk4 (Version 3.94.0) +# spec file for package kdesdk4 (Version 3.95.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,14 +10,14 @@ Name: kdesdk4 -BuildRequires: db-devel flex kdebase4-devel kdebase4-workspace-devel kdepim4 subversion-devel +BuildRequires: db-devel flex kdebase4-workspace-devel subversion-devel License: GPL v2 or later Group: System/GUI/KDE Summary: kdesdk Package Url: http://www.kde.org/ -Version: 3.94.0 +Version: 3.95.0 Release: 1 -%define rversion 3.94.0 +%define rversion 3.95.0 Source0: kdesdk-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +63,8 @@ %suse_update_desktop_file kcachegrind Development Profiling %suse_update_desktop_file kate TextEditor %suse_update_desktop_file kapptemplate + # fix conflict with kdesdk3 + rm $RPM_BUILD_ROOT/usr/share/man/man1/cervisia.1 %kde_post_install %post -p /sbin/ldconfig @@ -202,7 +204,6 @@ /usr/share/icons/oxygen/*/actions/vcs_status.* /usr/share/icons/oxygen/*/actions/vcs_update.* %_kde_share_dir/services/cvsservice.desktop -/usr/share/man/man1/cervisia.1.gz %package -n kde4-kbugbuster Group: Development/Tools/Other @@ -593,6 +594,10 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/kapptemplate /usr/include/kprofilemethod.h %changelog +* Wed Oct 31 2007 - dmueller(a)suse.de +- update to KDE 4.0 Beta4 +* Sat Oct 20 2007 - dmueller(a)suse.de +- update to 3.94.1 * Thu Oct 11 2007 - dmueller(a)suse.de - udpate to KDE 4.0 Beta3 * Tue Oct 02 2007 - stbinner(a)suse.de ++++++ kdesdk-3.94.0.tar.bz2 -> kdesdk-3.95.0.tar.bz2 ++++++ ++++ 10589 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdetoys4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdetoys4 checked in at Fri Nov 2 01:29:26 CET 2007. -------- --- KDE/kdetoys4/kdetoys4.changes 2007-10-18 17:19:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdetoys4/kdetoys4.changes 2007-10-26 13:36:35.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 26 13:36:30 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 beta4 + +------------------------------------------------------------------- Old: ---- kdetoys-3.94.0.tar.bz2 New: ---- kdetoys-3.95.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.p27303/_old 2007-11-02 01:26:57.000000000 +0100 +++ /var/tmp/diff_new_pack.p27303/_new 2007-11-02 01:26:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdetoys4 (Version 3.94.0) +# spec file for package kdetoys4 (Version 3.95.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,13 +11,13 @@ Name: kdetoys4 BuildRequires: kdebase4-workspace-devel -License: GPL v2 or later; LGPL v2 or later +License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/KDE Summary: Kdetoys Base Package Url: http://www.kde.org -Version: 3.94.0 -Release: 2 -%define rversion 3.94.0 +Version: 3.95.0 +Release: 1 +%define rversion 3.95.0 Source0: kdetoys-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -259,6 +259,8 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README %changelog +* Fri Oct 26 2007 - dmueller(a)suse.de +- update to KDE 4.0 beta4 * Thu Oct 18 2007 - dmueller(a)suse.de - remove kdesktop related stuff * Thu Oct 11 2007 - dmueller(a)suse.de ++++++ kdetoys-3.94.0.tar.bz2 -> kdetoys-3.95.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/amor/amoranim.cpp new/kdetoys-3.95.0/amor/amoranim.cpp --- old/kdetoys-3.94.0/amor/amoranim.cpp 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/amor/amoranim.cpp 2007-10-25 11:32:00.000000000 +0200 @@ -157,12 +157,12 @@ delete mConfig; - mConfig = new KConfig(mPath, KConfig::OnlyLocal); + mConfig = new KConfig(mPath, KConfig::SimpleConfig); KConfigGroup configGroup(mConfig, "Config"); // Get the directory where the pixmaps are stored and tell the // pixmap manager. - QString pixmapPath = configGroup.readPathEntry("PixmapPath"); + QString pixmapPath = configGroup.readPathEntry("PixmapPath", QString()); if (pixmapPath.isEmpty()) return false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/amor/amordialog.cpp new/kdetoys-3.95.0/amor/amordialog.cpp --- old/kdetoys-3.94.0/amor/amordialog.cpp 2007-08-29 11:51:20.000000000 +0200 +++ new/kdetoys-3.95.0/amor/amordialog.cpp 2007-10-25 11:32:00.000000000 +0200 @@ -150,7 +150,7 @@ KConfigGroup configGroup( &config, "Config" ); - QString pixmapPath = configGroup.readPathEntry("PixmapPath"); + QString pixmapPath = configGroup.readPathEntry("PixmapPath", QString()); if (pixmapPath.isEmpty()) { return; Files old/kdetoys-3.94.0/doc/amor/index.cache.bz2 and new/kdetoys-3.95.0/doc/amor/index.cache.bz2 differ Files old/kdetoys-3.94.0/doc/kmoon/index.cache.bz2 and new/kdetoys-3.95.0/doc/kmoon/index.cache.bz2 differ Files old/kdetoys-3.94.0/doc/kteatime/index.cache.bz2 and new/kdetoys-3.95.0/doc/kteatime/index.cache.bz2 differ Files old/kdetoys-3.94.0/doc/kweather/index.cache.bz2 and new/kdetoys-3.95.0/doc/kweather/index.cache.bz2 differ Files old/kdetoys-3.94.0/doc/kworldclock/index.cache.bz2 and new/kdetoys-3.95.0/doc/kworldclock/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/eyesapplet/eyesapplet.desktop new/kdetoys-3.95.0/eyesapplet/eyesapplet.desktop --- old/kdetoys-3.94.0/eyesapplet/eyesapplet.desktop 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/eyesapplet/eyesapplet.desktop 2007-10-23 10:36:59.000000000 +0200 @@ -60,8 +60,10 @@ Comment[be]=Аплет панелі, падобны на xeyes Comment[bg]=Аплет, подобен на xeyes Comment[ca]=Miniaplicació del plafó similar al xeyes +Comment[cs]=Aplet do panelu podobný xeyes Comment[de]=Kicker-Miniprogramm ähnlich xeyes -Comment[el]=Εφαρμογίδιο παρόμοιο με το xeyes +Comment[el]=Μικροεφαρμογή παρόμοια με το xeyes +Comment[et]=xeyesi moodi paneeliaplett Comment[ga]=Feidhmchláirín painéil, cosúil le xeyes. Comment[gl]=Aplicacionciña do painel similar a xeyes Comment[he]=ישומון לוח דומה ל־xeyes @@ -70,7 +72,7 @@ Comment[ne]=एक्स आईमा मिल्ने प्यानल एप्लेट Comment[nl]=Paneelapplet, vergelijkbaar met xeyes Comment[pt]=Uma 'applet' do painel semelhante ao 'xeyes' -Comment[pt_BR]=Uma 'applet' do painel semelhante ao 'xeyes' +Comment[pt_BR]=Mini-aplicativo semelhantes ao xeyes Comment[sv]=Panelminiprogram som liknar xeyes Comment[uk]=Аплет панелі, подібний до xeyes Comment[wa]=Aplikete avou deus ouys ki shuvèt l' sori. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kmoon/kmoonapplet.desktop new/kdetoys-3.95.0/kmoon/kmoonapplet.desktop --- old/kdetoys-3.94.0/kmoon/kmoonapplet.desktop 2007-10-08 09:44:06.000000000 +0200 +++ new/kdetoys-3.95.0/kmoon/kmoonapplet.desktop 2007-10-23 10:36:58.000000000 +0200 @@ -6,8 +6,10 @@ Name[be]=Фаза луны Name[bg]=Фази на луната Name[ca]=Mostra la fase de la lluna +Name[cs]=Měsíční fáze Name[de]=Anzeige der Mondphasen Name[el]=Δείκτης των φάσεων της Σελήνης +Name[et]=Kuu faasid Name[fa]=نمایش هلال ماه Name[ga]=Taispeáin Céim na Gealaí Name[gl]=Fase da lúa @@ -18,7 +20,7 @@ Name[nl]=Maanstanden Name[pa]=ਚੰਦ ਕਲਾਵਾਂ ਵੇਖੋ Name[pt]=Fase Lunar -Name[pt_BR]=Fase Lunar +Name[pt_BR]=Mostrador da Fase da Lua Name[sv]=Månfaser Name[uk]=Фази місяця Name[wa]=Håynaedje des fazes del lune @@ -29,8 +31,10 @@ Comment[be]=Аплет, які адлюстроўвае бягучую фазу луны Comment[bg]=Аплет за фазите на луната Comment[ca]=Una miniaplicació de la fase de la lluna pel KDE +Comment[cs]=Aplet měsíční fáze pro KDE Comment[de]=Miniprogramm zur Anzeige der Mondphasen in KDE -Comment[el]=Ένα εφαρμογίδιο που εμφανίζει τις φάσεις της Σελήνης στο KDE +Comment[el]=Μια μικροεφαρμογή που εμφανίζει τις φάσεις της Σελήνης στο KDE +Comment[et]=KDE Kuu faaside aplett Comment[ga]=Feidhmchláirín KDE a thaispeánann céim na Gealaí Comment[gl]=Unha aplicacionciña de KDE que mostra as fases da lúa Comment[he]=תכנת KDE להצגת מופעי הירח @@ -39,7 +43,7 @@ Comment[ne]=केडीई चन्द्रमाको रूप एप्लेट Comment[nl]=Een KDE-applet dat de maanstand toont Comment[pt]=Uma 'applet' com a fase lunar para o KDE -Comment[pt_BR]=Uma 'applet' com a fase lunar para o KDE +Comment[pt_BR]=Um mini-aplicativo com as fases da lua para o KDE Comment[sv]=Ett miniprogram med månfaser för KDE Comment[uk]=Аплет KDE для показу фаз місяця Comment[wa]=Ene aplikete po KDE ki mostere les fazes del lune diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kteatime/kteatime.notifyrc new/kdetoys-3.95.0/kteatime/kteatime.notifyrc --- old/kdetoys-3.94.0/kteatime/kteatime.notifyrc 2007-10-08 09:44:06.000000000 +0200 +++ new/kdetoys-3.95.0/kteatime/kteatime.notifyrc 2007-10-23 10:36:58.000000000 +0200 @@ -26,6 +26,7 @@ Comment[mk]=Чајникот на KDE Comment[ms]=Penjerang Teh KDE Comment[nds]=De KDE-Teekaker +Comment[nl]=De KDE Theezetter Comment[pl]=Przyrządzanie herbaty dla KDE Comment[pt]=Cozinheiro de Chá do KDE Comment[pt_BR]=O cozinheiro do KDE @@ -37,9 +38,11 @@ Comment[ta]=The KDE தேநீர் குக்கர் Comment[tg]=Пухтани Чойи KDE Comment[tr]=Çay Pişirici +Comment[uk]=Приготування чаю Comment[uz]=KDE чой дамловчи Comment[wa]=Li fjheu di té di KDE Comment[x-test]=xxThe KDE Tea Cookerxx +Comment[zh_CN]=KDE 煮茶器 Comment[zh_TW]=KDE 煮茶器 [Event/ready] @@ -69,6 +72,7 @@ Name[lv]=Tēja ir gatava Name[mk]=Чајот е готов Name[nds]=Tee is fardig +Name[nl]=De thee is klaar Name[pl]=Herbata jest gotowa Name[pt]=O chá está pronto Name[pt_BR]=O chá está pronto @@ -80,9 +84,11 @@ Name[ta]= தேநீர் தயார் Name[tg]=Чой тайёр шуд Name[tr]=Çay hazır +Name[uk]=Чай готовий Name[uz]=Чой тайёр Name[wa]=Li té est presse Name[x-test]=xxTea is readyxx +Name[zh_CN]=茶沏好了 Name[zh_TW]=茶煮好了 Comment=Tea is ready Comment[be]=Гарбата гатова @@ -111,6 +117,7 @@ Comment[mk]=Чајот е готов Comment[ms]=Teh sudah siap Comment[nds]=Tee is fardig +Comment[nl]=De thee is klaar Comment[pl]=Herbata jest gotowa Comment[pt]=O chá está pronto Comment[pt_BR]=O chá está pronto @@ -122,9 +129,11 @@ Comment[ta]= தேநீர் தயார் Comment[tg]=Чой тайёр шуд Comment[tr]=Çay hazır +Comment[uk]=Чай готовий Comment[uz]=Чой тайёр Comment[wa]=Li té est presse Comment[x-test]=xxTea is readyxx +Comment[zh_CN]=茶沏好了 Comment[zh_TW]=茶煮好了 Sound=KDE_Notify.wav Action=Sound @@ -133,22 +142,30 @@ Name=Tea is getting lonely Name[ca]=El te està quedant abandonat Name[de]=Ihr Tee ist einsam +Name[et]=Tee ootab joomist Name[ga]=Tá uaigneas ag teacht ar an tae Name[ja]=お茶があなたを待っています +Name[nl]=De thee wordt koud Name[pt]=O chá está a ficar abandonado -Name[pt_BR]=O chá está a ficar abandonado +Name[pt_BR]=O chá está ficando abandonado Name[sv]=Teet känner sig övergivet +Name[uk]=Час остигає Name[x-test]=xxTea is getting lonelyxx +Name[zh_CN]=茶都凉了 Name[zh_TW]=茶煮好了，怎麼沒人喝 Comment=Tea is getting lonely. Comment[ca]=El te està quedant abandonat. Comment[de]=Ihr Tee ist einsam +Comment[et]=Tee ootab joomist. Comment[ga]=Tá uaigneas ag teacht ar an tae. Comment[ja]=お茶があなたを待っています +Comment[nl]=De thee wordt koud Comment[pt]=O chá está a ficar abandonado. -Comment[pt_BR]=O chá está a ficar abandonado. +Comment[pt_BR]=O chá está ficando abandonado. Comment[sv]=Teet känner sig övergivet. +Comment[uk]=Час остигає. Comment[x-test]=xxTea is getting lonely.xx +Comment[zh_CN]=茶都凉了 Comment[zh_TW]=茶煮好了，怎麼沒人喝 Sound=KDE_Notify.wav Action=Sound diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/ktux/spriteanim.cpp new/kdetoys-3.95.0/ktux/spriteanim.cpp --- old/kdetoys-3.94.0/ktux/spriteanim.cpp 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/ktux/spriteanim.cpp 2007-10-16 16:49:24.000000000 +0200 @@ -53,7 +53,7 @@ // // SpriteDef stores the animations that create an object // -SpriteDef::SpriteDef(KConfigBase &config) +SpriteDef::SpriteDef(KConfigGroup &config) { read(config); } @@ -83,18 +83,19 @@ } //--------------------------------------------------------------------------- -void SpriteDef::read(KConfigBase &config) +void SpriteDef::read(KConfigGroup &config) { - mDirX.set(config.group("<default>").readEntry("DirectionX", "0")); - mDirY.set(config.group("<default>").readEntry("DirectionY", "0")); - mStartX.set(config.group("<default>").readEntry("StartX", "0")); - mStartY.set(config.group("<default>").readEntry("StartY", "0")); - mEndX.set(config.group("<default>").readEntry("EndX", "10000")); - mEndY.set(config.group("<default>").readEntry("EndY", "10000")); - mLifeSpan = config.group("<default>").readEntry("LifeSpan", -1); - mZ = config.group("<default>").readEntry("Z", 1); - QString animation = config.group("<default>").readEntry("Animation", ""); - mSeq = SpriteSequenceManager::manager()->load(config, animation); + mDirX.set(config.readEntry("DirectionX", "0")); + mDirY.set(config.readEntry("DirectionY", "0")); + mStartX.set(config.readEntry("StartX", "0")); + mStartY.set(config.readEntry("StartY", "0")); + mEndX.set(config.readEntry("EndX", "10000")); + mEndY.set(config.readEntry("EndY", "10000")); + mLifeSpan = config.readEntry("LifeSpan", -1); + mZ = config.readEntry("Z", 1); + QString animation = config.readEntry("Animation", ""); + KConfigBase *grp = config.config(); + mSeq = SpriteSequenceManager::manager()->load(*grp, animation); kDebug() << "Set Z = " << mZ; } @@ -102,7 +103,7 @@ // // SpriteGroup // -SpriteGroup::SpriteGroup(Q3Canvas *c, KConfigBase &config) +SpriteGroup::SpriteGroup(Q3Canvas *c, KConfigGroup &config) : mCanvas(c) { mAvailable.setAutoDelete(true); @@ -142,22 +143,22 @@ //--------------------------------------------------------------------------- -void SpriteGroup::read(KConfigBase &config) +void SpriteGroup::read(KConfigGroup &config) { - SpriteRange countRange(config.group("<default>").readEntry("Count", "1")); + qDebug()<<" void SpriteGroup::read(KConfigBase &config) :"<<config.name(); + SpriteRange countRange(config.readEntry("Count", "1")); mCount = countRange.random(); - mRefresh.set(config.group("<default>").readEntry("Refresh", "1000")); + mRefresh.set(config.readEntry("Refresh", "1000")); QStringList anims; - anims = config.group("<default>").readEntry("Animations",anims); - + anims = config.readEntry("Animations",anims); QStringList::const_iterator lst; - + for (lst = anims.constBegin(); lst != anims.constEnd(); ++lst) { - KConfigGroup grp(&config, *lst); - SpriteDef *obj = new SpriteDef(config); + KConfigGroup grp(config.config(), *lst); + SpriteDef *obj = new SpriteDef(grp); mAvailable.append(obj); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/ktux/spriteanim.h new/kdetoys-3.95.0/ktux/spriteanim.h --- old/kdetoys-3.94.0/ktux/spriteanim.h 2007-10-03 13:10:19.000000000 +0200 +++ new/kdetoys-3.95.0/ktux/spriteanim.h 2007-10-16 16:49:24.000000000 +0200 @@ -49,12 +49,12 @@ class SpriteDef { public: - explicit SpriteDef(KConfigBase &config); + explicit SpriteDef(KConfigGroup &config); SpriteObject *create( Q3Canvas *c ); protected: - void read(KConfigBase &config); + void read(KConfigGroup &config); protected: SpriteRange mDirX; @@ -75,14 +75,14 @@ class SpriteGroup { public: - SpriteGroup(Q3Canvas *c, KConfigBase &config); + SpriteGroup(Q3Canvas *c, KConfigGroup &config); void next(); void refresh(); int refreshTime() const { return mRefresh.random(); } protected: - void read(KConfigBase &config); + void read(KConfigGroup &config); protected: Q3PtrList<SpriteDef> mAvailable; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/ktux/sprite.cpp new/kdetoys-3.95.0/ktux/sprite.cpp --- old/kdetoys-3.94.0/ktux/sprite.cpp 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/ktux/sprite.cpp 2007-10-16 16:49:24.000000000 +0200 @@ -219,9 +219,9 @@ mTimerIds.resize(list.count()); for (int i = 0; i < list.count(); i++) { - kDebug() << "Group: " << list.at(i);; - mConfig.changeGroup(list.at(i)); - SpriteGroup *obj = new SpriteGroup(mCanvas, *pConfig); + kDebug() << "Group: " << list.at(i); + KConfigGroup grp = pConfig->group(list.at(i)); + SpriteGroup *obj = new SpriteGroup(mCanvas, grp); mTimerIds[i] = startTimer(obj->refreshTime()); mGroups.append(obj); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/kcmweather.cpp new/kdetoys-3.95.0/kweather/kcmweather.cpp --- old/kdetoys-3.94.0/kweather/kcmweather.cpp 2007-10-03 13:10:19.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/kcmweather.cpp 2007-10-25 11:32:00.000000000 +0200 @@ -174,7 +174,7 @@ QString loc = group.readEntry( "report_location" ); - mWidget->m_logFile->setUrl( group.readPathEntry( "log_file_name" ) ); + mWidget->m_logFile->setUrl( group.readPathEntry( "log_file_name", QString() ) ); if ( ! loc.isEmpty() ) mWidget->m_reportLocation->setCurrentText( mWeatherService->stationName( loc ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/kcmweather.desktop new/kdetoys-3.95.0/kweather/kcmweather.desktop --- old/kdetoys-3.94.0/kweather/kcmweather.desktop 2007-10-03 13:10:19.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/kcmweather.desktop 2007-10-24 14:17:25.000000000 +0200 @@ -43,6 +43,7 @@ Name[nds]=Dorstellen Name[ne]=प्रदर्शन गर्नुहोस् Name[nn]=Vising +Name[oc]=Afichar Name[pa]=ਵੇਖਾਓ Name[pl]=Wyświetlanie Name[pt]=Aparência diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/kweather.cpp new/kdetoys-3.95.0/kweather/kweather.cpp --- old/kdetoys-3.94.0/kweather/kweather.cpp 2007-10-03 13:10:19.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/kweather.cpp 2007-10-25 11:32:00.000000000 +0200 @@ -205,7 +205,7 @@ KConfigGroup group = kcConfig->group("General Options"); logOn = group.readEntry("logging", false); - fileName = group.readPathEntry("log_file_name"); + fileName = group.readPathEntry("log_file_name", QString()); reportLocation = group.readEntry("report_location"); mViewMode = group.readEntry("smallview_mode", int(dockwidget::ShowAll)); mTextColor = group.readEntry("textColor", QColor(Qt::black)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/kweather.desktop new/kdetoys-3.95.0/kweather/kweather.desktop --- old/kdetoys-3.94.0/kweather/kweather.desktop 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/kweather.desktop 2007-10-24 14:17:25.000000000 +0200 @@ -6,7 +6,8 @@ Comment[bg]=Аплет за времето Comment[ca]=Una miniaplicació del plafó amb la previsió del temps Comment[de]=Kicker-Miniprogramm für Wetterberichte -Comment[el]=Ένα εφαρμογίδιο αναφοράς καιρικών συνθηκών +Comment[el]=Μια μικροεφαρμογή αναφοράς καιρικών συνθηκών +Comment[et]=Ilmateate paneeliaplett Comment[ga]=Feidhmchláirín painéil a thugann tuairiscí aimsire Comment[gl]=Unha aplicacionciña para mostrar o parte meteorolóxico no painel Comment[he]=ישומון לוח לדיווח על מזג-האוויר @@ -15,7 +16,7 @@ Comment[ne]=प्यानल एप्लेट प्रतिवेदन गरिरहेको मौसम Comment[nl]=Een paneelapplet dat het weerbericht toont Comment[pt]=Uma 'applet' de boletim meteorológico -Comment[pt_BR]=Uma 'applet' de boletim meteorológico +Comment[pt_BR]=Um mini-aplicativo do painel com o boletim do tempo Comment[sv]=Ett panelminiprogram med väderprognos Comment[uk]=Аплет панелі для показу погоди Comment[wa]=Ene aplikete ki rapoite sol sicriftôr li tins k' i fwait ene sawice @@ -54,6 +55,7 @@ Name[ne]=मौसम प्रतिवेदन Name[nl]=Weerbericht Name[nn]=Vêrmelding +Name[oc]=Bulletin meteorologic Name[pa]=ਮੌਸਮ ਰਿਪੋਰਟ Name[pl]=Raport o pogodzie Name[pt]=Boletim Meteorológico diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/kweatherservice.desktop new/kdetoys-3.95.0/kweather/kweatherservice.desktop --- old/kdetoys-3.94.0/kweather/kweatherservice.desktop 2007-10-08 09:44:07.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/kweatherservice.desktop 2007-10-16 16:49:24.000000000 +0200 @@ -35,8 +35,10 @@ Comment[be]=D-Bus-сервіс, які дае звесткі пра надвор'е Comment[bg]=Услуга DCOP за метеорологични данни Comment[ca]=Un servei D-Bus per proporcionar dades del temps +Comment[cs]=Služba DBUS poskytující údaje o počasí. Comment[de]=D-Bus-Dienst für Wetterdaten Comment[el]=Μια υπηρεσία D-Bus που προσφέρει μετεωρολογικά δεδομένα. +Comment[et]=D-Busi teenus ilmaandmete esitamiseks. Comment[fa]=یک خدمت D-Bus رای فراهم کردن داده‌های آب و هوا Comment[ga]= Seirbhís DCOP chun faisnéis aimsire a chur ar fáil Comment[he]=שירות D-Bus לסיפוק נתוני מזג-האוויר @@ -45,7 +47,7 @@ Comment[ne]=मौसम डेटा उपलब्ध गराउन डी-बस सेवा Comment[nl]=Een DBUS-dienst die weergegevens aanlevert. Comment[pt]=Um serviço D-Bus que fornece boletins meteorológicos -Comment[pt_BR]=Um serviço D-Bus que fornece boletins meteorológicos +Comment[pt_BR]=Um serviço D-Bus para fornecer dados sobre o tempo. Comment[sv]=En D-Bus tjänst för att tillhandahålla värderrapporter Comment[uk]=Служба D-Bus для надання даних про погоду Comment[wa]=On siervice D-Bus po dner des dnêyes sol meteyo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.94.0/kweather/serviceconfigwidget.cpp new/kdetoys-3.95.0/kweather/serviceconfigwidget.cpp --- old/kdetoys-3.94.0/kweather/serviceconfigwidget.cpp 2007-10-03 13:10:19.000000000 +0200 +++ new/kdetoys-3.95.0/kweather/serviceconfigwidget.cpp 2007-10-25 11:32:00.000000000 +0200 @@ -174,7 +174,7 @@ for ( regionIt = regions.begin(); regionIt != regions.end(); ++regionIt ) { group = config.group(*regionIt); QString name = group.readEntry( "name" ); - QStringList states = group.readEntry( "states",QStringList(), ' ' ); + QStringList states = group.readEntry( "states" ).split( ' ' ); Q3ListViewItem *regionItem = new Q3ListViewItem( mAllStations, name ); regionItem->setSelectable( false ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdepim4 checked in at Fri Nov 2 01:26:50 CET 2007. -------- --- KDE/kdepim4/kdepim4.changes 2007-10-18 15:31:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2007-11-01 11:47:54.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 1 11:47:49 CET 2007 - dmueller(a)suse.de + +- update to 3.95.1 + +------------------------------------------------------------------- +Fri Oct 26 13:35:39 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 Beta4 + +------------------------------------------------------------------- +Sat Oct 20 18:20:28 CEST 2007 - dmueller(a)suse.de + +- update to 3.94.1 + +------------------------------------------------------------------- Old: ---- kdepim-3.94.0.tar.bz2 New: ---- kdepim-3.95.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.H25761/_old 2007-11-02 01:26:39.000000000 +0100 +++ /var/tmp/diff_new_pack.H25761/_new 2007-11-02 01:26:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4 (Version 3.94.0) +# spec file for package kdepim4 (Version 3.95.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,7 +10,7 @@ Name: kdepim4 -BuildRequires: cyrus-sasl-devel kdebase4-devel libqca2-devel python-devel +BuildRequires: cyrus-sasl-devel libqca2-devel python-devel BuildRequires: boost-devel gnokii-devel gpgme-devel libkdepimlibs4-devel BuildRequires: kdebase4-workspace-devel libmal1-devel libopensync-devel libsoprano-devel %if %suse_version > 1020 @@ -18,13 +18,13 @@ %else BuildRequires: pilot-link-devel %endif -License: LGPL v2 or later +License: LGPL v2.1 or later Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 3.94.0 -Release: 2 -%define rversion 3.94.0 +Version: 3.95.1 +Release: 1 +%define rversion 3.95.1 Source0: kdepim-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,8 +83,8 @@ %suse_update_desktop_file groupwarewizard Utility DesktopSettings %suse_update_desktop_file akregator Network RSS-News %suse_update_desktop_file kpilot Utility PDA SyncUtility - %suse_update_desktop_file -G "Mobile Phone Tool" -C "" kmobiletools Utility Telephony %suse_update_desktop_file kcontactmanager Office ContactManagement + %suse_update_desktop_file -G "Mobile Phone Tool" -C "" kmobiletools Utility Telephony %kde_post_install %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT @@ -123,18 +123,18 @@ %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING-DOCS README /usr/bin/akonadictl +/usr/bin/akonadi_strigi_feeder /usr/bin/kcontactmanager /usr/bin/akonadi_mailthreader_agent /usr/bin/akonadi_localbookmarks_resource /usr/share/applications/kde4/kcontactmanager.desktop -%dir /usr/share/kde4/apps/kcontactmanager /usr/share/kde4/apps/kcontactmanager/kcontactmanagerui.rc +%dir /usr/share/kde4/apps/kcontactmanager /usr/%_lib/kde4/libakonadi_serializer_bookmark.so /usr/%_lib/libakonadiprotocol.so.* /usr/%_lib/libakonadi.so.* /usr/%_lib/libakonadicomponents.so.* /usr/%_lib/libakonadiprivate.so.* -/usr/%_lib/libakonadisearchprovider.so.* /usr/%_lib/libkabcakonadi.so.* /usr/%_lib/libkmimeakonadi.so.* /usr/%_lib/kde4/libakonadi_serializer_sms.so @@ -159,7 +159,6 @@ %files -n akonadi %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING-DOCS README -/usr/bin/akonadi_strigi_searchprovider /usr/bin/akonadi /usr/bin/akonamail /usr/bin/akonadi_control @@ -226,7 +225,6 @@ /usr/%_lib/libakonadi.so /usr/%_lib/libakonadicomponents.so /usr/%_lib/libakonadiprivate.so -/usr/%_lib/libakonadisearchprovider.so /usr/%_lib/libkabcakonadi.so /usr/%_lib/libkmimeakonadi.so @@ -500,6 +498,9 @@ /usr/%_lib/kde4/knotes_local.so /usr/%_lib/kde4/knotes_xmlrpc.so /usr/%_lib/libknotes_xmlrpc.so.* +/usr/%_lib/libknotesscalix.so.* +/usr/%_lib/kde4/knotes_kolab.so +/usr/%_lib/kde4/knotes_scalix.so /usr/share/applications/kde4/knotes.desktop %_kde_share_dir/apps/knotes %_kde_share_dir/config.kcfg/knotesglobalconfig.kcfg @@ -649,6 +650,7 @@ %_kde_share_dir/servicetypes/calendardecoration.desktop %_kde_share_dir/servicetypes/calendarplugin.desktop %_kde_share_dir/servicetypes/dbuscalendar.desktop +%doc %lang(en) /usr/share/doc/kde/HTML/en/korganizer %package -n kde4-korn Group: Productivity/Networking/Email/Utilities @@ -745,6 +747,7 @@ /usr/bin/egroupwarewizard /usr/bin/groupwarewizard /usr/bin/sloxwizard +/usr/bin/scalixwizard /usr/share/applications/kde4/groupwarewizard.desktop %package -n kde4-kalarm @@ -851,11 +854,14 @@ /usr/%_lib/libkcal_resourcefeatureplan.so.* /usr/%_lib/libkfeed.so.* /usr/%_lib/kde4/kabc_kolab.so +/usr/%_lib/kde4/kabc_scalix.so /usr/%_lib/kde4/kcal_kolab.so -/usr/%_lib/kde4/knotes_kolab.so +/usr/%_lib/kde4/kcal_scalix.so /usr/%_lib/kde4/kcal_resourcefeatureplan_plugin.so /usr/%_lib/libkabckolab.so.* +/usr/%_lib/libkabcscalix.so.* /usr/%_lib/libkcalkolab.so.* +/usr/%_lib/libkcalscalix.so.* /usr/%_lib/libknoteskolab.so.* %package -n libkdepim4-devel @@ -876,7 +882,7 @@ %files -n libkdepim4-devel %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING-DOCS README -/usr/include/calendar +#/usr/include/calendar /usr/include/kdepimprotocols.h /usr/include/ksieve /usr/include/libkmobiletoolsengineui @@ -915,8 +921,9 @@ /usr/%_lib/libkabckolab.so /usr/%_lib/libkcalkolab.so /usr/%_lib/libknoteskolab.so -/usr/%_lib/kde4/kabc_groupdav.so -/usr/%_lib/kde4/kcal_groupdav.so +/usr/%_lib/libknotesscalix.so +/usr/%_lib/libkabcscalix.so +/usr/%_lib/libkcalscalix.so %package -n kde4-kpilot Group: Hardware/Palm @@ -1024,13 +1031,13 @@ /usr/%_lib/libkpilot.so /usr/%_lib/libkmobiletools_fake.so /usr/include/akregator -/usr/include/korganizer +#/usr/include/korganizer /usr/include/kontact /usr/include/kmail /usr/include/kaddressbook /usr/include/kpilot /usr/include/libkmobiletools -/usr/%_lib/libkmobiletools.so +/usr/%_lib/libkmobiletoolslib.so /usr/%_lib/libkmobiletoolsengineui.so %package -n kde4-kmobiletools @@ -1062,7 +1069,7 @@ /usr/%_lib/libkmobiletools_fake.so.* /usr/%_lib/kde4/libkmobiletoolsmainpart.so /usr/%_lib/kde4/libkorg_thisdayinhistory.so -/usr/%_lib/libkmobiletools.so.* +/usr/%_lib/libkmobiletoolslib.so.* /usr/%_lib/libkmobiletoolsengineui.so.* /usr/share/applications/kde4/kmobiletools.desktop %doc %lang(en) /usr/share/doc/kde/HTML/en/kmobiletools @@ -1142,6 +1149,8 @@ %_kde_share_dir/services/kresources/kalarm_manager.desktop /usr/%_lib/kde4/kabc_slox.so /usr/%_lib/kde4/kabc_xmlrpc.so +/usr/%_lib/kde4/kabc_groupdav.so +/usr/%_lib/kde4/kcal_groupdav.so /usr/%_lib/kde4/kcal_kabc.so /usr/%_lib/kde4/kcal_blog.so /usr/%_lib/kde4/kcal_remote.so @@ -1149,8 +1158,18 @@ /usr/%_lib/kde4/kcal_xmlrpc.so /usr/%_lib/kde4/kcm_kleopatra.so /usr/%_lib/kde4/kpartsdesignerplugin.so +/usr/%_lib/kde4/kio_scalix.so +/usr/share/kde4/config.kcfg/scalix.kcfg +/usr/share/kde4/services/scalix.protocol +/usr/share/kde4/services/scalixs.protocol #/usr/%_lib/kde4/plugins/sqldrivers %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- update to 3.95.1 +* Fri Oct 26 2007 - dmueller(a)suse.de +- update to KDE 4.0 Beta4 +* Sat Oct 20 2007 - dmueller(a)suse.de +- update to 3.94.1 * Thu Oct 18 2007 - ro(a)suse.de - fix build - add category for kcontactmanager.desktop ++++++ kdepim-3.94.0.tar.bz2 -> kdepim-3.95.1.tar.bz2 ++++++ KDE/kdepim4/kdepim-3.94.0.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-3.95.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdepimlibs4 checked in at Fri Nov 2 01:26:47 CET 2007. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2007-10-30 15:34:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-01 11:41:40.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 11:41:34 CET 2007 - dmueller(a)suse.de + +- update to 3.95.1 + +------------------------------------------------------------------- Old: ---- kdepimlibs-3.95.0.tar.bz2 New: ---- kdepimlibs-3.95.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.q25899/_old 2007-11-02 01:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.q25899/_new 2007-11-02 01:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 3.95.0) +# spec file for package kdepimlibs4 (Version 3.95.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 3.95.0 +Version: 3.95.1 Release: 1 -%define rversion 3.95.0 +%define rversion 3.95.1 Source0: kdepimlibs-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -152,6 +152,8 @@ %_kde_share_dir/config.kcfg/pimemoticons.kcfg %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- update to 3.95.1 * Tue Oct 30 2007 - dmueller(a)suse.de - update to 3.95.0 * Thu Oct 18 2007 - dmueller(a)suse.de ++++++ kdepimlibs-3.95.0.tar.bz2 -> kdepimlibs-3.95.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kabc/plugins/file/resourcefile.cpp new/kdepimlibs-3.95.1/kabc/plugins/file/resourcefile.cpp --- old/kdepimlibs-3.95.0/kabc/plugins/file/resourcefile.cpp 2007-10-23 10:37:03.000000000 +0200 +++ new/kdepimlibs-3.95.1/kabc/plugins/file/resourcefile.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -296,14 +296,14 @@ KConfig cfg( KStandardDirs::locateLocal( "data", "kabc/distlists" ) ); KConfigGroup cg( &cfg, "DistributionLists" ); - QMap<QString,QString> entryMap = cg.entryMap(); + const QStringList entryList = cg.keyList(); d->mMissingEntries.clear(); - QMap<QString,QString>::ConstIterator it; - for ( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it ) { - QString name = it.key(); - QStringList value = cg.readEntry( name, QStringList() ); + QStringList::ConstIterator it; + for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) { + const QString name = *it; + const QStringList value = cg.readEntry( name, QStringList() ); kDebug(5700) << "ResourceFile::loadDistributionLists():" << name << ":" << value.join( "," ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kcal/resourcecached.cpp new/kdepimlibs-3.95.1/kcal/resourcecached.cpp --- old/kdepimlibs-3.95.0/kcal/resourcecached.cpp 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kcal/resourcecached.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -36,6 +36,7 @@ #include <kstandarddirs.h> #include <kconfiggroup.h> +#include <QtCore/QDateTime> #include <QtCore/QDataStream> #include <QtCore/QFile> #include <QtCore/QString> @@ -197,9 +198,10 @@ d->mSaveInterval = group.readEntry( "SaveInterval", 10 ); d->mSavePolicy = group.readEntry( "SavePolicy", int(SaveNever) ); - QDateTime dt = group.readEntry( "LastLoad", QDateTime() ); + QDateTime curDt = QDateTime::currentDateTime(); + QDateTime dt = group.readEntry( "LastLoad", curDt ); d->mLastLoad = KDateTime( dt, KDateTime::UTC ); - dt = group.readEntry( "LastSave", QDateTime() ); + dt = group.readEntry( "LastSave", curDt ); d->mLastSave = KDateTime( dt, KDateTime::UTC ); setupSaveTimer(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imap4.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp --- old/kdepimlibs-3.95.0/kioslave/imap4/imap4.cpp 2007-10-23 10:37:02.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -1208,6 +1208,7 @@ * AnnotateMore commands: data = 'M' + 'G'et/'S'et + URL + entry + command-dependent args * Search: data = 'E' + URL (KUrl) * Quota commands: data = 'Q' + 'R'oot/'G'et/'S'et + URL + entry + command-dependent args + * Custom command: data = 'X' + 'N'ormal/'E'xtended + command + command-dependent args */ void IMAP4Protocol::special (const QByteArray & aData) @@ -1249,6 +1250,7 @@ return; } completeQueue.removeAll (cmd); + delete cmd; finished(); break; } @@ -1419,6 +1421,12 @@ specialSearchCommand( stream ); break; } + case 'X': + { + // custom command + specialCustomCommand( stream ); + break; + } default: kWarning(7116) <<"Unknown command in special():" << tmp; error( ERR_UNSUPPORTED_ACTION, QString(QChar(tmp)) ); @@ -1557,6 +1565,85 @@ } void +IMAP4Protocol::specialCustomCommand( QDataStream& stream ) +{ + kDebug(7116) << "IMAP4Protocol::specialCustomCommand" << endl; + + QString command, arguments; + int type; + stream >> type; + stream >> command >> arguments; + + /** + * In 'normal' mode we send the command with all information in one go + * and retrieve the result. + */ + if ( type == 'N' ) { + kDebug(7116) << "IMAP4Protocol::specialCustomCommand: normal mode" << endl; + imapCommand *cmd = doCommand (imapCommand::clientCustom( command, arguments )); + if (cmd->result () != "OK") + { + error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 " + "failed. The server returned: %3") + .arg(command) + .arg(arguments) + .arg(cmd->resultInfo())); + return; + } + completeQueue.removeAll(cmd); + QStringList lst = getResults(); + kDebug(7116) << "IMAP4Protocol::specialCustomCommand '" << command << + ":" << arguments << + "' returns " << lst << endl; + infoMessage( lst.join( " " ) ); + + finished(); + } else + /** + * In 'extended' mode we send a first header and push the data of the request in + * streaming mode. + */ + if ( type == 'E' ) { + kDebug(7116) << "IMAP4Protocol::specialCustomCommand: extended mode" << endl; + imapCommand *cmd = sendCommand (imapCommand::clientCustom( command, QString() )); + while ( !parseLoop () ); + + // see if server is waiting + if (!cmd->isComplete () && !getContinuation ().isEmpty ()) + { + const QByteArray buffer = arguments.toUtf8(); + + // send data to server + bool sendOk = (write (buffer.data (), buffer.size ()) == (ssize_t)buffer.size ()); + processedSize( buffer.size() ); + + if ( !sendOk ) { + error ( ERR_CONNECTION_BROKEN, myHost ); + completeQueue.removeAll ( cmd ); + setState(ISTATE_CONNECT); + closeConnection(); + return; + } + } + parseWriteLine (""); + + do + { + while (!parseLoop ()); + } + while (!cmd->isComplete ()); + + completeQueue.removeAll (cmd); + + QStringList lst = getResults(); + kDebug(7116) << "IMAP4Protocol::specialCustomCommand: returns " << lst << endl; + infoMessage( lst.join( " " ) ); + + finished (); + } +} + +void IMAP4Protocol::specialAnnotateMoreCommand( int command, QDataStream& stream ) { // All commands start with the URL to the box @@ -1948,6 +2035,7 @@ kDebug(7116) <<"'" << (*it) <<"'"; } completeQueue.removeAll (cmd); + delete cmd; if (!hasCapability("IMAP4") && !hasCapability("IMAP4rev1")) { @@ -1989,9 +2077,11 @@ kWarning(7116) <<"TLS mode setup has failed. Aborting."; error (ERR_COULD_NOT_LOGIN, i18n("Starting TLS failed.")); closeConnection(); + delete cmd; return false; } } else completeQueue.removeAll(cmd); + delete cmd; } if (!myAuth.isEmpty () && myAuth != "*" @@ -2051,6 +2141,7 @@ kDebug(7116) <<"makeLogin - registered namespaces"; } completeQueue.removeAll (cmd); + delete cmd; } // get the default delimiter (empty listing) cmd = doCommand( imapCommand::clientList("", "") ); @@ -2070,6 +2161,7 @@ } } completeQueue.removeAll (cmd); + delete cmd; } else { kDebug(7116) <<"makeLogin - NO login"; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imap4.h new/kdepimlibs-3.95.1/kioslave/imap4/imap4.h --- old/kdepimlibs-3.95.0/kioslave/imap4/imap4.h 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imap4.h 2007-10-31 21:36:03.000000000 +0100 @@ -178,6 +178,9 @@ /** Search current folder, the search string is passed as SECTION */ void specialSearchCommand( QDataStream& ); + /** Send a custom command to the server */ + void specialCustomCommand( QDataStream& ); + private: // This method behaves like the above method but takes an already encoded url, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.cpp --- old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.cpp 2007-10-03 13:30:05.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -402,3 +402,9 @@ return new imapCommand ("GETQUOTAROOT", parameter); } +imapCommand * +imapCommand::clientCustom( const QString& command, const QString& arguments ) +{ + return new imapCommand (command, arguments); +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.h new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.h --- old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.h 2007-10-03 13:30:05.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.h 2007-10-31 21:36:03.000000000 +0100 @@ -371,6 +371,14 @@ */ static imapCommand *clientGetQuotaroot ( const QString& box ); + /** + * @brief Create a custom command + * @param command The custom command + * @param arguments The custom arguments + * @return a custom imapCommand + */ + static imapCommand *clientCustom ( const QString& command, const QString& arguments ); + protected: QString aCommand; QString mId; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.cpp --- old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.cpp 2007-10-23 10:37:02.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -122,7 +122,10 @@ || command == "GETANNOTATION" || command == "NAMESPACE" || command == "GETQUOTAROOT" - || command == "GETQUOTA") + || command == "GETQUOTA" + || command == "X-GET-OTHER-USERS" + || command == "X-GET-DELEGATES" + || command == "X-GET-OUT-OF-OFFICE") { lastResults.clear (); } @@ -154,7 +157,7 @@ } resultInfo = cmd->resultInfo(); completeQueue.removeAll (cmd); - + delete cmd; return retVal; } @@ -372,6 +375,15 @@ if (what[1] == 'K' && what.size() == 2) { parseResult (what, result); + } else if (qstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER + parseOtherUser (result); + } else if (qstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE + parseOutOfOffice (result); + } + break; + case 'D': + if (qstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES + parseDelegate (result); } break; @@ -449,7 +461,12 @@ { parseQuota( result ); } - + break; + case 'X': // Custom command + { + parseCustom( result ); + } + break; default: //better be a number { @@ -775,6 +792,40 @@ lastResults.append( roots.join(" ") ); } +void imapParser::parseCustom (parseString & result) +{ + QByteArray word = parseLiteral (result, false, false); + lastResults.append( word ); +} + +void imapParser::parseOtherUser (parseString & result) +{ + lastResults.append( parseOneWord ( result ) ); +} + +void imapParser::parseDelegate (parseString & result) +{ + const QString email = parseOneWord ( result ); + + QStringList rights; + while ( !result.isEmpty() ) { + QByteArray word = parseLiteral ( result, false, false ); + rights.append( word ); + } + + lastResults.append( email + ":" + rights.join( "," ) ); +} + +void imapParser::parseOutOfOffice (parseString & result) +{ + const QString state = parseOneWord (result); + parseOneWord (result); // skip encoding + + QByteArray msg = parseLiteral (result, false, false); + + lastResults.append( state + "^" + QString::fromUtf8( msg ) ); +} + void imapParser::parseMyRights (parseString & result) { parseOneWord (result); // skip mailbox name @@ -1840,8 +1891,7 @@ { bool proper; long runLenSave = runLen + 1; - QByteArray tmpstr; - tmpstr.resize(runLen); + QByteArray tmpstr(runLen, '\0'); inWords.takeMidNoResize(tmpstr, 1, runLen - 1); runLen = tmpstr.toULong (&proper); inWords.pos += runLenSave; @@ -1903,7 +1953,7 @@ inWords.takeLeftNoResize(retVal, i - 1); len = i - 1; int offset = 0; - for (unsigned int j = 0; j <= len; j++) { + for (unsigned int j = 0; j < len; j++) { if (retVal[j] == '\\') { offset++; j++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.h new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.h --- old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.h 2007-10-03 13:30:05.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.h 2007-10-31 21:36:03.000000000 +0100 @@ -281,6 +281,14 @@ void parseQuotaRoot (parseString & result); /** @brief parse a QUOTA line */ void parseQuota (parseString & result); + /** @brief parse a custom command line */ + void parseCustom (parseString & result); + /** @brief parse a OTHER-USER line */ + void parseOtherUser (parseString & result); + /** @brief parse a DELEGATE line */ + void parseDelegate (parseString & result); + /** @brief parse a OUT-OF-OFFICE line */ + void parseOutOfOffice (parseString & result); /** * parses the results of a fetch command diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/sieve/sieve.protocol new/kdepimlibs-3.95.1/kioslave/sieve/sieve.protocol --- old/kdepimlibs-3.95.0/kioslave/sieve/sieve.protocol 2007-10-16 16:49:25.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/sieve/sieve.protocol 2007-10-31 21:36:03.000000000 +0100 @@ -13,6 +13,7 @@ Icon=remote Description=An ioslave for the Sieve mail filtering protocol Description[ca]=Un 'ioslave' pel protocol de filtrat de correu Sieve +Description[de]=Ein Ein-/Ausgabemodul für das Mailfilter-Protokoll Sieve Description[el]=Ένα ioslave για το πρωτόκολλο φιλτραρίσματος αλληλογραφίας Sieve Description[es]=Un esclavo de E/S para el protocolo de filtrado de correo Sieve Description[fr]=Un ioslave pour le protocole de filtrage de messagerie Sieve diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/smtp/smtp.cpp new/kdepimlibs-3.95.1/kioslave/smtp/smtp.cpp --- old/kdepimlibs-3.95.0/kioslave/smtp/smtp.cpp 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/smtp/smtp.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -55,19 +55,12 @@ #include <kemailsettings.h> -#ifdef __GNUC__ -#warning Port to QTcpSocket -#endif -#if 0 -#include <ksock.h> -#endif - #include <kdebug.h> #include <kcomponentdata.h> #include <kio/slaveinterface.h> #include <klocale.h> - +#include <QHostInfo> #include <memory> using std::auto_ptr; @@ -77,22 +70,8 @@ #include <string.h> #include <stdio.h> #include <assert.h> - -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif #include <netdb.h> -#ifndef NI_NAMEREQD -// FIXME for KDE 3.3: fake defintion -// API design flaw in KExtendedSocket::resolve -# define NI_NAMEREQD 0 -#endif - - extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } @@ -132,20 +111,6 @@ //kDebug(7112) << "SMTPProtocol::SMTPProtocol"; } -unsigned int SMTPProtocol::sendBufferSize() const { - // ### how much is eaten by SSL/TLS overhead? -#ifdef __GNUC__ -#warning Port to QTcpSocket -#endif - const int fd = 0L; //fileno( fp ); - int value = -1; - socklen_t len = sizeof(value); - if ( fd < 0 || ::getsockopt( fd, SOL_SOCKET, SO_SNDBUF, (char*)&value, &len ) ) - value = 1024; // let's be conservative - kDebug(7112) << "send buffer size seems to be " << value << " octets."; - return value > 0 ? value : 1024 ; -} - SMTPProtocol::~SMTPProtocol() { //kDebug(7112) << "SMTPProtocol::~SMTPProtocol"; smtp_close(); @@ -409,12 +374,6 @@ return cmdLine; const unsigned int currentCmdLine_len = currentCmdLine.length(); - if ( cmdLine_len && cmdLine_len + currentCmdLine_len > sendBufferSize() ) { - // must all fit into the send buffer, else connection deadlocks, - // but we need to have at least _one_ command to send - cmd->ungetCommandLine( currentCmdLine, ts ); - return cmdLine; - } cmdLine_len += currentCmdLine_len; cmdLine += currentCmdLine; } @@ -534,22 +493,7 @@ } else { - QString tmpPort; -#ifdef __GNUC__ -#warning Port to QTcpSocket -#endif -#if 0 - KSocketAddress* addr = KExtendedSocket::localAddress(m_iSock); - // perform name lookup. NI_NAMEREQD means: don't return a numeric - // value (we need to know when we get have the IP address, so we - // can enclose it in sqaure brackets (domain-literal). Failure to - // do so is normally harmless with IPv4, but fails for IPv6: - if (KExtendedSocket::resolve(addr, m_hostname, tmpPort, NI_NAMEREQD) != 0) - // FQDN resolution failed - // use the IP address as domain-literal - m_hostname = '[' + addr->nodeName() + ']'; - delete addr; -#endif + m_hostname = QHostInfo::localHostName(); if(m_hostname.isEmpty()) { m_hostname = "localhost.invalid"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/smtp/smtp.h new/kdepimlibs-3.95.1/kioslave/smtp/smtp.h --- old/kdepimlibs-3.95.0/kioslave/smtp/smtp.h 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kioslave/smtp/smtp.h 2007-10-31 21:36:02.000000000 +0100 @@ -112,9 +112,6 @@ return haveCapability("PIPELINING") && metaData("pipelining") != "off" ; } - /** Wrapper around getsockopt(..., SO_SNDBUF,...) */ - unsigned int sendBufferSize() const; - /** This is a pure convenience wrapper around @ref KioSMTP::Capabilities::createSpecialResponse */ QString createSpecialResponse() const { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kldap/ldapoperation.cpp new/kdepimlibs-3.95.1/kldap/ldapoperation.cpp --- old/kdepimlibs-3.95.0/kldap/ldapoperation.cpp 2007-10-03 13:30:06.000000000 +0200 +++ new/kdepimlibs-3.95.1/kldap/ldapoperation.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -338,7 +338,7 @@ kDebug(5322) << "binding to server, bindname: " << bindname << " password: *****"; if ( async ) { - kDebug() << "ldap_sasl_bind (simple)"; + kDebug(5322) << "ldap_sasl_bind (simple)"; int msgid; ret = ldap_sasl_bind( ld, bindname.data(), 0, &ccred, 0, 0, &msgid ); // ret = ldap_simple_bind( ld, bindname.data(),pass.data() ); @@ -346,7 +346,7 @@ ret = msgid; } } else { - kDebug() << "ldap_sasl_bind_s (simple)"; + kDebug(5322) << "ldap_sasl_bind_s (simple)"; ret = ldap_sasl_bind_s( ld, bindname.data(), 0, &ccred, 0, 0, 0 ); // ret = ldap_simple_bind_s( ld, bindname.data(), pass.data() ); } @@ -391,6 +391,8 @@ ldap_value_free_len( bvals ); } attrs[ QString::fromLatin1( name ) ] = values; + ldap_memfree( name ); + // next attribute name = ldap_next_attribute( ld, msg, entry ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kpimidentities/identity.cpp new/kdepimlibs-3.95.1/kpimidentities/identity.cpp --- old/kdepimlibs-3.95.0/kpimidentities/identity.cpp 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kpimidentities/identity.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -95,6 +95,7 @@ mPropertiesMap.insert( i.key(), i.value() ); ++i; } + mSignature.readConfig( config ); } void Identity::writeConfig( KConfigGroup &config ) const @@ -235,7 +236,8 @@ bool Identity::operator== ( const Identity &other ) const { - return mPropertiesMap == other.mPropertiesMap; + return mPropertiesMap == other.mPropertiesMap && + mSignature == other.mSignature; } bool Identity::operator!= ( const Identity &other ) const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kxmlrpcclient/query.cpp new/kdepimlibs-3.95.1/kxmlrpcclient/query.cpp --- old/kdepimlibs-3.95.0/kxmlrpcclient/query.cpp 2007-10-08 09:43:51.000000000 +0200 +++ new/kdepimlibs-3.95.1/kxmlrpcclient/query.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -443,6 +443,7 @@ for ( it = d->mPendingJobs.begin(); it != d->mPendingJobs.end(); ++it ) { (*it)->kill(); } + delete d; } #include "query.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/smtpjob.cpp new/kdepimlibs-3.95.1/mailtransport/smtpjob.cpp --- old/kdepimlibs-3.95.0/mailtransport/smtpjob.cpp 2007-10-08 09:43:52.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/smtpjob.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -82,6 +82,7 @@ KIO::Scheduler::disconnectSlave( slave ); slavePool.clear(); } + delete d; } void SmtpJob::doStart() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/socket.cpp new/kdepimlibs-3.95.1/mailtransport/socket.cpp --- old/kdepimlibs-3.95.0/mailtransport/socket.cpp 2007-08-29 11:51:23.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/socket.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -135,6 +135,7 @@ Socket::~Socket() { kDebug( 5324 ) << objectName() ; + delete d; } void Socket::reconnect() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transportcombobox.cpp new/kdepimlibs-3.95.1/mailtransport/transportcombobox.cpp --- old/kdepimlibs-3.95.0/mailtransport/transportcombobox.cpp 2007-08-29 11:51:23.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/transportcombobox.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -46,6 +46,11 @@ SLOT(fillComboBox()) ); } +TransportComboBox::~TransportComboBox() +{ + delete d; +} + int TransportComboBox::currentTransportId() const { if( currentIndex() >= 0 && currentIndex() < d->transports.count() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transportcombobox.h new/kdepimlibs-3.95.1/mailtransport/transportcombobox.h --- old/kdepimlibs-3.95.0/mailtransport/transportcombobox.h 2007-07-26 12:35:11.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/transportcombobox.h 2007-10-31 21:36:03.000000000 +0100 @@ -42,6 +42,8 @@ */ TransportComboBox( QWidget *parent = 0 ); + ~TransportComboBox(); + /** Returns identifier of the currently selected mail transport. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.cpp new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.cpp --- old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.cpp 2007-05-03 10:36:19.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.cpp 2007-10-31 21:36:03.000000000 +0100 @@ -45,6 +45,11 @@ d->buttonGroup = ui.kcfg_type; } +TransportTypeDialog::~TransportTypeDialog() +{ + delete d; +} + int TransportTypeDialog::transportType() const { return d->buttonGroup->selected(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.h new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.h --- old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.h 2007-06-27 12:40:41.000000000 +0200 +++ new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.h 2007-10-31 21:36:03.000000000 +0100 @@ -41,6 +41,8 @@ */ TransportTypeDialog( QWidget *parent = 0 ); + ~TransportTypeDialog(); + /** Returns the selected transport type. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/syndication/tests/testpersonimpl.cpp new/kdepimlibs-3.95.1/syndication/tests/testpersonimpl.cpp --- old/kdepimlibs-3.95.0/syndication/tests/testpersonimpl.cpp 2007-07-26 12:35:09.000000000 +0200 +++ new/kdepimlibs-3.95.1/syndication/tests/testpersonimpl.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -63,6 +63,18 @@ s.append("Foo Bar <foo(a)bar.com>"); p.append(PersonPtr(new PersonImpl("Foo Bar", QString(), "foo(a)bar.com"))); + s.append("John Doe (President) <john(a)doe.com>"); + p.append(PersonPtr(new PersonImpl("John Doe (President)", QString(), "john(a)doe.com"))); + + s.append("John Doe (President)"); + p.append(PersonPtr(new PersonImpl("John Doe (President)", QString(), QString() ))); + + s.append("John Doe (President)) <john(a)doe.com>"); + p.append(PersonPtr(new PersonImpl("John Doe (President))", QString(), "john(a)doe.com"))); + + s.append("(President) John Doe <john(a)doe.com>"); + p.append(PersonPtr(new PersonImpl("(President) John Doe", QString(), "john(a)doe.com"))); + s.append("<foo(a)bar.com> (Foo Bar)"); p.append(PersonPtr(new PersonImpl("Foo Bar", QString(), "foo(a)bar.com"))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/syndication/tools.cpp new/kdepimlibs-3.95.1/syndication/tools.cpp --- old/kdepimlibs-3.95.0/syndication/tools.cpp 2007-07-26 12:35:10.000000000 +0200 +++ new/kdepimlibs-3.95.1/syndication/tools.cpp 2007-10-31 21:36:02.000000000 +0100 @@ -251,13 +251,15 @@ name = str.simplified(); - // str might have the format "foo(a)bar.com (Foo M. Bar)". - // We cut off parentheses if there are any - QRegExp rename("\$([^\$]*)\\)"); - - pos = rename.indexIn(name); - - if (pos != -1) + // after removing the email, str might have + // the format "(Foo M. Bar)". We cut off + // parentheses if there are any. However, if + // str is of the format "Foo M. Bar (President)", + // we should not cut anything. + + QRegExp rename("^\$([^\$]*)\\)"); + + if (rename.exactMatch(name)) { name = rename.cap(1); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdenetwork4 checked in at Fri Nov 2 01:26:32 CET 2007. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2007-10-23 10:45:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-11-01 12:21:23.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 1 12:21:23 CET 2007 - dmueller(a)suse.de + +- update to 3.95.1 + +------------------------------------------------------------------- +Fri Oct 26 13:34:38 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 beta4 + +------------------------------------------------------------------- Old: ---- disable-kopete.diff kdenetwork-3.94.1.tar.bz2 New: ---- FIXME.diff kdenetwork-3.95.1.tar.bz2 r731747.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.r19948/_old 2007-11-02 01:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.r19948/_new 2007-11-02 01:24:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 3.94.1) +# spec file for package kdenetwork4 (Version 3.95.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,22 +10,23 @@ Name: kdenetwork4 -BuildRequires: LibVNCServer-devel gpgme-devel kdebase4-workspace-devel +BuildRequires: LibVNCServer-devel gpgme-devel kdebase4-workspace-devel libqimageblitz-devel BuildRequires: libqca2-devel meanwhile-devel openslp-devel sqlite-devel wireless-tools License: GPL v2 or later Group: Productivity/Networking/Other Summary: KDE Network Base Package Url: http://www.kde.org -Version: 3.94.1 -Release: 2 -%define rversion 3.94.1 +Version: 3.95.1 +Release: 1 +%define rversion 3.95.1 Source0: kdenetwork-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime -Patch1: disable-kopete.diff Patch2: desktop-files.diff -%define with_kopete 0 +Patch3: r731747.diff +Patch4: FIXME.diff +%define with_kopete 1 Suggests: kde4-kget %if %with_kopete Suggests: kde4-kopete @@ -50,8 +51,9 @@ %prep %setup -q -n kdenetwork-%rversion -%patch1 %patch2 +%patch3 +%patch4 %build %cmake_kde4 -d build @@ -73,10 +75,6 @@ %suse_update_desktop_file -r kget System TrayIcon %suse_update_desktop_file -r krfb System RemoteAccess %kde_post_install - # Hack for by default installed KDE4 on 10.3 - install -d $RPM_BUILD_ROOT/usr/share/pixmaps - ln -s ../icons/oxygen/48x48/apps/krfb.png $RPM_BUILD_ROOT/usr/share/pixmaps/ - ln -s ../icons/oxygen/48x48/apps/krdc.png $RPM_BUILD_ROOT/usr/share/pixmaps/ %post -p /sbin/ldconfig @@ -197,6 +195,35 @@ /usr/share/icons/oxygen/*/actions/delete_user.* /usr/share/icons/oxygen/*/actions/edit_user.* /usr/share/icons/oxygen/*/actions/emoticon.* +/usr/%_lib/libgadu_kopete.so.1 +/usr/%_lib/libgadu_kopete.so.1.0.0 +/usr/%_lib/libiris_kopete.so.1 +/usr/%_lib/libiris_kopete.so.1.0.0 +/usr/%_lib/libkopete.so.4 +/usr/%_lib/libkopete.so.4.0.0 +/usr/%_lib/libkopete_msn_shared.so.4 +/usr/%_lib/libkopete_msn_shared.so.4.0.0 +/usr/%_lib/libkopete_oscar.so.4 +/usr/%_lib/libkopete_oscar.so.4.0.0 +/usr/%_lib/libkopete_videodevice.so.4 +/usr/%_lib/libkopete_videodevice.so.4.0.0 +/usr/%_lib/libkopeteaddaccountwizard.so.1 +/usr/%_lib/libkopeteaddaccountwizard.so.1.0.0 +/usr/%_lib/libkopetechatwindow_shared.so.1 +/usr/%_lib/libkopetechatwindow_shared.so.1.0.0 +/usr/%_lib/libkopeteidentity.so.1 +/usr/%_lib/libkopeteidentity.so.1.0.0 +/usr/%_lib/libkopeteprivacy.so.1 +/usr/%_lib/libkopeteprivacy.so.1.0.0 +/usr/%_lib/libkyahoo.so.1 +/usr/%_lib/libkyahoo.so.1.0.0 +/usr/%_lib/liboscar.so.1 +/usr/%_lib/liboscar.so.1.0.0 +/usr/%_lib/libpapillon_kopete.so.1 +/usr/%_lib/libpapillon_kopete.so.1.0.0 +/usr/share/dbus-1/interfaces/org.kde.Kopete.xml +/usr/share/dbus-1/interfaces/org.kde.kopete.Statistics.xml +/usr/share/kde4/apps/kopete_statistics/statisticsui.rc %endif %package -n kde4-kppp @@ -257,7 +284,6 @@ %doc COPYING COPYING-DOCS README /usr/bin/krdc /usr/share/applications/kde4/krdc.desktop -/usr/share/pixmaps/krdc.png /usr/share/kde4/config.kcfg/krdc.kcfg %_kde_share_dir/apps/krdc %doc %lang(en) /usr/share/doc/kde/HTML/en/krdc @@ -292,7 +318,6 @@ /usr/bin/krfb %_kde_share_dir/apps/krfb /usr/share/applications/kde4/krfb.desktop -/usr/share/pixmaps/krfb.png #/usr/share/dbus-1/interfaces/org.kde.krfb.xml %doc %lang(en) /usr/share/doc/kde/HTML/en/krfb #%_kde_share_dir/services/kinetd_krfb.desktop @@ -320,14 +345,8 @@ %files -n kde4-knewsticker %defattr(-,root,root) %doc COPYING COPYING-DOCS README -/usr/bin/knewstickerstub -/usr/%_lib/kde4/knewsticker_panelapplet.so -/usr/share/applications/kde4/knewsticker-standalone.desktop -/usr/share/applications/kde4/knewstickerstub.desktop -%_kde_share_dir/apps/kconf_update/knewsticker.upd -%_kde_share_dir/apps/kconf_update/knt-0.1-0.2.pl -%_kde_share_dir/apps/kicker/applets/knewsticker.desktop -%_kde_share_dir/apps/knewsticker +/usr/%_lib/kde4/plasma_applet_knewsticker.so +/usr/share/kde4/services/plasma-knewsticker-default.desktop /usr/share/icons/hicolor/*/apps/knewsticker.* %lang(en) /usr/share/doc/kde/HTML/en/knewsticker @@ -514,7 +533,27 @@ %files devel %defattr(-,root,root) %_libdir/libkgetcore.so +%if %with_kopete +/usr/include/kopete +/usr/%_lib/libgadu_kopete.so +/usr/%_lib/libiris_kopete.so +/usr/%_lib/libkopete.so +/usr/%_lib/libkopete_msn_shared.so +/usr/%_lib/libkopete_oscar.so +/usr/%_lib/libkopete_videodevice.so +/usr/%_lib/libkopeteaddaccountwizard.so +/usr/%_lib/libkopetechatwindow_shared.so +/usr/%_lib/libkopeteidentity.so +/usr/%_lib/libkopeteprivacy.so +/usr/%_lib/libkyahoo.so +/usr/%_lib/liboscar.so +/usr/%_lib/libpapillon_kopete.so +%endif %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- update to 3.95.1 +* Fri Oct 26 2007 - dmueller(a)suse.de +- update to KDE 4.0 beta4 * Tue Oct 23 2007 - dmueller(a)suse.de - remove reference to uninstalled icon file * Thu Oct 18 2007 - dmueller(a)suse.de ++++++ FIXME.diff ++++++ --- kopete/plugins/motionautoaway/motionawayplugin.cpp +++ kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -46,32 +46,6 @@ #include "kopeteaccountmanager.h" #include "kopeteaway.h" -/* The following is a hack: - * e.g. Mandrake 9.x ships with a patched - * kernel which doesn't define this 64 bit types (we need GNU C lib - * because we use long long and warning - gcc extensions.) - * - * This is caused by the !defined(__STRICT_ANSI__) check in - * /usr/include/asm/types.h - */ -#if !defined(__u64) && defined(__GNUC__) -#if SIZEOF_UNSIGNED_LONG >= 8 -typedef unsigned long __u64; -#else -typedef unsigned long long __u64; -#endif -#endif - -#if !defined(__s64) && defined(__GNUC__) -#if SIZEOF_LONG >= 8 -typedef signed long __s64; -#else -typedef __signed__ long long __s64; -#endif -#endif -/* - * End hack - */ #include <linux/version.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) ++++++ kdenetwork-3.94.1.tar.bz2 -> kdenetwork-3.95.1.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork-3.94.1.tar.bz2 /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork-3.95.1.tar.bz2 differ: byte 11, line 1 ++++++ r731747.diff ++++++ ------------------------------------------------------------------------ r731747 | mueller | 2007-11-01 20:29:22 +0100 (Thu, 01 Nov 2007) | 4 lines reenable on 64bit platforms. whatever the problem is, it is better ending up getting fixed than being papered over ------------------------------------------------------------------------ --- kopete/plugins/CMakeLists.txt +++ kopete/plugins/CMakeLists.txt @@ -26,7 +26,7 @@ if( LIBXML2_FOUND AND LIBXSLT_FOUND ) add_subdirectory( webpresence ) endif( LIBXML2_FOUND AND LIBXSLT_FOUND ) -if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8 AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_subdirectory(motionautoaway) -endif(NOT CMAKE_SIZEOF_VOID_P EQUAL 8 AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdemultimedia4 checked in at Fri Nov 2 01:26:29 CET 2007. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2007-10-20 17:41:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2007-10-26 13:34:05.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 26 13:34:00 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 beta4 + +------------------------------------------------------------------- Old: ---- kdemultimedia-3.94.1.tar.bz2 New: ---- kdemultimedia-3.95.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.C19857/_old 2007-11-02 01:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.C19857/_new 2007-11-02 01:24:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 3.94.1) +# spec file for package kdemultimedia4 (Version 3.95.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 3.94.1 +Version: 3.95.0 Release: 1 -%define rversion 3.94.1 +%define rversion 3.95.0 Source0: kdemultimedia-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -389,6 +389,8 @@ %_kde_share_dir/config.kcfg/libkcddb.kcfg %_kde_share_dir/services/libkcddb.desktop %changelog +* Fri Oct 26 2007 - dmueller(a)suse.de +- update to KDE 4.0 beta4 * Sat Oct 20 2007 - dmueller(a)suse.de - update to 3.94.1 * Tue Oct 09 2007 - dmueller(a)suse.de ++++++ kdemultimedia-3.94.1.tar.bz2 -> kdemultimedia-3.95.0.tar.bz2 ++++++ Files old/kdemultimedia-3.94.1/doc/juk/index.cache.bz2 and new/kdemultimedia-3.95.0/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-3.94.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-3.95.0/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-3.94.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-3.95.0/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/juk/CMakeLists.txt new/kdemultimedia-3.95.0/juk/CMakeLists.txt --- old/kdemultimedia-3.94.1/juk/CMakeLists.txt 2007-08-29 11:56:43.000000000 +0200 +++ new/kdemultimedia-3.95.0/juk/CMakeLists.txt 2007-10-24 14:17:57.000000000 +0200 @@ -101,8 +101,7 @@ # Add gstreamer here too... -target_link_libraries(juk m ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES} - ${KDE4_PHONON_LIBS}) +target_link_libraries(juk m ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_PHONON_LIBS}) if(TUNEPIMP_FOUND) target_link_libraries(juk ${TUNEPIMP_LIBRARIES}) endif(TUNEPIMP_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/juk/jukservicemenu.desktop new/kdemultimedia-3.95.0/juk/jukservicemenu.desktop --- old/kdemultimedia-3.94.1/juk/jukservicemenu.desktop 2007-10-03 13:47:40.000000000 +0200 +++ new/kdemultimedia-3.95.0/juk/jukservicemenu.desktop 2007-10-23 10:39:36.000000000 +0200 @@ -1,6 +1,7 @@ [Desktop Entry] Encoding=UTF-8 ServiceTypes=application/ogg,audio/x-vorbis+ogg,audio/mpeg,audio/x-flac,audio/x-flac+ogg,audio/x-musepack +Type=Service Actions=addToCollection; [Desktop Action addToCollection] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlistbox.cpp new/kdemultimedia-3.95.0/juk/playlistbox.cpp --- old/kdemultimedia-3.94.1/juk/playlistbox.cpp 2007-06-27 12:59:16.000000000 +0200 +++ new/kdemultimedia-3.95.0/juk/playlistbox.cpp 2007-10-23 10:39:36.000000000 +0200 @@ -331,7 +331,7 @@ "playlists from your collection?"), names, i18n("Remove Items?"), - KGuiItem(i18n("&Remove"), "edit-trash")) == KMessageBox::Cancel) + KGuiItem(i18n("&Remove"), "user-trash")) == KMessageBox::Cancel) { return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlistcollection.cpp new/kdemultimedia-3.95.0/juk/playlistcollection.cpp --- old/kdemultimedia-3.94.1/juk/playlistcollection.cpp 2007-10-08 09:42:17.000000000 +0200 +++ new/kdemultimedia-3.95.0/juk/playlistcollection.cpp 2007-10-23 10:39:36.000000000 +0200 @@ -882,7 +882,7 @@ createAction(i18n("Play First Track"),SLOT(slotPlayFirst()), "playFirst"); - createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "find-next"); + createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "edit-find-next"); createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "document-open", KShortcut(Qt::CTRL + Qt::Key_O)); createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "document-open"); @@ -890,7 +890,7 @@ createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); createAction(i18n("Save"), SLOT(slotSave()), "file_save", "document-save", KShortcut(Qt::CTRL + Qt::Key_S)); createAction(i18n("Save As..."), SLOT(slotSaveAs()), "file_save_as", "document-save-as"); - createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "edit-trash"); + createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "user-trash"); createAction(i18n("Reload"), SLOT(slotReload()), "reloadPlaylist", "view-refresh"); createAction(i18n("Edit Search..."), SLOT(slotEditSearch()), "editSearch", "edit-clear"); @@ -918,7 +918,7 @@ historyAction->setCheckedState(KGuiItem(i18n("Hide &History"))); KToggleAction *upcomingAction = - new KToggleAction(KIcon("calendar-today"), i18n("Show &Play Queue"), actions()); + new KToggleAction(KIcon("go-jump-today"), i18n("Show &Play Queue"), actions()); actions()->addAction("showUpcoming", upcomingAction); upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue"))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlist.cpp new/kdemultimedia-3.95.0/juk/playlist.cpp --- old/kdemultimedia-3.94.1/juk/playlist.cpp 2007-10-03 13:47:40.000000000 +0200 +++ new/kdemultimedia-3.95.0/juk/playlist.cpp 2007-10-23 10:39:36.000000000 +0200 @@ -2096,7 +2096,7 @@ m_rmbMenu = new KMenu(this); - m_rmbMenu->addAction(SmallIcon("calendar-today"), + m_rmbMenu->addAction(SmallIcon("go-jump-today"), i18n("Add to Play Queue"), this, SLOT(slotAddToUpcoming())); m_rmbMenu->addSeparator(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-3.95.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- old/kdemultimedia-3.94.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-10-16 16:50:29.000000000 +0200 +++ new/kdemultimedia-3.95.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-10-23 10:39:36.000000000 +0200 @@ -81,6 +81,7 @@ Comment[fa]=پیکربندی پی‌رو IO دیسک فشردۀ صوتی Comment[fi]=Audiocd-siirräntätyöskentelijän asetukset Comment[fr]=Configuration du module pour CD audio +Comment[ga]=Cumraíocht ioslave Audiocd Comment[gl]=Configuración do escravo IO de audiocd Comment[he]=שינוי הגדרות פרוטוקול תקליטורי השמע Comment[hr]=Postava Audiocd IO poslužnika diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixapplet.desktop new/kdemultimedia-3.95.0/kmix/kmixapplet.desktop --- old/kdemultimedia-3.94.1/kmix/kmixapplet.desktop 2007-10-16 16:50:29.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/kmixapplet.desktop 2007-10-23 10:39:36.000000000 +0200 @@ -64,10 +64,12 @@ Comment[el]=Εμφανίζει και σας επιτρέπει να αλλάξετε την ένταση του ήχου Comment[es]=Muestra y le deja controlar el volumen del sonido Comment[fr]=Montre et vous permet de contrôler les volumes sonores +Comment[ga]=Taispeáin agus rialaigh airde na fuaime Comment[gl]=Mostra e permítelle controlar os volumes do son Comment[ja]=音量の表示とコントロール Comment[ko]=소리 음량을 보여 주고 조정합니다 Comment[nb]=Lar deg vise og kontrollere lydstyrke +Comment[nds]=Wiest de Luutstärk-Kuntrull Comment[ne]=देखाउँछ र तपाईँलाई ध्वनि भोल्युम नियन्त्रण गर्न अनुमति दिन्छ Comment[nl]=Hiermee kunt u het geluidsvolume instellen Comment[nn]=Viser og let deg endra lydstyrke diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixctrl_restore.desktop new/kdemultimedia-3.95.0/kmix/kmixctrl_restore.desktop --- old/kdemultimedia-3.94.1/kmix/kmixctrl_restore.desktop 2007-10-03 13:47:41.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/kmixctrl_restore.desktop 2007-10-23 10:39:36.000000000 +0200 @@ -18,6 +18,7 @@ Name[fa]=باز‌گردانی تنظیمات مخلوط‌کن Name[fi]=Palauta mikserin asetukset Name[fr]=Restaurer la configuration du mixage +Name[ga]=Athchóirigh Socruithe an Mheascthóra Name[gl]=Restaura-los Parámetros do Mesturador Name[he]=שיחזור הגדרות המערבל Name[hr]=Vrati postavke miksera diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixdockwidget.cpp new/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp --- old/kdemultimedia-3.94.1/kmix/kmixdockwidget.cpp 2007-08-29 11:56:50.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp 2007-10-26 11:05:41.000000000 +0200 @@ -235,7 +235,7 @@ case 'm': setIcon( loadIcon( "kmixdocked_mute" ) ); break; case '1': setIcon( loadIcon( "kmixdocked_mute" ) ); break; // @todo case '2': setIcon( loadIcon( "kmixdocked_error" ) ); break; // @todo - case '3': setIcon( loadIcon( "kmixdocked" ) ); break; + case '3': setIcon( loadIcon( "audio-volume-high" ) ); break; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixerwidget.cpp new/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp --- old/kdemultimedia-3.94.1/kmix/kmixerwidget.cpp 2007-10-08 09:42:18.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp 2007-10-25 11:35:04.000000000 +0200 @@ -264,7 +264,10 @@ */ void KMixerWidget::loadConfig( KConfig *config, const QString &grp ) { - config->setGroup( grp ); +#ifdef __GNUC__ +#warning port to KConfigGroup. see also comments in KMixToolBox --ossi +#endif +// config->setGroup( grp ); const std::vector<ViewBase*>::const_iterator viewsEnd = _views.end(); for ( std::vector<ViewBase*>::const_iterator it = _views.begin(); it != viewsEnd; ++it) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/mixer_oss.cpp new/kdemultimedia-3.95.0/kmix/mixer_oss.cpp --- old/kdemultimedia-3.94.1/kmix/mixer_oss.cpp 2007-06-27 12:59:22.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/mixer_oss.cpp 2007-10-26 11:05:41.000000000 +0200 @@ -263,22 +263,44 @@ { errormsg (Mixer::ERR_WRITE); } - else { - // Re-read status of record source(s). Just in case the hardware/driver has - // some limitaton (like exclusive switches) - int recsrcMask; - if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) - errormsg(Mixer::ERR_READ); - else - { - for(int i=0; i< m_mixDevices.count() ; i++ ) - { - MixDevice *md = m_mixDevices[i]; - bool isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); - md->setRecSource(isRecsrc); - } // for all controls - } // reading newrecsrcmask is OK + /* The following if {} patch was submitted by Tim McCormick <tim(a)pcbsd.org>. */ + /* Comment (cesken): This patch fixes an issue with mutual exclusive recording sources. + Actually the kernel soundcard driver *could* "do the right thing" by examining the change + (old-recsrc XOR new-recsrc), and knowing which sources are mutual exclusive. + The OSS v3 API docs indicate that the behaviour is undefined for this case, and it is not + clearly documented how and whether SOUND_MIXER_CAP_EXCL_INPUT is evaluated in the OSS driver. + Evaluating that in the application (KMix) could help, but the patch will work independent + on whether SOUND_MIXER_CAP_EXCL_INPUT ist set or not. + + In any case this patch is a superb workaround for a shortcoming of the OSS v3 API. + */ + // If the record source is supposed to be on, but wasn't set, explicitly + // set the record source. Not all cards support multiple record sources. + // As a result, we also need to do the read & write again. + if (((i_recsrc & ( 1<<devnum)) == 0) && on) + { + // Setting the new device failed => Try to enable it *exclusively* + oldrecsrc = i_recsrc = 1 << devnum; + if (ioctl(m_fd, SOUND_MIXER_WRITE_RECSRC, &i_recsrc) == -1) + errormsg (Mixer::ERR_WRITE); + if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) + errormsg(Mixer::ERR_READ); } + + // Re-read status of record source(s). Just in case the hardware/driver has + // some limitaton (like exclusive switches) + int recsrcMask; + if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) + errormsg(Mixer::ERR_READ); + else + { + for(int i=0; i< m_mixDevices.count() ; i++ ) + { + MixDevice *md = m_mixDevices[i]; + bool isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); + md->setRecSource(isRecsrc); + } // for all controls + } // reading newrecsrcmask is OK } Files old/kdemultimedia-3.94.1/kmix/pics/audio-volume-high.png and new/kdemultimedia-3.95.0/kmix/pics/audio-volume-high.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/pics/CMakeLists.txt new/kdemultimedia-3.95.0/kmix/pics/CMakeLists.txt --- old/kdemultimedia-3.94.1/kmix/pics/CMakeLists.txt 2006-10-26 04:29:29.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/pics/CMakeLists.txt 2007-10-26 11:05:41.000000000 +0200 @@ -4,6 +4,6 @@ ########### install files ############### -install( FILES mix_audio.png mix_bass.png mix_cd.png mix_ext.png mix_microphone.png mix_midi.png mix_recmon.png mix_treble.png mix_unknown.png mix_volume.png mix_surround.png mix_video.png mix_headphone.png mix_digital.png mix_ac97.png kmixdocked.png kmixdocked_mute.png kmixdocked_error.png mix_record.png SpeakerFrontLeft.png SpeakerRearLeft.png SpeakerFrontRight.png SpeakerRearRight.png Listener.png DESTINATION ${DATA_INSTALL_DIR}/kmix/pics ) +install( FILES mix_audio.png mix_bass.png mix_cd.png mix_ext.png mix_microphone.png mix_midi.png mix_recmon.png mix_treble.png mix_unknown.png mix_volume.png mix_surround.png mix_video.png mix_headphone.png mix_digital.png mix_ac97.png kmixdocked.png kmixdocked_mute.png kmixdocked_error.png mix_record.png SpeakerFrontLeft.png SpeakerRearLeft.png SpeakerFrontRight.png SpeakerRearRight.png Listener.png audio-volume-high.png DESTINATION ${DATA_INSTALL_DIR}/kmix/pics ) kde4_install_icons( ${ICON_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kmix/restore_kmix_volumes.desktop new/kdemultimedia-3.95.0/kmix/restore_kmix_volumes.desktop --- old/kdemultimedia-3.94.1/kmix/restore_kmix_volumes.desktop 2007-10-03 13:47:41.000000000 +0200 +++ new/kdemultimedia-3.95.0/kmix/restore_kmix_volumes.desktop 2007-10-23 10:39:36.000000000 +0200 @@ -20,6 +20,7 @@ Name[fa]=باز‌گردانی حجم صداهای مخلوط‌کن Name[fi]=Palauta mikserin äänivoimakkuudet Name[fr]=Restaurer les volumes du mixage +Name[ga]=Athchóirigh Airdí an Mheascthóra Name[gl]=Restaurar os Volumes do Mesturador Name[he]=שיחזור עוצמות הקול של המערבל Name[hu]=A hangkeverő hangerőinek visszaállítása diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.94.1/kscd/audiocd_play.desktop new/kdemultimedia-3.95.0/kscd/audiocd_play.desktop --- old/kdemultimedia-3.94.1/kscd/audiocd_play.desktop 2007-10-03 13:47:39.000000000 +0200 +++ new/kdemultimedia-3.95.0/kscd/audiocd_play.desktop 2007-10-24 14:17:57.000000000 +0200 @@ -1,6 +1,7 @@ [Desktop Entry] Encoding=UTF-8 ServiceTypes=media/audiocd +Type=Service Actions=Play; X-KDE-Priority=TopLevel @@ -36,6 +37,7 @@ Name[ne]=प्ले Name[nl]=Afspelen Name[nn]=Spel +Name[oc]=Legir Name[pa]=ਚਲਾਓ Name[pl]=Odtwarzaj Name[pt]=Tocar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package kdelibs4 checked in at Fri Nov 2 01:24:11 CET 2007. -------- --- KDE/kdelibs4/kdelibs4.changes 2007-10-30 15:33:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-11-01 10:46:04.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 10:45:52 CET 2007 - dmueller(a)suse.de + +- add nepomuk library to the filelist + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.Cm4427/_old 2007-11-02 01:14:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Cm4427/_new 2007-11-02 01:14:48.000000000 +0100 @@ -22,7 +22,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 3.95.0 -Release: 1 +Release: 2 %define rversion 3.95.0 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: kdelibs4-core dbus-1-x11 shared-mime-info @@ -340,6 +340,7 @@ %_libdir/libkfile.so.* %_libdir/libknewstuff2.so.* %_libdir/libphonon.so.* +%_libdir/libnepomuk.so.* %package -n libkde4-devel Group: System/GUI/KDE @@ -486,6 +487,7 @@ %_libdir/libkfile.so %_libdir/libknewstuff2.so %_libdir/libphonon.so +%_libdir/libnepomuk.so %files %defattr(-,root,root) @@ -524,6 +526,8 @@ /usr/share/icons/hicolor/*/actions/presence_unknown.* /usr/share/man/man*/* %changelog +* Thu Nov 01 2007 - dmueller(a)suse.de +- add nepomuk library to the filelist * Tue Oct 30 2007 - dmueller(a)suse.de - update to 3.95 * Thu Oct 18 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0