contact-applet, text-ui and presence-applet freeze

[Daniel Vrátil]

On Wednesday 09 of January 2013 17:29:01 David Edmundson wrote:
> On Tue, Jan 8, 2013 at 7:38 PM, Daniel Vrátil <dvratil at redhat.com> wrote:
> > On Saturday 05 of January 2013 02:35:47 David Edmundson wrote:
> >> On Sat, Jan 5, 2013 at 2:32 AM, Daniel Vrátil <dvratil at redhat.com> wrote:
> >> > On Friday 04 of January 2013 22:38:49 Daniele E. Domenichelli wrote:
> >> >> On 04/01/13 17:56, Daniel Vrátil wrote:
> >> >> > On Friday 04 of January 2013 13:34:34 Daniel Vrátil wrote:
> >> >> >> Hi,
> >> >> >> 
> >> >> >> I'm starting the planned move of all declarative components to
> >> >> >> ktp-common-
> >> >> >> internals and all Plasma applets to ktp-contact-applet (to be
> >> >> >> renamed
> >> >> >> to
> >> >> >> ktp- desktop-applets).
> >> >> >> 
> >> >> >> Please don't to commit changes to master branches of these repos
> >> >> >> (or
> >> >> >> I'll
> >> >> >> force you to do the merging afterwards!).
> >> >> >> 
> >> >> >> It should take just a few days. I'll keep you updated on the
> >> >> >> progress.
> >> >> > 
> >> >> > This was easier then I thought, hehe :)
> >> >> 
> >> >> Are you just moving the files or are you preserving their history?
> >> >> That would be quite important in my opinion, at list for the classes
> >> >> in
> >> >> ktp-common-internals. git filter-branch + git merge can make miracles
> >> >> ;)
> >> > 
> >> > I had no idea that it's possible to preserve history across git
> >> > repositories, so I just moved the files.
> >> > 
> >> > If you would insist on preserving history, I can try to learn the
> >> > magic.
> >> 
> >> http://www.sharpley.org.uk/node/21
> >> 
> >> Be careful though.. when you recommit (even to the move_plasma branch)
> >> it will run all the commit hooks again...
> > 
> > Hi,
> > 
> > the new branches are now pushed in ktp-common-internals and ktp-contact-
> > applet. The branches are called move_plasma_2 and they should be identical
> > to move_plasma, except for that all imported files now have their history
> > preserved. Please test whether everything works and let me know if I
> > something's wrong.
> 
> Ship it from me.
> 
> From reviewing this, I have a _lot_ of things I want to fix, but they
> aren't regressions and are best done afterwards.

Please share the list, I can help fixing some :-)

> 
> Make sure to check with someone knowledgeable (not me) about whether
> you need to disable hooks to merge from move_plasma_2 to master before
> you do it.

Checked, it's safe.

If everyone is OK with that, I'll merge on Saturday. Sorry for the big delay, 
I got drawn away by some family business.

Dan

> 
> Good work.
> 
> > Dan
> > 
> >> > Dan
> >> > 
> >> >> > ktp-common-internals
> >> >> > 
> >> >> >     All declarative modules all now merged to ktpqmlplugin.so
> >> >> >     (import
> >> >> >     org.kde.telepathy 0.1). Sources are in
> >> >> >     ktp-common-internals/KTp/Declarative.
> >> >> >     
> >> >> >     Because the declarative plugin from text-ui depends on some code
> >> >> >     from
> >> >> >     libktpchat, I had to move following classes from libktpchat to
> >> >> >     
> >> >> >     libktpcommoninternalsprivate:
> >> >> >             AbstractMessageFilter => KTp::AbstractMessageFilter
> >> >> >             Message => KTp::Message
> >> >> >             MessageProcessor => KTp::MessageProcessor
> >> >> >             PluginConfigManager => KTp::MessageFilterConfigManager
> >> >> >             UrlFilter => MessageUrlFilter (not exported)
> >> >> >             EscapeFilter => MessageEscapeFilter (not exported)
> >> >> 
> >> >> Since we are moving those, why don't we move also the adium stuff in
> >> >> the
> >> >> widget folder?
> >> >> 
> >> >> 
> >> >> 
> >> >> 
> >> >> Cheers,
> >> >> 
> >> >>  Daniele
> >> >> 
> >> >> _______________________________________________
> >> >> KDE-Telepathy mailing list
> >> >> KDE-Telepathy at kde.org
> >> >> https://mail.kde.org/mailman/listinfo/kde-telepathy
> >> > 
> >> > --
> >> > dvratil at redhat.com | Associate Software Engineer / BaseOS / KDE, Qt
> >> > GPG Key: 0xC59D614F6F4AE348
> >> > Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
> >> > 
> >> > _______________________________________________
> >> > KDE-Telepathy mailing list
> >> > KDE-Telepathy at kde.org
> >> > https://mail.kde.org/mailman/listinfo/kde-telepathy
> >> 
> >> _______________________________________________
> >> KDE-Telepathy mailing list
> >> KDE-Telepathy at kde.org
> >> https://mail.kde.org/mailman/listinfo/kde-telepathy
> > 
> > --
> > dvratil at redhat.com | Associate Software Engineer / BaseOS / KDE, Qt
> > GPG Key: 0xC59D614F6F4AE348
> > Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
> > 
> > _______________________________________________
> > KDE-Telepathy mailing list
> > KDE-Telepathy at kde.org
> > https://mail.kde.org/mailman/listinfo/kde-telepathy
> 
> _______________________________________________
> KDE-Telepathy mailing list
> KDE-Telepathy at kde.org
> https://mail.kde.org/mailman/listinfo/kde-telepathy
-- 
dvratil at redhat.com | Associate Software Engineer / BaseOS / KDE, Qt
GPG Key: 0xC59D614F6F4AE348
Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-telepathy/attachments/20130112/3875164c/attachment.sig>