May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ruby-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package ruby-qt4 for openSUSE:Factory checked in at 2014-05-22 06:49:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-qt4 (Old) and /work/SRC/openSUSE:Factory/.ruby-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-qt4/ruby-qt4.changes 2014-04-18 12:36:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-qt4.new/ruby-qt4.changes 2014-05-22 06:49:44.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:56 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- qtruby-4.13.0.tar.xz New: ---- qtruby-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-qt4.spec ++++++ --- /var/tmp/diff_new_pack.W6DsPk/_old 2014-05-22 06:49:45.000000000 +0200 +++ /var/tmp/diff_new_pack.W6DsPk/_new 2014-05-22 06:49:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: ruby-qt4 -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: QtRuby kdebindings library License: LGPL-2.1+ ++++++ qtruby-4.13.0.tar.xz -> qtruby-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ruby-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package ruby-kde4 for openSUSE:Factory checked in at 2014-05-22 06:49:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-kde4 (Old) and /work/SRC/openSUSE:Factory/.ruby-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-kde4/ruby-kde4.changes 2014-04-18 12:36:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-kde4.new/ruby-kde4.changes 2014-05-22 06:49:43.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:50 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- korundum-4.13.0.tar.xz New: ---- korundum-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.HRMDhO/_old 2014-05-22 06:49:44.000000000 +0200 +++ /var/tmp/diff_new_pack.HRMDhO/_new 2014-05-22 06:49:44.000000000 +0200 @@ -32,7 +32,7 @@ Summary: Korundum Ruby-KDE library License: LGPL-2.1+ Group: Development/Libraries/KDE -Version: 4.13.0 +Version: 4.13.1 Release: 0 Source0: korundum-%{version}.tar.xz Url: https://projects.kde.org/projects/kde/kdebindings/ruby/korundum ++++++ korundum-4.13.0.tar.xz -> korundum-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package perl-kde4 for openSUSE:Factory checked in at 2014-05-22 06:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-kde4 (Old) and /work/SRC/openSUSE:Factory/.perl-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-kde4/perl-kde4.changes 2014-04-18 12:36:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-kde4.new/perl-kde4.changes 2014-05-22 06:49:41.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:44 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- perlkde-4.13.0.tar.xz New: ---- perlkde-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-kde4.spec ++++++ --- /var/tmp/diff_new_pack.edcjhW/_old 2014-05-22 06:49:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edcjhW/_new 2014-05-22 06:49:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-kde4 -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Kdebindings Perl-KDE library License: LGPL-2.1+ ++++++ perlkde-4.13.0.tar.xz -> perlkde-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package perl-qt4 for openSUSE:Factory checked in at 2014-05-22 06:49:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-qt4 (Old) and /work/SRC/openSUSE:Factory/.perl-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-qt4/perl-qt4.changes 2014-04-18 12:37:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-qt4.new/perl-qt4.changes 2014-05-22 06:49:39.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:34 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- perlqt-4.13.0.tar.xz New: ---- perlqt-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-qt4.spec ++++++ --- /var/tmp/diff_new_pack.PCrsbx/_old 2014-05-22 06:49:40.000000000 +0200 +++ /var/tmp/diff_new_pack.PCrsbx/_new 2014-05-22 06:49:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-qt4 -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: PerlQt kdebindings library License: GPL-2.0+ ++++++ perlqt-4.13.0.tar.xz -> perlqt-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2014-05-22 06:49:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2014-04-22 07:40:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2014-05-22 06:49:36.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:25 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- python3-kde4.changes: same change Old: ---- pykde4-4.13.0.tar.xz New: ---- pykde4-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.fDa7s4/_old 2014-05-22 06:49:37.000000000 +0200 +++ /var/tmp/diff_new_pack.fDa7s4/_new 2014-05-22 06:49:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-kde4 -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ and GPL-2.0+ python3-kde4.spec: same change ++++++ pykde4-4.13.0.tar.xz -> pykde4-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings-smokekde for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kdebindings-smokekde for openSUSE:Factory checked in at 2014-05-22 06:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings-smokekde (Old) and /work/SRC/openSUSE:Factory/.kdebindings-smokekde.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebindings-smokekde" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings-smokekde/kdebindings-smokekde.changes 2014-04-18 12:37:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebindings-smokekde.new/kdebindings-smokekde.changes 2014-05-22 06:49:33.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:18 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- smokekde-4.13.0.tar.xz New: ---- smokekde-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings-smokekde.spec ++++++ --- /var/tmp/diff_new_pack.9x5a9i/_old 2014-05-22 06:49:34.000000000 +0200 +++ /var/tmp/diff_new_pack.9x5a9i/_new 2014-05-22 06:49:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebindings-smokekde -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Kdebindings Smoke-kde library License: LGPL-2.1+ ++++++ smokekde-4.13.0.tar.xz -> smokekde-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2014-05-22 06:49:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2014-05-06 17:42:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2014-05-22 06:49:31.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:09 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kdeplasma-addons-4.13.0.tar.xz New: ---- kdeplasma-addons-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.VxrQcr/_old 2014-05-22 06:49:32.000000000 +0200 +++ /var/tmp/diff_new_pack.VxrQcr/_new 2014-05-22 06:49:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: plasma-addons -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Additional Plasma Widgets License: GPL-2.0+ ++++++ kdeplasma-addons-4.13.0.tar.xz -> kdeplasma-addons-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/applets/bball/plasma-applet-bball.desktop new/kdeplasma-addons-4.13.1/applets/bball/plasma-applet-bball.desktop --- old/kdeplasma-addons-4.13.0/applets/bball/plasma-applet-bball.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/applets/bball/plasma-applet-bball.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -64,7 +64,7 @@ Comment[es]=Una pelota que rebota para plasma Comment[et]=Põrkavad pallid Plasmale Comment[eu]=Plasmarentzako pilota bizi bat -Comment[fi]=Pomppiva pallo Plasmalle +Comment[fi]=Pomppiva pallo Plasmaan Comment[fr]=Une balle rebondissante pour KDE Comment[ga]=Liathróid phreabarnach le haghaidh plasma Comment[gl]=Unha bóla a rebotar para plasma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/applets/bubblemon/plasma-applet-bubblemon.desktop new/kdeplasma-addons-4.13.1/applets/bubblemon/plasma-applet-bubblemon.desktop --- old/kdeplasma-addons-4.13.0/applets/bubblemon/plasma-applet-bubblemon.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/applets/bubblemon/plasma-applet-bubblemon.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -62,7 +62,7 @@ Comment[de]=Eine schicke Blase, die Ihr System überwacht. Comment[el]=Μια όμορφη φυσαλίδα που εποπτεύει το σύστημά σας. Comment[es]=Una bonita burbuja que observa su sistema -Comment[fi]=Nätti kupla, joka valvoo järjestelmääsi +Comment[fi]=Sievä järjestelmänvalvontakupla Comment[fr]=Une jolie bulle supervisant votre système. Comment[gl]=Unha burbulla que vixía o sistema Comment[hu]=Rendszerfigyelő buborék diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/applets/mediaplayer/plasma-applet-mediaplayer.desktop new/kdeplasma-addons-4.13.1/applets/mediaplayer/plasma-applet-mediaplayer.desktop --- old/kdeplasma-addons-4.13.0/applets/mediaplayer/plasma-applet-mediaplayer.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/applets/mediaplayer/plasma-applet-mediaplayer.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -3,7 +3,7 @@ Name[ar]=مشغل وسائط Name[ast]=Reproductor de medios Name[bs]=Izvođač multimedijalnih datoteka -Name[ca]=Reproductor Multimèdia +Name[ca]=Reproductor multimèdia Name[ca@valencia]=Reproductor Multimèdia Name[cs]=Přehrávač médií Name[da]=Medieafspiller diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/dataengines/comic/plasma_comicprovider.desktop new/kdeplasma-addons-4.13.1/dataengines/comic/plasma_comicprovider.desktop --- old/kdeplasma-addons-4.13.0/dataengines/comic/plasma_comicprovider.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/dataengines/comic/plasma_comicprovider.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -15,7 +15,7 @@ Comment[es]=Complemento para el motor de cómics de Plasma Comment[et]=Plasma koomiksite mootori plugin Comment[eu]=Plasma komiki motorearentzako plugina -Comment[fi]=Liitännäinen sarjakuvatietomoottorille +Comment[fi]=Sarjakuvatietomoottorin liitännäinen Comment[fr]=Module externe pour le moteur Plasma de bandes dessinées Comment[ga]=Breiseán le haghaidh inneall stiallchartún Plasma Comment[gl]=Extensión para o motor de Cómics de Plasma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop new/kdeplasma-addons-4.13.1/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop --- old/kdeplasma-addons-4.13.0/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -9,7 +9,7 @@ Name[el]=Μηχανή δεδομένων για το Kimpanel Name[es]=Motor de datos para Kimpanel Name[et]=Kimpaneli andmemootor -Name[fi]=Tietomoottori Kimpanelia varten +Name[fi]=Tietomoottori Kimpaneliin Name[fr]=Moteur de données pour Kimpanel Name[gl]=Motor de datos para Kimpanel Name[hu]=Adatmodul a Kimpanelhez @@ -48,7 +48,7 @@ Comment[el]=Μηχανή δεδομένων για το Kimpanel Comment[es]=Motor de datos para Kimpanel Comment[et]=Kimpaneli andmemootor -Comment[fi]=Tietomoottori Kimpanelia varten +Comment[fi]=Tietomoottori Kimpaneliin Comment[fr]=Moteur de données pour Kimpanel Comment[gl]=Un motor de datos para Kimpanel. Comment[hu]=Adatmodul a Kimpanelhez diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/wallpapers/marble/plasma-wallpaper-marble.desktop new/kdeplasma-addons-4.13.1/wallpapers/marble/plasma-wallpaper-marble.desktop --- old/kdeplasma-addons-4.13.0/wallpapers/marble/plasma-wallpaper-marble.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/wallpapers/marble/plasma-wallpaper-marble.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -62,7 +62,7 @@ Comment[de]=Eine interaktive Weltkarte Comment[el]=Ένας διαδραστικός παγκόσμιος χάρτης Comment[es]=Un mapa interactivo del mundo -Comment[fi]=Interaktiivinen maailmankartta +Comment[fi]=Vuorovaikutteinen maailmankartta Comment[fr]=Une carte interactive du monde Comment[gl]=Un mapa do mundo interactivo. Comment[hu]=Egy interaktív világtérkép diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.13.0/wallpapers/qmlwallpapers/plasma-wallpaper-qml.desktop new/kdeplasma-addons-4.13.1/wallpapers/qmlwallpapers/plasma-wallpaper-qml.desktop --- old/kdeplasma-addons-4.13.0/wallpapers/qmlwallpapers/plasma-wallpaper-qml.desktop 2014-04-09 09:59:00.000000000 +0200 +++ new/kdeplasma-addons-4.13.1/wallpapers/qmlwallpapers/plasma-wallpaper-qml.desktop 2014-05-07 09:21:03.000000000 +0200 @@ -45,7 +45,7 @@ Comment[de]=Interaktive, animierte Hintergrundbilder Comment[el]=Διαδραστικές, κινούμενες ταπετσαρίες Comment[es]=Fondos de pantalla interactivos animados -Comment[fi]=Interaktiiviset, animoidut taustat +Comment[fi]=Vuorovaikutteiset, animoidut taustat Comment[fr]=Fonds d'écran interactifs et animés Comment[gl]=Fondos de escritorio animados e interactivos. Comment[hu]=Interaktív, animált háttérképek -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings-smokeqt for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kdebindings-smokeqt for openSUSE:Factory checked in at 2014-05-22 06:49:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings-smokeqt (Old) and /work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebindings-smokeqt" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings-smokeqt/kdebindings-smokeqt.changes 2014-04-18 12:37:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new/kdebindings-smokeqt.changes 2014-05-22 06:49:29.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:42:02 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- smokeqt-4.13.0.tar.xz New: ---- smokeqt-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings-smokeqt.spec ++++++ --- /var/tmp/diff_new_pack.tMlV0n/_old 2014-05-22 06:49:31.000000000 +0200 +++ /var/tmp/diff_new_pack.tMlV0n/_new 2014-05-22 06:49:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebindings-smokeqt -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: SMOKE-Qt library for kdebindings License: LGPL-2.1+ ++++++ smokeqt-4.13.0.tar.xz -> smokeqt-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings-smokegen for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kdebindings-smokegen for openSUSE:Factory checked in at 2014-05-22 06:49:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings-smokegen (Old) and /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebindings-smokegen" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings-smokegen/kdebindings-smokegen.changes 2014-04-18 12:37:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new/kdebindings-smokegen.changes 2014-05-22 06:49:28.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:41:56 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- smokegen-4.13.0.tar.xz New: ---- smokegen-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings-smokegen.spec ++++++ --- /var/tmp/diff_new_pack.arZ67M/_old 2014-05-22 06:49:29.000000000 +0200 +++ /var/tmp/diff_new_pack.arZ67M/_new 2014-05-22 06:49:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebindings-smokegen -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Smoke Generator for kdebindings License: GPL-2.0 ++++++ smokegen-4.13.0.tar.xz -> smokegen-4.13.1.tar.xz ++++++ -- 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-runtime for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2014-05-22 06:49:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2014-05-06 17:40:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2014-05-22 06:49:26.000000000 +0200 @@ -1,0 +2,9 @@ +Fri May 9 16:41:49 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php +- Drop patches due to upstream inclusion + use_existing_notes.diff + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.13.0.tar.xz use_existing_notes.diff New: ---- kdepim-runtime-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.aRhIDK/_old 2014-05-22 06:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.aRhIDK/_new 2014-05-22 06:49:27.000000000 +0200 @@ -17,15 +17,13 @@ Name: kdepim4-runtime -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source0: kdepim-runtime-%{version}.tar.xz -# PATCH-FIX-UPSTREAM After migration also start using the already existing notes -Patch1: use_existing_notes.diff BuildRequires: boost-devel >= 1.34.0 BuildRequires: fdupes BuildRequires: libakonadiprotocolinternals-devel >= 1.11.80 @@ -52,7 +50,6 @@ %prep %setup -q -n kdepim-runtime-%{version} -%patch1 -p1 %build %ifarch ppc64 ++++++ kdepim-runtime-4.13.0.tar.xz -> kdepim-runtime-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/CMakeLists.txt new/kdepim-runtime-4.13.1/CMakeLists.txt --- old/kdepim-runtime-4.13.0/CMakeLists.txt 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/CMakeLists.txt 2014-05-08 10:42:54.000000000 +0200 @@ -36,7 +36,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION "4.13${KDEPIM_RUNTIME_DEV_VERSION}") +set(KDEPIM_RUNTIME_VERSION "4.13.1${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) @@ -53,7 +53,7 @@ include(KDE4Defaults) # KdepimLibs -find_package(KdepimLibs 4.13.0) +find_package(KdepimLibs 4.13.1) set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "The KDEPIM libraries" URL "http://www.kde.org" TYPE REQUIRED) #Boost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/agents/newmailnotifier/newmailnotifieragent.desktop new/kdepim-runtime-4.13.1/agents/newmailnotifier/newmailnotifieragent.desktop --- old/kdepim-runtime-4.13.0/agents/newmailnotifier/newmailnotifieragent.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/agents/newmailnotifier/newmailnotifieragent.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -45,7 +45,7 @@ Name[zh_TW]=新郵件通知器 Comment=Notifications about newly received emails Comment[bs]=Obavještenja o novoprimljenoj pošti -Comment[ca]=Notificacions quant a nous correus electrònics rebuts +Comment[ca]=Notificacions quant a correus electrònics nous rebuts Comment[ca@valencia]=Notificacions quant a nous correus electrònics rebuts Comment[cs]=Oznamování nově příchozích e-mailů Comment[da]=Bekendtgørelser om nyligt modtagne e-mails diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp new/kdepim-runtime-4.13.1/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp --- old/kdepim-runtime-4.13.0/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -55,6 +55,8 @@ // Create a new change recorder. mChangeRecorder = new Akonadi::ChangeRecorder( this ); mChangeRecorder->setMimeTypeMonitored( KMime::Message::mimeType() ); + mChangeRecorder->fetchCollection( true ); + mChangeRecorder->setAllMonitored( true ); mModel = new Akonadi::EntityTreeModel( mChangeRecorder, this ); // Set the model to show only collections, not items. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/kresources/kabc/akonadi.desktop new/kdepim-runtime-4.13.1/kresources/kabc/akonadi.desktop --- old/kdepim-runtime-4.13.0/kresources/kabc/akonadi.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/kresources/kabc/akonadi.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -50,7 +50,7 @@ Comment=Provides access to contacts stored in Akonadi address book folders Comment[ar]=يوفر الدخول لجهات الإتصال المحفوظة في مجلد دفتر عناوين اكوندا Comment[bs]=Omogućuje pristup kontaktima pohranjenim u Akonadi imenicima -Comment[ca]=Proporciona l'accés als contactes emmagatzemats en carpetes de la llibreta d'adreces de l'Akonadi +Comment[ca]=Proporciona accés als contactes emmagatzemats a les carpetes de la llibreta d'adreces de l'Akonadi Comment[ca@valencia]=Proporciona l'accés als contactes emmagatzemats en carpetes de la llibreta d'adreces de l'Akonadi Comment[da]=Giver adgang til kontakter lagret i Akonadi adressebogs-mapper Comment[de]=Ermöglicht den Zugriff auf Kontakte, die in Akonadi-Adressbuchordnern gespeichert sind. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/kresources/kcal/akonadi.desktop new/kdepim-runtime-4.13.1/kresources/kcal/akonadi.desktop --- old/kdepim-runtime-4.13.0/kresources/kcal/akonadi.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/kresources/kcal/akonadi.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -55,7 +55,7 @@ Comment=Provides access to calendars stored in Akonadi calendar folders Comment[ar]=يوفر الوصول للتقويمات المحفوظة في مجلد تقويم اكوندا Comment[bs]=Omogućava pristup kalendarima pohranjenim u Akonadi direktorijima kalendara -Comment[ca]=Proporciona l'accés als calendaris emmagatzemats en carpetes del calendari de l'Akonadi +Comment[ca]=Proporciona accés als calendaris emmagatzemats a les carpetes de calendari de l'Akonadi Comment[ca@valencia]=Proporciona l'accés als calendaris emmagatzemats en carpetes del calendari de l'Akonadi Comment[da]=Giver adgang til kalendere lagret i Akonadi kalender-mapper Comment[de]=Ermöglicht den Zugriff auf Kalender, die in Akonadi-Ordnern gespeichert sind. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/knotes/CMakeLists.txt new/kdepim-runtime-4.13.1/migration/knotes/CMakeLists.txt --- old/kdepim-runtime-4.13.0/migration/knotes/CMakeLists.txt 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/knotes/CMakeLists.txt 2014-05-08 10:42:54.000000000 +0200 @@ -1,7 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../kres/ -) - set(knotes-migrator_srcs main.cpp @@ -11,7 +7,6 @@ notealarmattribute.cpp notedisplayattribute.cpp showfoldernotesattribute.cpp - ../kres/kresmigratorbase.cpp ${MIGRATION_AKONADI_SHARED_SOURCES} ) @@ -31,7 +26,6 @@ target_link_libraries(knotes-migrator ${KDEPIMLIBS_AKONADI_LIBS} - ${KDE4_KRESOURCE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KMIME_LIBS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/knotes/knotesmigrator.cpp new/kdepim-runtime-4.13.1/migration/knotes/knotesmigrator.cpp --- old/kdepim-runtime-4.13.0/migration/knotes/knotesmigrator.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/knotes/knotesmigrator.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -39,6 +39,7 @@ #include <KMime/Message> #include <KDebug> +#include <KStandardDirs> #include "maildirsettings.h" #include <krandom.h> @@ -46,53 +47,76 @@ using namespace Akonadi; KNotesMigrator::KNotesMigrator() : - KResMigrator<KRES::Resource>( QLatin1String("notes"), QString() ), m_notesResource( 0 ) + KMigratorBase(), mIndexResource(-1), m_notesResource( 0 ) { Akonadi::AttributeFactory::registerAttribute<NoteLockAttribute>(); Akonadi::AttributeFactory::registerAttribute<NoteAlarmAttribute>(); Akonadi::AttributeFactory::registerAttribute<NoteDisplayAttribute>(); Akonadi::AttributeFactory::registerAttribute<ShowFolderNotesAttribute>(); + const QString kresCfgFile = KStandardDirs::locateLocal( "config", QLatin1String( "kresources/notes/stdrc" ) ); + mConfig = new KConfig( kresCfgFile ); + const KConfigGroup generalGroup( mConfig, QLatin1String( "General" ) ); + mUnknownTypeResources = generalGroup.readEntry( QLatin1String( "ResourceKeys" ), QStringList() ); + m_notesResource = new KCal::CalendarLocal( QString() ); } KNotesMigrator::~KNotesMigrator() { delete m_notesResource; + delete mConfig; +} + +void KNotesMigrator::migrate() +{ + emit message( Info, i18n( "Beginning KNotes migration..." ) ); + migrateNext(); } -bool KNotesMigrator::migrateResource( KRES::Resource* res) +void KNotesMigrator::migrateNext() { - if ( res->type() == QLatin1String("file") ) + ++mIndexResource; + + if (mUnknownTypeResources.isEmpty() || mIndexResource >= mUnknownTypeResources.count()) { + emit message( Info, i18n( "KNotes migration finished" ) ); + deleteLater(); + return; + } + + const KConfigGroup kresCfgGroup( mConfig, QString::fromLatin1( "Resource_%1" ).arg( mUnknownTypeResources.at(mIndexResource) ) ); + const QString resourceType = kresCfgGroup.readEntry( QLatin1String( "ResourceType" ), QString() ); + if (resourceType == QLatin1String("file")) { createAgentInstance( QLatin1String("akonadi_akonotes_resource"), this, SLOT(notesResourceCreated(KJob*)) ); - else - return false; - return true; + } else { + migrateNext(); + } } void KNotesMigrator::notesResourceCreated(KJob * job) { if ( job->error() ) { migrationFailed( i18n( "Failed to create resource: %1", job->errorText() ) ); + migrateNext(); return; } - KRES::Resource *res = currentResource(); + const KConfigGroup kresCfgGroup( mConfig, QString::fromLatin1( "Resource_%1" ).arg( mUnknownTypeResources.at(mIndexResource) ) ); + m_agentInstance = static_cast<AgentInstanceCreateJob*>( job )->instance(); - const KConfigGroup kresCfg = kresConfig( res ); - m_agentInstance.setName( kresCfg.readEntry( "ResourceName", "Migrated Notes" ) ); + m_agentInstance.setName( kresCfgGroup.readEntry( "ResourceName", "Migrated Notes" ) ); - QString resourcePath = kresCfg.readEntry( "NotesURL" ); + const QString resourcePath = kresCfgGroup.readEntry( "NotesURL" ); KUrl url( resourcePath ); if ( !QFile::exists( url.toLocalFile() ) ) { - migrationCompleted( m_agentInstance ); + migrateNext(); return; } - m_notesResource = new KCal::CalendarLocal( QString() ); - bool success = m_notesResource->load( url.toLocalFile() ); + const bool success = m_notesResource->load( url.toLocalFile() ); if ( !success ) { migrationFailed( i18n( "Failed to open file for reading: %1" , resourcePath ) ); + migrateNext(); return; } @@ -103,9 +127,11 @@ if ( !iface->isValid() ) { migrationFailed( i18n( "Failed to obtain D-Bus interface for remote configuration." ), m_agentInstance ); delete iface; + migrateNext(); return; } - iface->setReadOnly( res->readOnly() ); + const bool isReadOnly = kresCfgGroup.readEntry("ResourceIsReadOnly", false); + iface->setReadOnly( isReadOnly ); QDBusPendingReply<void> response = iface->setPath( KGlobal::dirs()->localxdgdatadir() + QLatin1String("/notes/") + KRandom::randomString( 10 ) ); @@ -123,7 +149,6 @@ { Q_UNUSED( job ); emit message( Info, i18n( "Instance \"%1\" synchronized" , m_agentInstance.identifier() ) ); - qDebug()<<" m_agentInstance.identifier() :"<<m_agentInstance.identifier(); CollectionFetchJob *collectionFetchJob = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel, this ); connect( collectionFetchJob, SIGNAL(collectionsReceived(Akonadi::Collection::List)), SLOT(rootCollectionsRecieved(Akonadi::Collection::List)) ); @@ -149,6 +174,7 @@ } } emit message( Error, i18n( "Could not find root collection for resource \"%1\"" ,m_agentInstance.identifier() ) ); + migrateNext(); } void KNotesMigrator::startMigration() @@ -236,5 +262,12 @@ void KNotesMigrator::slotCollectionModify(KJob* job) { Q_UNUSED( job ); - migrationCompleted( m_agentInstance ); + migrateNext(); } + +void KNotesMigrator::migrationFailed( const QString& errorMsg, const Akonadi::AgentInstance& instance ) +{ + Q_UNUSED( instance ) + emit message( Error, i18n( "Migration failed: %1" ,errorMsg ) ); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/knotes/knotesmigrator.h new/kdepim-runtime-4.13.1/migration/knotes/knotesmigrator.h --- old/kdepim-runtime-4.13.0/migration/knotes/knotesmigrator.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/knotes/knotesmigrator.h 2014-05-08 10:42:54.000000000 +0200 @@ -22,8 +22,7 @@ #ifndef KNOTESMIGRATOR_H #define KNOTESMIGRATOR_H -#include "kresmigrator.h" - +#include "kmigratorbase.h" #include <kcal/resourcecalendar.h> #include <kcal/calendarlocal.h> #include <akonadi/collection.h> @@ -37,13 +36,17 @@ /** * Migrate KNotes resources to Akonadi */ -class KNotesMigrator : public KResMigrator<KRES::Resource> +class KNotesMigrator : public KMigratorBase { Q_OBJECT public: KNotesMigrator(); ~KNotesMigrator(); - bool migrateResource( KRES::Resource *res ); + + /* reimp */ void migrate(); + /* reimp */ void migrateNext(); +protected: + /* reimp */ void migrationFailed( const QString& errorMsg, const Akonadi::AgentInstance& instance = Akonadi::AgentInstance() ); private slots: void notesResourceCreated( KJob* job ); @@ -58,10 +61,13 @@ void showDefaultCollection(); private: + int mIndexResource; + QStringList mUnknownTypeResources; Akonadi::Collection m_resourceCollection; - AgentInstance m_agentInstance; + Akonadi::AgentInstance m_agentInstance; KCal::CalendarLocal *m_notesResource; + KConfig *mConfig; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/knotes/main.cpp new/kdepim-runtime-4.13.1/migration/knotes/main.cpp --- old/kdepim-runtime-4.13.0/migration/knotes/main.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/knotes/main.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -64,8 +64,6 @@ args->clear(); KNotesMigrator *migrator = new KNotesMigrator; - migrator->setBridgingOnly(false); - migrator->setOmitClientBridge(false); if ( infoDialog && migrator ) { infoDialog->migratorAdded(); QObject::connect( migrator, SIGNAL(message(KMigratorBase::MessageType,QString)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/kres/CMakeLists.txt new/kdepim-runtime-4.13.1/migration/kres/CMakeLists.txt --- old/kdepim-runtime-4.13.0/migration/kres/CMakeLists.txt 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/kres/CMakeLists.txt 2014-05-08 10:42:54.000000000 +0200 @@ -2,7 +2,6 @@ main.cpp kabcmigrator.cpp kcalmigrator.cpp - knotesmigrator.cpp kresmigratorbase.cpp ${MIGRATION_AKONADI_SHARED_SOURCES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/kres/knotesmigrator.cpp new/kdepim-runtime-4.13.1/migration/kres/knotesmigrator.cpp --- old/kdepim-runtime-4.13.0/migration/kres/knotesmigrator.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/kres/knotesmigrator.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,176 +0,0 @@ -/* - Copyright (c) 2008 Volker Krause <vkrause(a)kde.org> - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#include "knotesmigrator.h" - -#include <akonadi/agentinstance.h> -#include <akonadi/agentinstancecreatejob.h> -#include <akonadi/agentmanager.h> -#include <akonadi/agenttype.h> -#include <akonadi/resourcesynchronizationjob.h> -#include <akonadi/collectionfetchjob.h> -#include <akonadi/item.h> -#include "entitytreecreatejob.h" -#include <KMime/Message> - -#include <KDebug> -#include "maildirsettings.h" -#include <krandom.h> - - -using namespace Akonadi; - -KNotesMigrator::KNotesMigrator() : - KResMigrator<KRES::Resource>( QLatin1String("notes"), QString() ), m_notesResource( 0 ) -{ -} - -KNotesMigrator::~KNotesMigrator() -{ - delete m_notesResource; -} - -bool KNotesMigrator::migrateResource( KRES::Resource* res) -{ - if ( res->type() == QLatin1String("file") ) - createAgentInstance( QLatin1String("akonadi_akonotes_resource"), this, SLOT(notesResourceCreated(KJob*)) ); - else - return false; - return true; -} - -void KNotesMigrator::notesResourceCreated(KJob * job) -{ - if ( job->error() ) { - migrationFailed( i18n( "Failed to create resource: %1", job->errorText() ) ); - return; - } - - KRES::Resource *res = currentResource(); - m_agentInstance = static_cast<AgentInstanceCreateJob*>( job )->instance(); - const KConfigGroup kresCfg = kresConfig( res ); - m_agentInstance.setName( kresCfg.readEntry( "ResourceName", "Migrated Notes" ) ); - - QString resourcePath = kresCfg.readEntry( "NotesURL" ); - KUrl url( resourcePath ); - - if ( !QFile::exists( url.toLocalFile() ) ) { - migrationCompleted( m_agentInstance ); - return; - } - - m_notesResource = new KCal::CalendarLocal( QString() ); - - bool success = m_notesResource->load( url.toLocalFile() ); - if ( !success ) { - migrationFailed( i18n( "Failed to open file for reading: %1" , resourcePath ) ); - return; - } - - OrgKdeAkonadiMaildirSettingsInterface *iface = new OrgKdeAkonadiMaildirSettingsInterface( - QLatin1String("org.freedesktop.Akonadi.Resource.") + m_agentInstance.identifier(), - QLatin1String("/Settings"), QDBusConnection::sessionBus(), this ); - - if ( !iface->isValid() ) { - migrationFailed( i18n( "Failed to obtain D-Bus interface for remote configuration." ), m_agentInstance ); - delete iface; - return; - } - iface->setReadOnly( res->readOnly() ); - - QDBusPendingReply<void> response = iface->setPath( KGlobal::dirs()->localxdgdatadir() + QLatin1String("/notes/") + KRandom::randomString( 10 ) ); - - // make sure the config is saved - iface->writeConfig(); - - m_agentInstance.reconfigure(); - - ResourceSynchronizationJob *syncJob = new ResourceSynchronizationJob( m_agentInstance, this ); - connect( syncJob, SIGNAL(result(KJob*)), SLOT(syncDone(KJob*))); - syncJob->start(); -} - -void KNotesMigrator::syncDone(KJob *job) -{ - Q_UNUSED( job ); - emit message( Info, i18n( "Instance \"%1\" synchronized" , m_agentInstance.identifier() ) ); - - CollectionFetchJob *collectionFetchJob = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel, this ); - connect( collectionFetchJob, SIGNAL(collectionsReceived(Akonadi::Collection::List)), SLOT(rootCollectionsRecieved(Akonadi::Collection::List)) ); - connect( collectionFetchJob, SIGNAL(result(KJob*)), SLOT(rootFetchFinished(KJob*)) ); -} - -void KNotesMigrator::rootFetchFinished( KJob *job ) -{ - emit message( Info, i18n( "Root fetch finished" ) ); - if ( job->error() ) { - emit message( Error, i18nc( "A job to fetch akonadi resources failed. %1 is the error string.", "Fetching resources failed: %1" , job->errorString() ) ); - } -} - -void KNotesMigrator::rootCollectionsRecieved( const Akonadi::Collection::List &list ) -{ - emit message( Info, i18n( "Received root collections" ) ); - foreach ( const Collection &collection, list ) { - if ( collection.resource() == m_agentInstance.identifier() ) { - m_resourceCollection = collection; - startMigration(); - return; - } - } - emit message( Error, i18n( "Could not find root collection for resource \"%1\"" ,m_agentInstance.identifier() ) ); -} - -void KNotesMigrator::startMigration() -{ - KCal::Journal::List oldNotesList = m_notesResource->rawJournals(); - Akonadi::Item::List newItemsList; - - emit message( Info, i18np( "Starting migration of %1 journal", "Starting migration of %1 journals", oldNotesList.size() ) ); - - foreach ( KCal::Journal *journal, oldNotesList ) { - Item newItem; - newItem.setMimeType( QLatin1String("text/x-vnd.akonadi.note") ); - newItem.setParentCollection( m_resourceCollection ); - KMime::Message::Ptr note( new KMime::Message() ); - - QByteArray encoding( "utf-8" ); - note->subject( true )->fromUnicodeString( journal->summary(), encoding ); - note->mainBodyPart()->fromUnicodeString( journal->description() ); - note->contentType( true )->setMimeType( journal->descriptionIsRich() ? "text/html" : "text/plain" ); - - note->assemble(); - - // TODO: Consider an attribute for existing alarms. - - newItem.setPayload( note ); - newItemsList.append( newItem ); - } - - EntityTreeCreateJob *createJob = new EntityTreeCreateJob( QList<Akonadi::Collection::List>(), newItemsList,this ); - connect(createJob, SIGNAL(result(KJob*)), SLOT(newResourceFilled(KJob*))); -} - -void KNotesMigrator::newResourceFilled(KJob* job) -{ - Q_UNUSED( job ); - migrationCompleted( m_agentInstance ); -} - -#include "knotesmigrator.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/kres/knotesmigrator.h new/kdepim-runtime-4.13.1/migration/kres/knotesmigrator.h --- old/kdepim-runtime-4.13.0/migration/kres/knotesmigrator.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/kres/knotesmigrator.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -/* - Copyright (c) 2008 Volker Krause <vkrause(a)kde.org> - Copyright (c) 2010 Stephen Kelly <steveire(a)gmail.com> - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#ifndef KNOTESMIGRATOR_H -#define KNOTESMIGRATOR_H - -#include "kresmigrator.h" - -#include <kcal/resourcecalendar.h> -#include <kcal/calendarlocal.h> -#include <akonadi/collection.h> - -#include <QHash> - -#include <kresources/resource.h> - -class KJob; - -/** - * Migrate KNotes resources to Akonadi - */ -class KNotesMigrator : public KResMigrator<KRES::Resource> -{ - Q_OBJECT - public: - KNotesMigrator(); - ~KNotesMigrator(); - bool migrateResource( KRES::Resource *res ); - - private slots: - void notesResourceCreated( KJob* job ); - void syncDone(KJob *job); - void rootFetchFinished( KJob *job ); - void rootCollectionsRecieved( const Akonadi::Collection::List &list ); - void newResourceFilled( KJob *job ); - - private: - void startMigration(); - - private: - Akonadi::Collection m_resourceCollection; - AgentInstance m_agentInstance; - - KCal::CalendarLocal *m_notesResource; -}; - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/kres/main.cpp new/kdepim-runtime-4.13.1/migration/kres/main.cpp --- old/kdepim-runtime-4.13.0/migration/kres/main.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/kres/main.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -19,7 +19,6 @@ #include "kabcmigrator.h" #include "kcalmigrator.h" -#include "knotesmigrator.h" #include "infodialog.h" #include <kaboutdata.h> @@ -60,7 +59,6 @@ options.add( "omit-client-bridge", ki18n( "Omit setting up of the client side compatibility bridges" ) ); options.add( "contacts-only", ki18n( "Only migrate contact resources" ) ); options.add( "calendar-only", ki18n( "Only migrate calendar resources" ) ); - options.add( "notes-only", ki18n( "Only migrate knotes resources" ) ); options.add( "type <type>", ki18n( "Only migrate the specified types (supported: contact, calendar, notes)" ), supportedTypes.join( QLatin1String(",") ).toLatin1() ); options.add( "interactive", ki18n( "Show reporting dialog" ) ); @@ -98,8 +96,6 @@ m = new KABCMigrator(); else if ( type == QLatin1String("calendar") ) m = new KCalMigrator(); - else if ( type == QLatin1String("notes") ) - m = new KNotesMigrator(); else { kError() << "Unknown resource type: " << type; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/migration/tests/CMakeLists.txt new/kdepim-runtime-4.13.1/migration/tests/CMakeLists.txt --- old/kdepim-runtime-4.13.0/migration/tests/CMakeLists.txt 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/migration/tests/CMakeLists.txt 2014-05-08 10:42:54.000000000 +0200 @@ -9,7 +9,6 @@ set(_srcList testnotesmigration.cpp ../kjots/kjotsmigrator.cpp - ../kres/knotesmigrator.cpp ../kres/kresmigratorbase.cpp ${MIGRATION_AKONADI_SHARED_SOURCES} ) @@ -30,7 +29,6 @@ add_resource_iface( maildir/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings MaildirSettings ) -#add_akonadi_isolated_test_advanced( testnotesmigration.cpp "${_srcList}" "kpimtextedit;kcal") add_akonadi_isolated_test_advanced( testgidmigration.cpp "${MIGRATION_AKONADI_SHARED_SOURCES};../gid/gidmigrationjob.cpp" "" ) kde4_add_executable(testmigratorbase testmigratorbase.cpp ../migratorbase.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/plugins/akonadi_serializer_bookmark.desktop new/kdepim-runtime-4.13.1/plugins/akonadi_serializer_bookmark.desktop --- old/kdepim-runtime-4.13.0/plugins/akonadi_serializer_bookmark.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/plugins/akonadi_serializer_bookmark.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -2,7 +2,7 @@ Name=Bookmark serializer Name[ar]=مسلسل العلامات Name[bs]=Serializator oznaka -Name[ca]=Serialitzador de punts +Name[ca]=Serialitzador d'adreces d'interès Name[ca@valencia]=Serialitzador de punts Name[da]=Serieordning af bogmærker Name[de]=Lesezeichen-Serialisierung @@ -48,7 +48,7 @@ Comment=An Akonadi serializer plugin for bookmark objects Comment[ar]=ملحق مسلسل اكوندا لكائنات العلامة Comment[bs]=Akonadi dodatak serializatora za oznacene objekte -Comment[ca]=Un connector de serialització de l'Akonadi pels objectes punts +Comment[ca]=Un connector de serialització de l'Akonadi pels objectes d'adreces d'interès Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes punts Comment[da]=Et Akonadi-plugin til serieordning af bogmærkeobjekter Comment[de]=Akonadi-Modul zur Serialisierung von Lesezeichen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/birthdays/birthdaysresource.desktop new/kdepim-runtime-4.13.1/resources/birthdays/birthdaysresource.desktop --- old/kdepim-runtime-4.13.0/resources/birthdays/birthdaysresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/birthdays/birthdaysresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -50,7 +50,7 @@ Comment=Provides access to birthday and anniversary dates of contacts in your address book as calendar events Comment[ar]=يوفر الحصول على موعد الذكرى السنوية لميلاد أو ذكرى لقائمة دفتر العناوين الخاص بك حسب الجدول الزمني للأحداث Comment[bs]=Omogućava pristup datumima rođendana i godišnjica u vašem adresaru kao događajima na kalendaru -Comment[ca]=Proporciona l'accés a les dates de naixement i els aniversaris dels contactes de la llibreta d'adreces com a esdeveniments de calendari +Comment[ca]=Proporciona accés a les dates de naixement i els aniversaris dels contactes a la vostra llibreta d'adreces com a esdeveniments de calendari Comment[ca@valencia]=Proporciona l'accés a les dates de naixement i els aniversaris dels contactes de la llibreta d'adreces com a esdeveniments de calendari Comment[da]=Giver adgang til datoer for fødsels- og årsdage for kontakter i din adressebog som kalenderbegivenheder Comment[de]=Ermöglicht den Zugriff auf Geburtstage und Jahrestage von Kontakten aus dem KDE-Adressbuch in Form von Kalendereinträgen. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/google/common/googleaccountmanager.cpp new/kdepim-runtime-4.13.1/resources/google/common/googleaccountmanager.cpp --- old/kdepim-runtime-4.13.0/resources/google/common/googleaccountmanager.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/google/common/googleaccountmanager.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -241,3 +241,8 @@ return m_accounts.values(); } +void GoogleAccountManager::cleanup(const QString &accountName) +{ + removeAccount(accountName); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/google/common/googleaccountmanager.h new/kdepim-runtime-4.13.1/resources/google/common/googleaccountmanager.h --- old/kdepim-runtime-4.13.0/resources/google/common/googleaccountmanager.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/google/common/googleaccountmanager.h 2014-05-08 10:42:54.000000000 +0200 @@ -45,6 +45,8 @@ bool removeAccount( const QString &accountName ); KGAPI2::AccountsList listAccounts() const; + void cleanup(const QString &accountName); + Q_SIGNALS: void managerReady( bool ready ); void accountAdded( const KGAPI2::AccountPtr &account ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/google/common/googleresource.cpp new/kdepim-runtime-4.13.1/resources/google/common/googleresource.cpp --- old/kdepim-runtime-4.13.0/resources/google/common/googleresource.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/google/common/googleresource.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -74,6 +74,11 @@ { } +void GoogleResource::cleanup() +{ + accountManager()->cleanup(settings()->account()); +} + AccountPtr GoogleResource::account() const { return m_account; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/google/common/googleresource.h new/kdepim-runtime-4.13.1/resources/google/common/googleresource.h --- old/kdepim-runtime-4.13.0/resources/google/common/googleresource.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/google/common/googleresource.h 2014-05-08 10:42:54.000000000 +0200 @@ -53,7 +53,9 @@ virtual GoogleSettings* settings() const = 0; virtual QList<QUrl> scopes() const = 0; - public Q_SLOTS: + void cleanup(); + +public Q_SLOTS: virtual void configure( WId windowId ); void reloadConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/ical/icalresource.desktop new/kdepim-runtime-4.13.1/resources/ical/icalresource.desktop --- old/kdepim-runtime-4.13.0/resources/ical/icalresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/ical/icalresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -51,7 +51,7 @@ Comment[ar]=تحميل البيانات من ملف ICal Comment[bg]=Зареждане на данни от файл iCal Comment[bs]=Učitava podatke iz iCal datoteke -Comment[ca]=Carregar dades des d'un fitxer iCal +Comment[ca]=Carrega les dades des d'un fitxer iCal Comment[ca@valencia]=Carregar dades des d'un fitxer iCal Comment[cs]=Načítá data z iCal souboru Comment[da]=Indlæser data fra en iCal-fil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/ical/notes/notesresource.desktop new/kdepim-runtime-4.13.1/resources/ical/notes/notesresource.desktop --- old/kdepim-runtime-4.13.0/resources/ical/notes/notesresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/ical/notes/notesresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -76,7 +76,7 @@ Comment[ar]=تحميل البيانات من ملف الملاحظات Comment[bg]=Зареждане на данни от файл с бележки Comment[bs]=Učitava podatke iz datoteka bilješki -Comment[ca]=Carrega dades des d'un fitxer de notes +Comment[ca]=Carrega les dades des d'un fitxer de notes Comment[ca@valencia]=Carrega dades des d'un fitxer de notes Comment[da]=Indlæser data fra en notes-fil Comment[de]=Lädt Daten aus einer Notizen-Datei diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/ical/wizard/icalwizard.desktop new/kdepim-runtime-4.13.1/resources/ical/wizard/icalwizard.desktop --- old/kdepim-runtime-4.13.0/resources/ical/wizard/icalwizard.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/ical/wizard/icalwizard.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -52,7 +52,7 @@ Comment[ar]=تحميل البيانات من ملف ICal Comment[bg]=Зареждане на данни от файл iCal Comment[bs]=Učitava podatke iz iCal datoteke -Comment[ca]=Carregar dades des d'un fitxer iCal +Comment[ca]=Carrega les dades des d'un fitxer iCal Comment[ca@valencia]=Carregar dades des d'un fitxer iCal Comment[cs]=Načítá data z iCal souboru Comment[da]=Indlæser data fra en iCal-fil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/icaldir/icaldirresource.desktop new/kdepim-runtime-4.13.1/resources/icaldir/icaldirresource.desktop --- old/kdepim-runtime-4.13.0/resources/icaldir/icaldirresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/icaldir/icaldirresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -40,7 +40,7 @@ Name[zh_TW]=ICal 行事曆資料夾 Comment="Provides access to calendar items, each stored in a single file, in a given directory" Comment[bs]="Puža pristup stavkama kalendara, svaka u pojedinoh datoteci u datom direktoriju" -Comment[ca]=«Proporciona l'accés als elements d'un calendari, cada un emmagatzemat en un fitxer individual, en un directori proporcionat» +Comment[ca]=«Proporciona accés als elements d'un calendari, cadascun emmagatzemat en un fitxer individual, en un directori proporcionat» Comment[ca@valencia]=«Proporciona l'accés als elements d'un calendari, cada un emmagatzemat en un fitxer individual, en un directori proporcionat» Comment[cs]="Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři" Comment[da]="Giver adgang til en kalenderelementer, hver især gemt i en enkelt fil i en given mappe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/imap/imapresource.cpp new/kdepim-runtime-4.13.1/resources/imap/imapresource.cpp --- old/kdepim-runtime-4.13.0/resources/imap/imapresource.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/imap/imapresource.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -365,7 +365,6 @@ return; case SessionPool::CouldNotConnectError: - emit status( Broken, errorString ); deferTask(); setTemporaryOffline((m_pool->account() && m_pool->account()->timeout() > 0) ? m_pool->account()->timeout() : 300); return; @@ -683,6 +682,11 @@ if ( !m_pool->serverCapabilities().contains( QLatin1String("IDLE") ) ) return; + //Without password we don't even have to try + if (Settings::self()->password().isEmpty()) { + return; + } + const QStringList ridPath = Settings::self()->idleRidPath(); if ( ridPath.size() < 2 ) return; @@ -710,21 +714,17 @@ void ImapResource::onIdleCollectionFetchDone( KJob *job ) { - if ( job->error() == 0 ) { - Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>( job ); - Akonadi::Collection c = fetch->collections().first(); - - const QString password = Settings::self()->password(); - if ( password.isEmpty() ) - return; - - ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, c ); - m_idle = new ImapIdleManager( state, m_pool, this ); - - } else { + if (job->error()) { kWarning() << "CollectionFetch for idling failed." << "error=" << job->error() << ", errorString=" << job->errorString(); + return; + } + Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>(job); + //Can be empty if collection is not subscribed locally + if (!fetch->collections().isEmpty()) { + ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, fetch->collections().first() ); + m_idle = new ImapIdleManager( state, m_pool, this ); } } @@ -805,7 +805,12 @@ QStringList ImapResource::serverCapabilities() const { - return m_pool->serverCapabilities(); + return m_pool->serverCapabilities(); +} + +void ImapResource::cleanup() +{ + Settings::self()->cleanup(); } QString ImapResource::dumpResourceToString() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/imap/imapresource.h new/kdepim-runtime-4.13.1/resources/imap/imapresource.h --- old/kdepim-runtime-4.13.0/resources/imap/imapresource.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/imap/imapresource.h 2014-05-08 10:42:54.000000000 +0200 @@ -60,6 +60,7 @@ KDialog *createConfigureDialog( WId windowId ); QStringList serverCapabilities() const; + void cleanup(); void fetchItemsWithoutBodies( const Akonadi::Collection &collection, QObject *receiver, const char *slot ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/imap/imapresource.kcfg new/kdepim-runtime-4.13.1/resources/imap/imapresource.kcfg --- old/kdepim-runtime-4.13.0/resources/imap/imapresource.kcfg 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/imap/imapresource.kcfg 2014-05-08 10:42:54.000000000 +0200 @@ -20,6 +20,9 @@ <label>Defines the encryption type to use</label> <default>SSL</default> </entry> + <entry name="OverrideEncryption" type="String"> + <label>Override configured encryption mode</label> + </entry> <entry name="Authentication" type="Int"> <label>Defines the authentication type to use</label> <default>1</default> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/imap/settings.cpp new/kdepim-runtime-4.13.1/resources/imap/settings.cpp --- old/kdepim-runtime-4.13.0/resources/imap/settings.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/imap/settings.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -112,6 +112,18 @@ m_password.clear(); } +void Settings::cleanup() +{ + Wallet* wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId ); + if ( wallet && wallet->isOpen() ) { + if ( wallet->hasFolder( QLatin1String("imap") ) ) { + wallet->setFolder( QLatin1String("imap") ); + wallet->removeEntry( config()->name() ); + } + delete wallet; + } +} + void Settings::requestPassword() { if ( !m_password.isEmpty() || @@ -271,11 +283,35 @@ if ( encryption == QLatin1String("SSL") ) { account->setEncryptionMode( KIMAP::LoginJob::AnySslVersion ); } else if ( encryption == QLatin1String("STARTTLS") ) { + //KIMAP confused TLS and STARTTLS, TlsV1 really means "use STARTTLS" account->setEncryptionMode( KIMAP::LoginJob::TlsV1 ); } else { account->setEncryptionMode( KIMAP::LoginJob::Unencrypted ); } + //Some SSL Server fail to advertise an ssl version they support (AnySslVersion), + //we therefore allow overriding this in the config + //(so we don't have to make the UI unnecessarily complex for properly working servers). + const QString overrideEncryptionMode = overrideEncryption(); + if (!overrideEncryptionMode.isEmpty()) { + kWarning() << "Overriding encryption mode with: " << overrideEncryptionMode; + if ( overrideEncryptionMode == QLatin1String("SSLV2") ) { + account->setEncryptionMode( KIMAP::LoginJob::SslV2 ); + } else if ( overrideEncryptionMode == QLatin1String("SSLV3") ) { + account->setEncryptionMode( KIMAP::LoginJob::SslV3 ); + } else if ( overrideEncryptionMode == QLatin1String("TLSV1") ) { + account->setEncryptionMode( KIMAP::LoginJob::SslV3_1 ); + } else if ( overrideEncryptionMode == QLatin1String("SSL") ) { + account->setEncryptionMode( KIMAP::LoginJob::AnySslVersion ); + } else if ( overrideEncryptionMode == QLatin1String("STARTTLS") ) { + account->setEncryptionMode( KIMAP::LoginJob::TlsV1 ); + } else if ( overrideEncryptionMode == QLatin1String("UNENCRYPTED") ) { + account->setEncryptionMode( KIMAP::LoginJob::Unencrypted ); + } else { + kWarning() << "Tried to force invalid encryption mode: " << overrideEncryptionMode; + } + } + account->setAuthenticationMode( mapTransportAuthToKimap( (MailTransport::TransportBase::EnumAuthenticationType::type) authentication() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/imap/settings.h new/kdepim-runtime-4.13.1/resources/imap/settings.h --- old/kdepim-runtime-4.13.0/resources/imap/settings.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/imap/settings.h 2014-05-08 10:42:54.000000000 +0200 @@ -49,6 +49,7 @@ void renameRootCollection( const QString &newName ); void clearCachedPassword(); + void cleanup(); signals: void passwordRequestCompleted( const QString &password, bool userRejected ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/kabc/kabcresource.desktop new/kdepim-runtime-4.13.1/resources/kabc/kabcresource.desktop --- old/kdepim-runtime-4.13.0/resources/kabc/kabcresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/kabc/kabcresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -49,7 +49,7 @@ Comment=Loads data from a traditional KDE address book resource Comment[ar]=تحمل البيانات من موارد دفتر عنوان كدي التقليدي Comment[bs]=Učitava podatke iz tradicionalog KDE izvora adresara -Comment[ca]=Carrega dades des d'un recurs de llibreta d'adreces tradicional del KDE +Comment[ca]=Carrega les dades des d'un recurs de llibreta d'adreces tradicional del KDE Comment[ca@valencia]=Carrega dades des d'un recurs de llibreta d'adreces tradicional del KDE Comment[cs]=Načítá data ze zdroje tradiční Knihy adres KDE Comment[da]=Indlæser data fra en traditionel KDE adressebogsressource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/kalarm/kalarm/kalarmresource.desktop new/kdepim-runtime-4.13.1/resources/kalarm/kalarm/kalarmresource.desktop --- old/kdepim-runtime-4.13.0/resources/kalarm/kalarm/kalarmresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/kalarm/kalarm/kalarmresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -46,7 +46,7 @@ Name[zh_TW]=KAlarm 行事曆檔案 Comment=Loads data from a KAlarm calendar file Comment[bs]=Učitava podatke iz KAlarm kalendar datoteke -Comment[ca]=Carrega dades des d'un fitxer de calendari del KAlarm +Comment[ca]=Carrega les dades des d'un fitxer de calendari del KAlarm Comment[ca@valencia]=Carrega dades des d'un fitxer de calendari del KAlarm Comment[cs]=Načítá data ze souboru kalendáře KAlarm Comment[da]=Indlæser data fra KAlarm-kalenderfil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/kalarm/kalarmdir/kalarmdirresource.desktop new/kdepim-runtime-4.13.1/resources/kalarm/kalarmdir/kalarmdirresource.desktop --- old/kdepim-runtime-4.13.0/resources/kalarm/kalarmdir/kalarmdirresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/kalarm/kalarmdir/kalarmdirresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -42,7 +42,7 @@ Name[zh_TW]=KAlarm 目錄 Comment=Loads data from a local KAlarm folder Comment[bs]=Čita podatke iz lokalnog KAlarm direktorija -Comment[ca]=Carrega dades des d'una carpeta KAlarm local +Comment[ca]=Carrega les dades des d'una carpeta KAlarm local Comment[ca@valencia]=Carrega dades des d'una carpeta KAlarm local Comment[cs]=Načítá data z místní složky KAlarmu Comment[da]=Indlæser data fra en lokal KAlarm-mappe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/kcal/kcalresource.desktop new/kdepim-runtime-4.13.1/resources/kcal/kcalresource.desktop --- old/kdepim-runtime-4.13.0/resources/kcal/kcalresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/kcal/kcalresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -49,7 +49,7 @@ Comment=Loads data from a traditional KDE calendar resource Comment[ar]=تحمل البيانات من موارد تقويم كدي التقليدي Comment[bs]=Učitava podatke iz tradicionalog KDE izvora kalendara -Comment[ca]=Carregar dades des d'un recurs de calendari tradicional del KDE +Comment[ca]=Carregar les dades des d'un recurs de calendari tradicional del KDE Comment[ca@valencia]=Carregar dades des d'un recurs de calendari tradicional del KDE Comment[cs]=Načítá data z tradičního kalendáře KDE Comment[da]=Indlæser data fra en traditionel KDE kalenderressource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/localbookmarks/localbookmarksresource.desktop new/kdepim-runtime-4.13.1/resources/localbookmarks/localbookmarksresource.desktop --- old/kdepim-runtime-4.13.0/resources/localbookmarks/localbookmarksresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/localbookmarks/localbookmarksresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -2,7 +2,7 @@ Name=Local Bookmarks Name[ar]=علامات محلية Name[bs]=Lokale oznake -Name[ca]=Punts locals +Name[ca]=Adreces d'interès locals Name[ca@valencia]=Punts locals Name[cs]=Místní záložky Name[da]=Lokale bogmærker @@ -49,7 +49,7 @@ Comment=Loads data from a local bookmarks file Comment[ar]=تحمل البيانات من ملف العلامات المحلية Comment[bs]=Učitava podatke iz datoteke lokalnih oznaka -Comment[ca]=Carrega dades des d'un fitxer de punts local +Comment[ca]=Carrega les dades des d'un fitxer d'adreces d'interès local Comment[ca@valencia]=Carrega dades des d'un fitxer de punts local Comment[cs]=Načítá data z místních záložek Comment[da]=Indlæser data fra en lokal bogmærkefil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/mbox/mboxresource.desktop new/kdepim-runtime-4.13.1/resources/mbox/mboxresource.desktop --- old/kdepim-runtime-4.13.0/resources/mbox/mboxresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/mbox/mboxresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -50,7 +50,7 @@ Comment=Loads data from a local mbox file Comment[bg]=Зареждане на данни от локален файл mbox Comment[bs]=Učitava podatke iz lokalne mbox datoteke -Comment[ca]=Carrega dades des d'un fitxer «mbox» local +Comment[ca]=Carrega les dades des d'un fitxer «mbox» local Comment[ca@valencia]=Carrega dades des d'un fitxer «mbox» local Comment[da]=Indlæser data fra en lokal mbox-fil Comment[de]=Daten werden aus einer lokalen MBox-Datei geladen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/mixedmaildir/mixedmaildirresource.desktop new/kdepim-runtime-4.13.1/resources/mixedmaildir/mixedmaildirresource.desktop --- old/kdepim-runtime-4.13.0/resources/mixedmaildir/mixedmaildirresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/mixedmaildir/mixedmaildirresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -41,7 +41,7 @@ Name[zh_TW]=KMail 資料夾 Comment=Loads data from a local KMail mail folder Comment[bs]=Učitava podatke iz lokalne fascikle KMail pošte -Comment[ca]=Carrega dades des d'una carpeta local de correu del KMail +Comment[ca]=Carrega les dades des d'una carpeta local de correu del KMail Comment[ca@valencia]=Carrega dades des d'una carpeta local de correu del KMail Comment[cs]=Načítá data z místní složky pošty KMail Comment[da]=Indlæser data fra en lokal KMail mail-mappe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/openxchange/openxchangeresource.desktop new/kdepim-runtime-4.13.1/resources/openxchange/openxchangeresource.desktop --- old/kdepim-runtime-4.13.0/resources/openxchange/openxchangeresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/openxchange/openxchangeresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -47,7 +47,7 @@ Name[zh_TW]=Open-Xchange 群組伺服器 Comment="Provides access to the appointments, tasks, and contacts of an Open-Xchange groupware server." Comment[bs]="Obezbjeđuje pristup zakazanim obavezama, zadacima i kontaktima za Open-Xchange grupni server." -Comment[ca]="Proporciona l'accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange." +Comment[ca]=Proporciona accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange. Comment[ca@valencia]="Proporciona l'accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange." Comment[da]="Giver adgang til aftaler, opgaver og kontakter på en Open-Xchange groupware-server." Comment[de]="Ermöglicht den Zugriff auf Termine, Aufgaben und Kontakte, die auf einem Open-Xchange-Server gespeichert sind." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/pop3/pop3resource.cpp new/kdepim-runtime-4.13.1/resources/pop3/pop3resource.cpp --- old/kdepim-runtime-4.13.0/resources/pop3/pop3resource.cpp 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/pop3/pop3resource.cpp 2014-05-08 10:42:54.000000000 +0200 @@ -1008,7 +1008,16 @@ void POP3Resource::clearCachedPassword() { - mPassword.clear(); + mPassword.clear(); +} + +void POP3Resource::cleanup() +{ + if (mWallet && mWallet->isOpen() && mWallet->hasFolder( QLatin1String("pop3") ) ) { + mWallet->setFolder( QLatin1String("pop3") ); + if ( mWallet->hasEntry( identifier() ) ) + mWallet->removeEntry(identifier()); + } } void POP3Resource::doSetOnline( bool online ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/pop3/pop3resource.h new/kdepim-runtime-4.13.1/resources/pop3/pop3resource.h --- old/kdepim-runtime-4.13.0/resources/pop3/pop3resource.h 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/pop3/pop3resource.h 2014-05-08 10:42:54.000000000 +0200 @@ -44,6 +44,8 @@ void clearCachedPassword(); + void cleanup(); + public Q_SLOTS: virtual void configure( WId windowId ); @@ -180,6 +182,7 @@ // List of message IDs that were successfully deleted QList<int> mDeletedIDs; + }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/vcard/vcardresource.desktop new/kdepim-runtime-4.13.1/resources/vcard/vcardresource.desktop --- old/kdepim-runtime-4.13.0/resources/vcard/vcardresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/vcard/vcardresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -39,7 +39,7 @@ Name[zh_TW]=vCard 檔案 Comment=Loads data from a vCard file Comment[bs]=Učitava podatke iz VCard datoteke -Comment[ca]=Carrega dades des d'un fitxer vCard +Comment[ca]=Carrega les dades des d'un fitxer vCard Comment[ca@valencia]=Carrega dades des d'un fitxer vCard Comment[cs]=Načítá data ze souboru vizitek (vCard) Comment[da]=Indlæser data fra en vCard-fil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.13.0/resources/vcarddir/vcarddirresource.desktop new/kdepim-runtime-4.13.1/resources/vcarddir/vcarddirresource.desktop --- old/kdepim-runtime-4.13.0/resources/vcarddir/vcarddirresource.desktop 2014-04-08 12:37:03.000000000 +0200 +++ new/kdepim-runtime-4.13.1/resources/vcarddir/vcarddirresource.desktop 2014-05-08 10:42:54.000000000 +0200 @@ -38,7 +38,7 @@ Name[zh_TW]=vCard 目錄 Comment=Loads data from a directory with vCards Comment[bs]=Učitava podakte iz direktorija sa VCards -Comment[ca]=Carrega dades des d'un directori amb vCard +Comment[ca]=Carrega les dades des d'un directori amb vCard Comment[ca@valencia]=Carrega dades des d'un directori amb vCard Comment[cs]=Načítá data z adresáře vizitek (vCard) Comment[da]=Indlæser data fra en mappe med vCards -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0