Author: arekm Date: Wed Aug 19 20:04:07 2009 GMT Module: packages Tag: DEVEL ---- Log message: - rel 5; branch diff is back
---- Files affected: packages/kde4-kdeplasma-addons: kde4-kdeplasma-addons.spec (1.29 -> 1.30) , kde4-kdeplasma-addons-branch.diff (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec diff -u packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.29 packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.30 --- packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.29 Wed Aug 5 12:09:42 2009 +++ packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec Wed Aug 19 22:04:01 2009 @@ -10,13 +10,13 @@ Summary(pl.UTF-8): Plazmoidy dla KDE4 Name: kde4-kdeplasma-addons Version: 4.3.0 -Release: 4 +Release: 5 License: GPL v2 Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 # Source0-md5: 74369a3346c95368a62dc5a1490ed886 #Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -#Patch100: %{name}-branch.diff +Patch100: %{name}-branch.diff Patch0: %{name}-pastebinpld.patch URL: http://www.kde.org/ BuildRequires: OpenGL-GLU-devel @@ -85,7 +85,7 @@ %prep %setup -q -n %{orgname}-%{version} -#%patch100 -p0 +%patch100 -p0 %patch0 -p1 %build @@ -221,6 +221,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2009/08/19 20:04:01 arekm +- rel 5; branch diff is back + Revision 1.29 2009/08/05 10:09:42 shadzik - don't requre absolute devel packages - rel 4 ================================================================ Index: packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-branch.diff diff -u /dev/null packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-branch.diff:1.1.2.1 --- /dev/null Wed Aug 19 22:04:07 2009 +++ packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-branch.diff Wed Aug 19 22:04:01 2009 @@ -0,0 +1,1551 @@ +Index: dataengines/ocs/plasma-dataengine-ocs.desktop +=================================================================== +--- dataengines/ocs/plasma-dataengine-ocs.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/ocs/plasma-dataengine-ocs.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -14,6 +14,7 @@ + Name[nb]=Åpne samarbeidstjenester + Name[nds]=Open-Collaboration-Deensten + Name[nn]=Opne samarbeidtenester ++Name[pl]=Usługi do współpracy (Open Collaboration) + Name[pt]=Serviços Abertos de Colaboração + Name[pt_BR]=Serviços abertos de colaboração + Name[ro]=Servicii de Colaborare Deschisă +@@ -22,6 +23,7 @@ + Name[sr]=Сервиси отворене сарадње + name...@latin]=servisi otvorene saradnje + Name[sv]=Öppna sammarbetstjänster ++Name[tr]=Açık İşbirliği Servisleri + Name[uk]=Служби Open Collaboration + Name[wa]=Siervices Open Collaboration + Name[x-test]=xxOpen Collaboration Servicesxx +Index: dataengines/ocs/lib/activity.h +=================================================================== +--- dataengines/ocs/lib/activity.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/ocs/lib/activity.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -36,9 +36,12 @@ + { + public: + typedef QList<Activity> List; +- ++ + Activity(); + ++ void setId( const QString & ); ++ QString id() const; ++ + void setUser( const QString & ); + QString user() const; + +@@ -52,7 +55,8 @@ + QString link() const; + + private: +- QString m_user; ++ QString m_id; ++ QString m_user; + QDateTime m_timestamp; + QString m_message; + QString m_link; +Index: dataengines/ocs/lib/activityparser.cpp +=================================================================== +--- dataengines/ocs/lib/activityparser.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/ocs/lib/activityparser.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -45,7 +45,9 @@ + xml.readNext(); + + if ( xml.isStartElement() ) { +- if ( xml.name() == "personid" ) { ++ if ( xml.name() == "id" ) { ++ activity.setId( xml.readElementText() ); ++ } else if ( xml.name() == "personid" ) { + activity.setUser( xml.readElementText() ); + } else if ( xml.name() == "timestamp" ) { + QString timestampString = xml.readElementText(); +Index: dataengines/ocs/lib/activity.cpp +=================================================================== +--- dataengines/ocs/lib/activity.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/ocs/lib/activity.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -29,6 +29,16 @@ + { + } + ++void Activity::setId( const QString &id ) ++{ ++ m_id = id; ++} ++ ++QString Activity::id() const ++{ ++ return m_id; ++} ++ + void Activity::setUser( const QString &u ) + { + m_user = u; +Index: dataengines/ocs/ocsengine.cpp +=================================================================== +--- dataengines/ocs/ocsengine.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/ocs/ocsengine.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -177,12 +177,7 @@ + return true; + kDebug() << "for name" << name; + if (name == I18N_NOOP("activity")) { +- foreach(const Attica::Activity &activity, m_activities ) { +- setData(name, I18N_NOOP("user"), activity.user()); +- setData(name, I18N_NOOP("timestamp"), activity.timestamp()); +- setData(name, I18N_NOOP("message"), activity.message()); +- } +- return true; ++ + } else if (name.startsWith("Friends-")) { + + } +@@ -196,7 +191,16 @@ + if (!j->error()) { + Attica::ActivityListJob *job = static_cast<Attica::ActivityListJob *>( j ); + m_activities = job->ActivityList(); +- updateSourceEvent(I18N_NOOP("activity")); ++ ++ foreach(const Attica::Activity &activity, m_activities ) { ++ Plasma::DataEngine::Data activityData; ++ activityData["id"] = activity.id(); ++ activityData["user"] = activity.user(); ++ activityData["timestamp"] = activity.timestamp(); ++ activityData["message"] = activity.message(); ++ ++ setData("activity", activity.id(), activityData); ++ } + } + } + +Index: dataengines/potd/oseiprovider.desktop +=================================================================== +--- dataengines/potd/oseiprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/oseiprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -24,6 +24,7 @@ + Name[nds]=Osei-Anbeder + Name[nl]=Osei-provider + Name[nn]=Osei-tilbydar ++Name[pl]=Usługodawca Osei + Name[pt]=Fornecedor do Osei + Name[pt_BR]=Fornecedor Osei + Name[ro]=Furnizor Osei +@@ -56,6 +57,7 @@ + Comment[nds]=Osei-Anbeder + Comment[nl]=Osei-provider + Comment[nn]=Osei-tilbydar ++Comment[pl]=Usługodawca Osei + Comment[pt]=Fornecedor do Osei + Comment[pt_BR]=Fornecedor Osei + Comment[ro]=Furnizor Osei +Index: dataengines/potd/wcpotdprovider.desktop +=================================================================== +--- dataengines/potd/wcpotdprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/wcpotdprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -25,6 +25,7 @@ + Name[nds]=Wc-BiV-Anbeder + Name[nl]=Wcpotd-provider + Name[nn]=Wcpotd-tilbydar ++Name[pl]=Usługodawca Wcpotd + Name[pt]=Fornecedor do Wcpotd + Name[pt_BR]=Fornecedor Wcpotd + Name[ro]=Furnizor Wcpotd +@@ -58,6 +59,7 @@ + Comment[nds]=Wc-BiV-Anbeder + Comment[nl]=Wcpotd-provider + Comment[nn]=Wcpotd-tilbydar ++Comment[pl]=Usługodawca Wcpotd + Comment[pt]=Fornecedor do Wcpotd + Comment[pt_BR]=Fornecedor Wcpotd + Comment[ro]=Furnizor Wcpotd +Index: dataengines/potd/plasma_potdprovider.desktop +=================================================================== +--- dataengines/potd/plasma_potdprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/plasma_potdprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -20,6 +20,7 @@ + Comment[nds]=Moduul för Plasma sien BiV-Karn + Comment[nl]=Plugin voor Plasma-PoTD-engine + Comment[nn]=Programtillegg for Plasma PoTD-motoren ++Comment[pl]=Wtyczka silnika PoTD Plazmy + Comment[pt]='Plugin' do Motor da Imagem do Dia do Plasma + Comment[pt_BR]=Plug-in para o mecanismo PoTD do Plasma + Comment[ro]=Modul pentru motorul de imagine a zilei Plasma +Index: dataengines/potd/plasma-dataengine-potd.desktop +=================================================================== +--- dataengines/potd/plasma-dataengine-potd.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/plasma-dataengine-potd.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -19,6 +19,7 @@ + Name[nl]=Afbeelding van de dag + Name[nn]=Dagens bilete + Name[pa]=ਅੱਜ ਦੀ ਤਸਵੀਰ ++Name[pl]=Obraz dnia + Name[pt]=Imagem do Dia + Name[pt_BR]=Imagem do dia + Name[ro]=Imaginea zilei +@@ -52,6 +53,7 @@ + Comment[nds]=Datenkarn för't Halen vun verscheden Biller för Vundaag ut't Internet. + Comment[nl]=Gegevensengine voor het verkrijgen van online afbeeldingen-van-de-dag. + Comment[nn]=Datamotor for henting av dagens bilete ++Comment[pl]=Silnik danych do pobierania różnych "obrazów dnia". + Comment[pt]=Motor de dados para obter diversas Imagens do Dia a nível 'online'. + Comment[pt_BR]=Mecanismo de dados para obter várias imagens do dia online. + Comment[ro]=Motor de date pentru obținerea Imaginii zilei din diverse locuri. +Index: dataengines/potd/flickrprovider.desktop +=================================================================== +--- dataengines/potd/flickrprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/flickrprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -25,6 +25,7 @@ + Name[nl]=Flickr-provider + Name[nn]=Flickr-tilbydar + Name[pa]=ਫਲਿੱਕਰ ਪਰੋਵਾਇਡਰ ++Name[pl]=Usługodawca Flickr + Name[pt]=Fornecedor do Flickr + Name[pt_BR]=Fornecedor Flickr + Name[ro]=Furnizor Flickr +@@ -58,6 +59,7 @@ + Comment[nl]=Flickr-provider + Comment[nn]=Flickr-tilbydar + Comment[pa]=ਫਲਿੱਕਰ ਪਰੋਵਾਇਡਰ ++Comment[pl]=Usługodawca Flickr + Comment[pt]=Fornecedor do Flickr + Comment[pt_BR]=Fornecedor Flickr + Comment[ro]=Furnizor Flickr +Index: dataengines/potd/apodprovider.desktop +=================================================================== +--- dataengines/potd/apodprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/apodprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -24,6 +24,7 @@ + Name[nds]=ABiV-Anbeder + Name[nl]=Apod-provider + Name[nn]=Apod-tilbydar ++Name[pl]=Usługodawca Apod + Name[pt]=Fornecedor do Apod + Name[pt_BR]=Fornecedor Apod + Name[ro]=Furnizor Apod +@@ -56,6 +57,7 @@ + Comment[nds]=ABiV-Anbeder + Comment[nl]=Apod-provider + Comment[nn]=Apod-tilbydar ++Comment[pl]=Usługodawca Apod + Comment[pt]=Fornecedor do Apod + Comment[pt_BR]=Fornecedor Apod + Comment[ro]=Furnizor Apod +Index: dataengines/potd/epodprovider.desktop +=================================================================== +--- dataengines/potd/epodprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/potd/epodprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -24,6 +24,7 @@ + Name[nds]=EBiV-Anbeder + Name[nl]=Epod-provider + Name[nn]=Epod-tilbydar ++Name[pl]=Usługodawca Epod + Name[pt]=Fornecedor do Epod + Name[pt_BR]=Fornecedor Epod + Name[ro]=Furnizor Epod +@@ -56,6 +57,7 @@ + Comment[nds]=EBiV-Anbeder + Comment[nl]=Epod-provider + Comment[nn]=Epod-tilbydar ++Comment[pl]=Usługodawca Epod + Comment[pt]=Fornecedor do Epod + Comment[pt_BR]=Fornecedor Epod + Comment[ro]=Furnizor Epod +Index: dataengines/comic/plasma-dataengine-comic.desktop +=================================================================== +--- dataengines/comic/plasma-dataengine-comic.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/comic/plasma-dataengine-comic.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -62,6 +62,7 @@ + Comment[nds]=Internet-Comics + Comment[nl]=Online stripverhalen + Comment[nn]=Teikneseriar på nettet ++Comment[pl]=Komiksy online + Comment[pt]=Bandas desenhadas 'online' + Comment[pt_BR]=Tirinhas online + Comment[ro]=Benzi desenate online +Index: dataengines/rememberthemilk/plasma-engine-rtm.desktop +=================================================================== +--- dataengines/rememberthemilk/plasma-engine-rtm.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/rememberthemilk/plasma-engine-rtm.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -18,6 +18,7 @@ + Name[nl]=Engine voor The Milk onthouden + Name[nn]=Datamotor for Remember The Milk + Name[pa]=ਰੀਮੈਂਬਰ ਦਾ ਮਿਲਕ ਇੰਜਣ ++Name[pl]=Silnik Remember The Milk + Name[pt]=Motor para Recordar as Tarefas + Name[pt_BR]=Mecanismo Remember The Milk + Name[ro]=Motor Nu uita laptele +@@ -50,6 +51,7 @@ + Comment[nl]=Een engine om samen te werken met Remember The Milk. + Comment[nn]=Datamotor for Remember The Milk + Comment[pa]=ਰੀਮੈਂਬਰ ਦਾ ਮਿਲਕ ਨਾਲ ਕੰਮ ਕਰਨ ਲਈ ਇੰਜਣ ਹੈ। ++Comment[pl]=Silnik pracujący z Remember the Milk. + Comment[pt]=Um motor para funcionar com a 'applet' de recordação de tarefas. + Comment[pt_BR]=Um mecanismo para trabalhar com o Remember The Milk. + Comment[ro]=Motor pentru lucrul cu Remember the Milk. +Index: dataengines/microblog/plasma-dataengine-microblog.desktop +=================================================================== +--- dataengines/microblog/plasma-dataengine-microblog.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ dataengines/microblog/plasma-dataengine-microblog.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -17,6 +17,7 @@ + Name[nds]=Mikronettdagbook + Name[nn]=Mikroblogging + Name[pa]=ਮਾਈਕਰੋਬਲਾਗ ++Name[pl]=Mikroblog + Name[pt]=Micro-blog + Name[pt_BR]=Micro-blog + Name[sk]=Mikroblogovanie +@@ -46,6 +47,7 @@ + Comment[nds]=Mikro-Nettdaagbookdeensten "identi.ca" un "twitter" + Comment[nl]=identi.ca en twitter micro-blogging-services + Comment[nn]=Mikrobloggingstenestene identi.ca og Twitter ++Comment[pl]=Usługi mikrobloga identi.ca i twitter + Comment[pt]=serviços de micro-blogs identi.ca e twitter + Comment[pt_BR]=Serviços de microblogagem identi.ca e twitter + Comment[ro]=Servicii de micro-blogging identi.ca și twitter +@@ -54,6 +56,7 @@ + Comment[sr]=Микроблогерски сервиси Идентика и Твитер + comment...@latin]=mikroblogerski servisi identi.ca i Twitter + Comment[sv]=Mikrowebbjournaltjänsterna identi.ca och twitter ++Comment[tr]=identi.ca ve twitter mini-günlük servisleri + Comment[uk]=Служби мікроблогів identi.ca і twitter + Comment[wa]=Siervices identi.ca eyet twitter micro-blogging + Comment[x-test]=xxidenti.ca and twitter micro-blogging servicesxx +Index: applets/magnifique/plasma-applet-magnifique.desktop +=================================================================== +--- applets/magnifique/plasma-applet-magnifique.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/magnifique/plasma-applet-magnifique.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -11,7 +11,20 @@ + Name[wa]=Magnifike + Name[x-test]=xxMagnifiquexx + Name[zh_CN]=魅影 +-Comment = a magnification glass for Plasma canvas ++Comment=A magnification glass for the Plasma desktop ++Comment[es]=Una lente de aumento para el escritorio Plasma ++Comment[et]=Plasma töölaua suurendusklaas ++Comment[is]=Stækkunargler fyrir Plasma skjáborðið ++Comment[it]=Una lente d'ingrandimento per il desktop Plasma ++Comment[nds]=En Kiekglas för den Plasma-Schriefdisch ++Comment[nl]=Een vergrootglas voor het Plasma bureaublad ++Comment[nn]=Eit forstørringsglas til Plasma-skrivebordet ++Comment[pt]=Uma lupa de ampliação para o ambiente de trabalho Plasma ++Comment[pt_BR]=Uma lente de aumento para a área de trabalho Plasma ++Comment[sv]=Ett förstoringsglas för Plasmaskrivbordet ++Comment[uk]=Збільшувальне скло для стільниці Плазми ++Comment[x-test]=xxA magnification glass for the Plasma desktopxx ++Comment[zh_TW]=Plasma 桌面上的放大鏡 + Type=Service + Icon=zoom-in + +Index: applets/opendesktop/contactwidget.cpp +=================================================================== +--- applets/opendesktop/contactwidget.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/opendesktop/contactwidget.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -195,13 +195,13 @@ + + void ContactWidget::sendMessage() + { +- QUrl url = QString("http://www.opendesktop.org/messages/?action=newmessage&username=%1";).arg(user()); ++ QUrl url = QString("https://www.opendesktop.org/messages/?action=newmessage&username=%1";).arg(user()); + new KRun(url, m_nameLabel->nativeWidget()); + } + + void ContactWidget::addFriend() + { +- KUrl url = QString("http://www.opendesktop.org/usermanager/relationadd.php?username=%1";).arg(user()); ++ KUrl url = QString("https://www.opendesktop.org/usermanager/relationadd.php?username=%1";).arg(user()); + kDebug() << "add friend" << user() << url.url(); + new KRun(url, m_nameLabel->nativeWidget()); + } +Index: applets/opendesktop/plasma-applet-opendesktop.desktop +=================================================================== +--- applets/opendesktop/plasma-applet-opendesktop.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/opendesktop/plasma-applet-opendesktop.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -27,6 +27,7 @@ + Comment[nl]=Communiceer met het sociale bureaublad + Comment[nn]=Kommuniser via openDesktop + Comment[pa]=ਸਮਾਜਿਕ ਡੈਸਕਟਾਪ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਸੰਚਾਰ ++Comment[pl]=Komunikacja przy użyciu Pulpitu społecznościowego + Comment[pt]=Comunicar com o Ambiente de Trabalho Social + Comment[pt_BR]=Comunique-se usando o Ambiente de Trabalho Social + Comment[ro]=Comunicați utilizînd Biroul Social +@@ -35,6 +36,7 @@ + Comment[sr]=Комуницирање путем Друштвене површи + comment...@latin]=komuniciranje putem Društvene površi + Comment[sv]=Kommunicera med användning av det sociala skrivbordet ++Comment[tr]=Sosyal Masaüstünü kullanarak iletişim kur + Comment[uk]=Спілкування за допомогою соціальної стільниці + Comment[wa]=Comuniker e s' siervant do Scribanne sociå + Comment[x-test]=xxCommunicate using the Social Desktopxx +@@ -72,6 +74,7 @@ + Keywords[nl]=Hulpmiddelen + Keywords[nn]=Verktøy + Keywords[pa]=ਸਹੂਲਤਾਂ ++Keywords[pl]=Narzędzia + Keywords[pt]=Utilitários + Keywords[pt_BR]=Utilitários + Keywords[ro]=Utilitare +@@ -80,6 +83,7 @@ + Keywords[sr]=Алатке + keywords...@latin]=alatke + Keywords[sv]=Verktyg ++Keywords[tr]=Yardımcı Araçlar + Keywords[uk]=Інструменти + Keywords[wa]=Usteyes + Keywords[x-test]=xxUtilitiesxx +Index: applets/opendesktop/opendesktop.cpp +=================================================================== +--- applets/opendesktop/opendesktop.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/opendesktop/opendesktop.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -115,8 +115,8 @@ + } else { + connectPerson(m_username); + connectFriends(m_username); ++ connectGeolocation(); + } +- connectGeolocation(); + } + + void OpenDesktop::connectGeolocation() +@@ -422,6 +422,9 @@ + m_displayedUser = m_username; + connectPerson(m_username); + connectFriends(m_username); ++ if (!m_username.isEmpty()) { ++ connectGeolocation(); ++ } + cg.writeEntry("username", m_username); + emit configNeedsSaving(); + setConfigurationRequired(false); +@@ -439,7 +442,7 @@ + + void OpenDesktop::registerAccount() + { +- KUrl url("http://www.opendesktop.org/usermanager/new.php";); ++ KUrl url("https://www.opendesktop.org/usermanager/new.php";); + kDebug() << "register new account" << url.url(); + new KRun(url, ui.registerButton); + } +Index: applets/mediaplayer/plasma-applet-mediaplayer.desktop +=================================================================== +--- applets/mediaplayer/plasma-applet-mediaplayer.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/mediaplayer/plasma-applet-mediaplayer.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -20,6 +20,7 @@ + Name[nl]=Mediaspeler + Name[nn]=Mediespelar + Name[pa]=ਮੀਡਿਆ ਪਲੇਅਰ ++Name[pl]=Odtwarzacz multimedialny + Name[pt]=Reprodutor Multimédia + Name[pt_BR]=Reprodutor de mídia + Name[ro]=Redare multimedia +@@ -28,6 +29,7 @@ + Name[sr]=медија плејер + name...@latin]=medija plejer + Name[sv]=Mediaspelare ++Name[tr]=Ortam Oynatıcı + Name[uk]=Медіапрогравач + Name[wa]=Djouweu d' media + Name[x-test]=xxMedia Playerxx +@@ -53,6 +55,7 @@ + Comment[nl]=Widget die video en geluid kan afspelen + Comment[nn]=Element som kan spela video og lyd + Comment[pa]=ਵਿਦਜੈਟ, ਜੋ ਕਿ ਵੀਡਿਓ ਅਤੇ ਸਾਊਂਡ ਚਲਾ ਸਕਦਾ ਹੈ ++Comment[pl]=Element interfejsu, który potrafi odtwarzać wideo i dźwięk + Comment[pt]=Um elemento que pode reproduzir vídeo e áudio + Comment[pt_BR]=Widget que pode tocar som e vídeo + Comment[ro]=COntrol ce poate reda video și sunet +@@ -61,6 +64,7 @@ + Comment[sr]=Виџет за пуштање филмова и музике + comment...@latin]=vidžet za puštanje filmova i muzike + Comment[sv]=Grafisk komponent som kan spela video och ljud ++Comment[tr]=Ses çalabilen ve video oynatabilen gereç + Comment[uk]=Віджет, призначений для відтворення відео і звуку + Comment[wa]=Ahesse ki sait djouwer des videyos et do son + Comment[x-test]=xxWidget that can play video and soundxx +Index: applets/lancelot/app/src/models/ContactsKopete.h +=================================================================== +--- applets/lancelot/app/src/models/ContactsKopete.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/lancelot/app/src/models/ContactsKopete.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -31,19 +31,21 @@ + ContactsKopete(); + ~ContactsKopete(); + +- void timerEvent(QTimerEvent * event); +- + protected: + void activate(int index); + void load(); ++ void load(bool forceReload); + void updateContactData(const QString & contactId); ++ void timerEvent(QTimerEvent * event); + + protected Q_SLOTS: + void contactChanged(const QString & contactId); + + private: + org::kde::Kopete * m_interface; +- QBasicTimer m_timer; ++ QBasicTimer m_delayTimer; ++ QBasicTimer m_checkRunningTimer; ++ QStringList m_contactsToUpdate; + QString m_kopeteAvatarsDir; + bool m_kopeteRunning : 1; + bool m_noOnlineContacts : 1; +Index: applets/lancelot/app/src/models/ContactsKopete.cpp +=================================================================== +--- applets/lancelot/app/src/models/ContactsKopete.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013413) ++++ applets/lancelot/app/src/models/ContactsKopete.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013413) +@@ -25,11 +25,12 @@ + + // #define UPDATE_INTERVAL 15000 + #define CHECK_RUNNING_INTERVAL 5000 ++#define DELAY_INTERVAL 500 + + namespace Models { + + ContactsKopete::ContactsKopete() +- : m_interface(NULL), m_kopeteRunning(true) ++ : m_interface(NULL), m_kopeteRunning(false) + { + setSelfTitle(i18n("Contacts")); + setSelfIcon(KIcon("kopete")); +@@ -40,14 +41,27 @@ + m_kopeteAvatarsDir = KStandardDirs::locate( + "data", "kopete/avatars/Contacts/"); + +- m_timer.start(CHECK_RUNNING_INTERVAL, this); ++ m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this); + load(); + } + + void ContactsKopete::timerEvent(QTimerEvent * event) + { +- if (event->timerId() == m_timer.timerId()) { ++ if (event->timerId() == m_checkRunningTimer.timerId()) { + load(); ++ } else if (event->timerId() == m_delayTimer.timerId()) { ++ qDebug() << "ContactsKopete::contactChanged [delayed]:" ++ << m_contactsToUpdate.size(); ++ m_delayTimer.stop(); ++ // checking whether we have a large update ++ if (m_contactsToUpdate.size() > 5) { ++ load(true); ++ } else { ++ foreach(QString contact, m_contactsToUpdate) { ++ updateContactData(contact); ++ } ++ } ++ m_contactsToUpdate.clear(); + } + } + +@@ -70,42 +84,65 @@ + + void ContactsKopete::load() + { ++ load(false); ++} ++ ++void ContactsKopete::load(bool forceReload) ++{ + setEmitInhibited(true); +- clear(); <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
