Hello community, here is the log from the commit of package kdepim3 checked in at Sun Feb 4 18:22:46 CET 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-02-02 15:43:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-02-02 21:32:29.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 2 21:32:10 CET 2007 - dmueller@suse.de + +- disable korganizer debug log (#241511) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.E25372/_old 2007-02-04 18:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.E25372/_new 2007-02-04 18:22:21.000000000 +0100 @@ -29,7 +29,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.6 -Release: 4 +Release: 5 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -683,6 +683,8 @@ /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* %changelog -n kdepim3 +* Fri Feb 02 2007 - dmueller@suse.de +- disable korganizer debug log (#241511) * Fri Feb 02 2007 - stbinner@suse.de - fix changelog chronological order * Fri Feb 02 2007 - dmueller@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.E25372/_old 2007-02-04 18:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.E25372/_new 2007-02-04 18:22:22.000000000 +0100 @@ -11,6 +11,50 @@ Comment[bg]=Приставка за Akregator Comment[br]=Lugent evit Akregator Comment[ca]=Endollable per a Akregator +--- akregator/src/akregator_part.cpp ++++ akregator/src/akregator_part.cpp +@@ -513,13 +513,21 @@ + { + if (!factory()) + { +- kdDebug() << "Akregator::Part::mergePart(): factory() returns NULL" << endl; +- return false; ++ if (m_mergedPart) ++ removeChildClient(m_mergedPart); ++ else ++ insertChildClient(part); + } +- if (m_mergedPart) ++ else ++ { ++ if (m_mergedPart) { + factory()->removeClient(m_mergedPart); +- if (part) ++ if (childClients()->containsRef(m_mergedPart)) ++ removeChildClient(m_mergedPart); ++ } ++ if (part) + factory()->addClient(part); ++ } + + m_mergedPart = part; + } +--- akregator/src/akregator_view.h ++++ akregator/src/akregator_view.h +@@ -277,12 +277,8 @@ + void disconnectFromFeedList(FeedList* feedList); + + void updateTagActions(); +- +- protected slots: +- +- /** this is called by the ctor, does init steps which need a properly created view and part */ + +- void delayedInit(); ++ protected slots: + + void connectFrame(Frame *); + --- akregator/src/akregator_plugin.desktop +++ akregator/src/akregator_plugin.desktop @@ -3,6 +3,7 @@ @@ -40,6 +84,37 @@ Comment[bg]=Пристигнали са нови статии Comment[ca]=S'han obtingut nous articles Comment[cs]=Byly staženy nové články +--- akregator/src/akregator_view.cpp ++++ akregator/src/akregator_view.cpp +@@ -367,18 +367,7 @@ + } + + QTimer::singleShot(1000, this, SLOT(slotDeleteExpiredArticles()) ); +- QTimer::singleShot(0, this, SLOT(delayedInit())); +-} +- +-void View::delayedInit() +-{ +- // HACK, FIXME: +- // for some reason, m_part->factory() is NULL at startup of kontact, +- // and thus the article viewer GUI can't be merged when creating the view. +- // Even the delayed init didn't help. Well, we retry every half a second until +- // it works. This is kind of creative, but a dirty hack nevertheless. +- if ( !m_part->mergePart(m_articleViewer) ) +- QTimer::singleShot(500, this, SLOT(delayedInit())); ++ m_part->mergePart(m_articleViewer); + } + + void View::slotSettingsChanged() +@@ -695,8 +684,6 @@ + emit setProgress(f->progress()); + emit setStatusBarText(f->statusText()); + +- m_part->mergePart(m_articleViewer); +- + if (f->part() == m_part) + m_part->mergePart(m_articleViewer); + else --- kmobile/devices/gnokii/libkmobile_gnokii.desktop +++ kmobile/devices/gnokii/libkmobile_gnokii.desktop @@ -2,6 +2,7 @@ @@ -122,6 +197,18 @@ Name[bg]=Разписание TV Name[ca]=Programació de la TV Name[cs]=TV programy +--- kresources/groupwise/soap/stdsoap2.h ++++ kresources/groupwise/soap/stdsoap2.h +@@ -507,7 +507,9 @@ + # endif + #endif + ++#ifdef I_KNOW_WHAT_IM_DOING + #define DEBUG /* Uncomment to debug sending (in file SENT.log) receiving (in file RECV.log) and messages (in file TEST.log) */ ++#endif + + #ifdef __cplusplus + extern "C" { --- kresources/groupwise/soap/gwconverter.cpp +++ kresources/groupwise/soap/gwconverter.cpp @@ -131,3 +131,41 @@ @@ -1346,6 +1433,27 @@ Comment[bg]=Приставка за управление на адресника Comment[br]=Lugent melestradur ar c'harnedoù chomlec'hioù Comment[bs]=Dodatak za upravljanje adresarima +--- Makefile.am.in ++++ Makefile.am.in +@@ -10,7 +10,8 @@ + # Libraries and their upwards dependencies + COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer + COMPILE_AFTER_libkholidays = korganizer kontact +-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer ksync libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins ++#COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer ksync libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins ++COMPILE_AFTER_libkcal = kalarm konsolekalendar korganizer ksync libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins + COMPILE_AFTER_mimelib = korn kmail + COMPILE_AFTER_libkdenetwork = kmail knode + COMPILE_AFTER_libksieve = kmail +@@ -33,7 +34,7 @@ + COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode + COMPILE_BEFORE_wizards = libkdepim kresources korganizer kaddressbook kmail + COMPILE_BEFORE_korn = libkdenetwork +-COMPILE_BEFORE_kitchensync = libkdepim ++#COMPILE_BEFORE_kitchensync = libkdepim + COMPILE_BEFORE_akregator = libkdepim + COMPILE_BEFORE_knotes = libkdepim + COMPILE_BEFORE_konsolekalendar = libkdepim --- libkholidays/holidays/holiday_ja +++ libkholidays/holidays/holiday_ja @@ -26,26 +26,26 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org