Re: Merge or Cherry-Pick?

2011-02-04 Thread Michael Pyne
On Friday, February 04, 2011 19:16:03 Tom Albers wrote: > - Original Message - > > > this will get us used to the merge workflow which starts with "fix it > > in the > > stable branch" first. > > So, in conclusion, we did not pick a tool which fits our workflow, instead > we are now adjus

Re: Merge or Cherry-Pick?

2011-02-04 Thread Tom Albers
- Original Message - > this will get us used to the merge workflow which starts with "fix it > in the > stable branch" first. So, in conclusion, we did not pick a tool which fits our workflow, instead we are now adjusting our workflow to the tool. Best, -- Tom Albers KDE Sysadmin

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Oswald Buddenhagen
On Fri, Feb 04, 2011 at 04:35:32PM -0500, Dawit Alemayehu wrote: > The case of the kill is even more baffling to me because its > documentation clearly says "Kills the current process, causing it to > exit immediately". So If I kill is invoked as such > > process.kill(); > > what should a reasona

Review Request: Prevent KHTML's adblock filter parser from incorrectly parsing rules with options...

2011-02-04 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100572/ --- Review request for kdelibs. Summary --- This request is created becau

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 17:35:00 Dawit A wrote: > > Ok, that sounds like unexpected behaviour. Has this been filed as a bug? > > Not yet. I simply mentioned it here because you seem to be addressing > the issue that exposed this behavior, but I guess I can open a ticket > against Qt for t

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 19:28:06 Nicolás Alvarez wrote: > On 04/02/2011, Thiago Macieira wrote: > > Ok, fair enough. Threading-after-pipes-closed is not an option then. > > > > That leaves back again at square one: > > - one thread per subprocess > > > > OR > > > > - SIGCHLD handler > >

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit A
On Fri, Feb 4, 2011 at 5:00 PM, Thiago Macieira wrote: > On Friday, 4 de February de 2011 16:35:32 Dawit A wrote: >> Let us take out terminate from the equation. It is my mistake I >> included it here because its documentation states that "The process >> may not exit as a result of calling this fu

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Nicolás Alvarez
On 04/02/2011, Thiago Macieira wrote: > > Ok, fair enough. Threading-after-pipes-closed is not an option then. > > That leaves back again at square one: > - one thread per subprocess > OR > - SIGCHLD handler > OR > - kernel developers give us some new syscalls like pidfd or waitpidv > Would si

Re: Review Request: Fix for bug 264444: ksplashx shows garbage when background image does not properly cover entire screen

2011-02-04 Thread Ivo Anjo
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100520/ --- (Updated Feb. 4, 2011, 9:47 p.m.) Review request for KDE Base Apps and KDE

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 16:35:32 Dawit A wrote: > Let us take out terminate from the equation. It is my mistake I > included it here because its documentation states that "The process > may not exit as a result of calling this function". However, I really > do not understand why what you s

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit A
On Fri, Feb 4, 2011 at 3:32 PM, Thiago Macieira wrote: > On Friday, 4 de February de 2011 14:06:58 Dawit A wrote: >> BTW, there is one side issue I noticed in QProcess through this whole >> process. Why does QProcess not exit immediately if I invoke kill or >> terminate or even when it just timed

Re: Merge or Cherry-Pick?

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 14:58:52 Parker Coates wrote: > Another special and unavoidable case of this will be applications > bumping their stable version numbers. It seems weird to have a > "Updated version to 4.6.2" commit in a 4.7 master, for example, but I > guess that the (small) price

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 14:06:58 Dawit A wrote: > BTW, there is one side issue I noticed in QProcess through this whole > process. Why does QProcess not exit immediately if I invoke kill or > terminate or even when it just timed out from waiting for the child > process ? IOW, why wait some

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 19:38:51 Oswald Buddenhagen wrote: > On Fri, Feb 04, 2011 at 06:28:10PM +0100, Thiago Macieira wrote: > > Em sexta-feira, 4 de fevereiro de 2011, às 18:17:13, Thiago Macieira escreveu: > > > I thought about that. My work on no-thread-until-pipes-close had > > > alre

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 17:13:31 Nicolas Alvarez wrote: > > Whoever forgot to do forward-ports should be doing it *yesterday*. > > I know forward-ports should be done anyway and asap. But until they aren't > done, we can't do the 4.6 merge. Sure we can. It doesn't influence in anyway. -

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Nicolas Alvarez
Thiago Macieira wrote: > On Friday, 4 de February de 2011 15:18:58 Nicolas Alvarez wrote: >> Johannes Sixt wrote: >> > (1) All back- and forward-porting was complete when SVN went >> > read-only. >> >> IMHO this is not a safe assumption. As I said before, I found a missing >> forward-port in kdepl

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Pino Toscano
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/#review1230 --- Ship it! Looks ok now. - Pino On Feb. 4, 2011, 6:22 p.m., Da

Re: Merge or Cherry-Pick?

2011-02-04 Thread Parker Coates
On Tue, Feb 1, 2011 at 06:29, Johannes Sixt wrote: > Am 2/1/2011 10:31, schrieb David Jarvie: >> On Mon, January 31, 2011 11:27 pm, Thiago Macieira wrote: >>> On Monday, 31 de January de 2011 23:34:39 Arno Rehn wrote: I guess that won't quite work when there are commits specific to 4.6 in

Re: Initial support for kde_projects.xml in kdesrc-build

2011-02-04 Thread Michael Jansen
On Wednesday 02 February 2011 18:26:35 Alexander Neundorf wrote: > On Wednesday 02 February 2011, Michael Pyne wrote: > ... > > > e.g. worrying about environment variables like PKG_CONFIG_PATH is no > > idle > > claim (kdesrc-build sets that as well), along with PATH in order to pick > > up the ri

Re: Merge or Cherry-Pick?

2011-02-04 Thread Aaron J. Seigo
On Friday, February 4, 2011, Dawit A wrote: > Can somone please clarify the proper rule to follow for committing bug > fixes as it relates to the KDE 4.6 branch ? The conclusion from the > discussion here is rather confusing as to what should be done going > forward. Should we still commit new bug

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit A
On Fri, Feb 4, 2011 at 11:41 AM, Thiago Macieira wrote: > Em sexta-feira, 4 de fevereiro de 2011, às 05:24:26, Dawit A escreveu: >> > In the meantime, I've been discussing with Rémi about the issue and he's >> > not budging from his position that libraries shoul >> >  never use Unix signals. To be

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 15:18:58 Nicolas Alvarez wrote: > Johannes Sixt wrote: > > (1) All back- and forward-porting was complete when SVN went > > read-only. > > IMHO this is not a safe assumption. As I said before, I found a missing > forward-port in kdeplasma-addons, which is a 'small'

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Oswald Buddenhagen
On Fri, Feb 04, 2011 at 06:28:10PM +0100, Thiago Macieira wrote: > Em sexta-feira, 4 de fevereiro de 2011, às 18:17:13, Thiago Macieira escreveu: > > I thought about that. My work on no-thread-until-pipes-close had already > > documented this as a behaviour change. > > Think about it anyway: if t

Re: Merge or Cherry-Pick?

2011-02-04 Thread Dawit A
Can somone please clarify the proper rule to follow for committing bug fixes as it relates to the KDE 4.6 branch ? The conclusion from the discussion here is rather confusing as to what should be done going forward. Should we still commit new bug fixes to the 4.6 branch first and merge into master

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Nicolas Alvarez
Johannes Sixt wrote: > Am 2/3/2011 13:04, schrieb Johannes Sixt: >> Before anybody begins to work in this way, someone with sufficient >> knowlege must introduce the first real merge of the 4.6 branch into the >> master branch. The conflicts must be resolved; or it is possible to punt >> by using -

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 6:22 p.m.) Review request for kdelibs and David Fau

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Dawit A
On Fri, Feb 4, 2011 at 11:34 AM, Thiago Macieira wrote: > Em sexta-feira, 4 de fevereiro de 2011, às 16:53:14, David Faure escreveu: >> QIODevice is a "pull" solution - you can ask for "1MB of data now". >> Well, at least with buffers and files, not necessarily with sockets :-) > > QIODevice can w

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 18:17:13, Thiago Macieira escreveu: > I thought about that. My work on no-thread-until-pipes-close had already > documented this as a behaviour change. Think about it anyway: if the child process dies but the grandchild one doesn't, it will die when the c

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Allan Sandfeld Jensen
On Friday 04 February 2011, Thiago Macieira wrote: > Em sexta-feira, 4 de fevereiro de 2011, às 16:52:54, Allan Sandfeld Jensen > > escreveu: > > Or to put another way; PUT takes a KUrl to send to and gets the data it > > sends from a slot. POST is essentially just a PUT with return data, so I >

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 18:05:09, Oswald Buddenhagen escreveu: > On Fri, Feb 04, 2011 at 05:41:16PM +0100, Thiago Macieira wrote: > > This makes each process started spawn a new thread, which > > will block on waitpid(2). > > i have the vague notion that blocking/ignoring sigchld

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Oswald Buddenhagen
On Fri, Feb 04, 2011 at 05:41:16PM +0100, Thiago Macieira wrote: > This makes each process started spawn a new thread, which > will block on waitpid(2). > i have the vague notion that blocking/ignoring sigchld will prevent wait*() from working on some systems. dunno where i got that from. > I'm wo

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 15:27:49, Oswald Buddenhagen escreveu: > and i'm strongly opposed to merging any previous branches back to master > with -s ours, as this will effectively rewrite history (we did *not* > merge back, and claiming that now will possibly hide actual omissions

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 16:52:54, Allan Sandfeld Jensen escreveu: > Or to put another way; PUT takes a KUrl to send to and gets the data it > sends from a slot. POST is essentially just a PUT with return data, so I > would find it most natural if POST mirrored PUT in how it send

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 05:24:26, Dawit A escreveu: > > In the meantime, I've been discussing with Rémi about the issue and he's > > not budging from his position that libraries shoul > > never use Unix signals. To be > > honest, he's right: Unix signals are meant to be used cen

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Thiago Macieira
Em sexta-feira, 4 de fevereiro de 2011, às 16:53:14, David Faure escreveu: > QIODevice is a "pull" solution - you can ask for "1MB of data now". > Well, at least with buffers and files, not necessarily with sockets :-) QIODevice can work in that way too, since Qt 4.4. If you try to read and come

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Matt Williams
On 4 February 2011 17:05, Tom Albers wrote: > - Original Message - >> It >> is when I have to unnecessarily type more than I have to. Seriously >> this is getting to be annoying and I do not mean you personally. These >> rigid and brittle coding styles. One project says no braces for singl

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Allan Sandfeld Jensen
On Friday 04 February 2011, David Faure wrote: > I like QIODevice actually, for reading stuff on demand. > I use it everywhere in KArchive (KZip, KTar...) and KFilterDev. > QIODevice is a "pull" solution - you can ask for "1MB of data now". > Well, at least with buffers and files, not necessarily w

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Martin Gräßlin
On Friday 04 February 2011 17:05:07 Tom Albers wrote: > - Original Message - > > > It > > is when I have to unnecessarily type more than I have to. Seriously > > this is getting to be annoying and I do not mean you personally. These > > rigid and brittle coding styles. One project says no

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Tom Albers
- Original Message - > It > is when I have to unnecessarily type more than I have to. Seriously > this is getting to be annoying and I do not mean you personally. These > rigid and brittle coding styles. One project says no braces for single > line statements and another says the complete o

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread David Faure
On Friday 04 February 2011, Allan Sandfeld Jensen wrote: > Is QIODevice the best idea to use as source? >I believe we can espect the user of KIO::http_post > to be using KIO and not Qt IO I like QIODevice actually, for reading stuff on demand. I use it everywhere in KArchive (KZip, KTar...) and K

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Allan Sandfeld Jensen
On Friday 04 February 2011, Dawit A wrote: > Ahh... I think you misunderstood the purpose of the patch or rather > the title of this review. The new APIs simply overload the existing > http post APIs such that the data you are going to post is sent > through a QIODevice (QFile or QBuffer) rather th

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
> On Feb. 4, 2011, 8:02 a.m., Pino Toscano wrote: > > Please also add the { } around single line blocks (as per kdelibs coding > > style). > > Dawit Alemayehu wrote: > Lets us forget about such nitpicks, okay... If such unnecessary coding > styles were to be enforced, there would be so man

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 3:52 p.m.) Review request for kdelibs and David Fau

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
> On Feb. 4, 2011, 10:54 a.m., Pino Toscano wrote: > > Still the coding style issues to fix in the new code. Sorry, but I do not see that as an issue... > On Feb. 4, 2011, 10:54 a.m., Pino Toscano wrote: > > kdecore/services/kmimetyperepository.cpp, lines 688-689 > >

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Dawit A
Ahh... I think you misunderstood the purpose of the patch or rather the title of this review. The new APIs simply overload the existing http post APIs such that the data you are going to post is sent through a QIODevice (QFile or QBuffer) rather than a QByteArray. To be clear here is the new overlo

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Oswald Buddenhagen
On Fri, Feb 04, 2011 at 08:47:08AM +0100, Johannes Sixt wrote: > (e) There is no (e). > as far as i'm concerned, there isn't even an (a). i said about a year ago and repeated it later that *if* we wanted a forward-merge based process, we would have to do the git migration *before* branching off th

Re: Initial merge

2011-02-04 Thread Johannes Sixt
Am 2/4/2011 13:51, schrieb Andreas Pakulat: > On 04.02.11 08:47:08, Johannes Sixt wrote: >> Am 2/3/2011 13:04, schrieb Johannes Sixt: >> The simplicity results from two assumptions: >> >> (1) All back- and forward-porting was complete when SVN went >> read-only. > > I'm not sure that assumption is

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Andreas Pakulat
On 04.02.11 08:47:08, Johannes Sixt wrote: > Am 2/3/2011 13:04, schrieb Johannes Sixt: > > Before anybody begins to work in this way, someone with sufficient > > knowlege must introduce the first real merge of the 4.6 branch into the > > master branch. The conflicts must be resolved; or it is possi

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-04 Thread Allan Sandfeld Jensen
Is QIODevice the best idea to use as source? Since we are talking KIO, I believe we can espect the user of KIO::http_post to be using KIO and not Qt IO. So would it instead be possible to make the source a KIO job or KUrl? Regards `Allan On Wednesday 02 February 2011, Dawit Alemayehu wrote: >

Re: irc meeting for kdelibs git workflow

2011-02-04 Thread Aaron J. Seigo
On Friday, February 4, 2011, you wrote: > On Tuesday 01 February 2011, Aaron J. Seigo wrote: > > * 3rd party examples we can learn from: > > http://public.kitware.com/Wiki/Git/Workflow/Topic > > Qt? > > http://wiki.videolan.org/Git thanks; added to http://community.kde.or

Re: irc meeting for kdelibs git workflow

2011-02-04 Thread David Faure
On Tuesday 01 February 2011, Aaron J. Seigo wrote: > * 3rd party examples we can learn from: > http://public.kitware.com/Wiki/Git/Workflow/Topic > Qt? http://wiki.videolan.org/Git -- David Faure, fa...@kde.org, http://www.davidfaure.fr Sponsored by Nokia to work on KDE, incl. Ko

Re: phononserver phonondevicesrc OpenFlag, askToRemove

2011-02-04 Thread David Faure
On Thursday 06 January 2011, Edgar Fuß wrote: > Would it be better to have some configuration option in a phononserverrc > not to complain about vanishing sound cards? Yes I think this would be a useful configuration option. -- David Faure, fa...@kde.org, http://www.davidfaure.fr Sponsored by No

Re: Initial support for kde_projects.xml in kdesrc-build

2011-02-04 Thread David Faure
On Friday 04 February 2011, Andreas Pakulat wrote: > On 04.02.11 00:33:58, David Faure wrote: > > On Wednesday 02 February 2011, Alexander Neundorf wrote: > > > On Wednesday 02 February 2011, Michael Pyne wrote: > > > ... > > > > > > > e.g. worrying about environment variables like PKG_CONFIG_PATH

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread David Faure
On Friday 04 February 2011, Thiago Macieira wrote: > Hmm... I don't get it. Isn't the database version saved in the database? > Why do we need to search the pkg-config file (which is a development > file!) to find out how to use the database? > > If this is required, it sounds like shared-mime-in

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Pino Toscano
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/#review1199 --- Still the coding style issues to fix in the new code. kdecore/

Re: moving scratch repositories?

2011-02-04 Thread Ben Cooksley
On Fri, Feb 4, 2011 at 11:26 PM, Stefan Majewsky wrote: > On Thu, Feb 3, 2011 at 7:28 PM, Marco Martin wrote: >> so, what should happen is, everyting in the scratch repo, should become >> basically a branch of the master branch (in my first two cases runtime) with >> all the commits (just linear

Re: moving scratch repositories?

2011-02-04 Thread Stefan Majewsky
On Thu, Feb 3, 2011 at 7:28 PM, Marco Martin wrote: > so, what should happen is, everyting in the scratch repo, should become > basically a branch of the master branch (in my first two cases runtime) with > all the commits (just linear story) of the repo as commits in the branch, in > that subfold

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit A
On Fri, Feb 4, 2011 at 2:46 AM, Thiago Macieira wrote: > On Thursday, 3 de February de 2011 22:44:56 Dawit Alemayehu wrote: >> The attached patch is a workaround to the much discussed issue with VLC >> hanging when opening a KDE file dialog. For the details about the causes of >> this bug, see htt

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 10:11 a.m.) Review request for kdelibs and David Fa

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Pino Toscano
> On Feb. 4, 2011, 8:02 a.m., Pino Toscano wrote: > > Please also add the { } around single line blocks (as per kdelibs coding > > style). > > Dawit Alemayehu wrote: > Lets us forget about such nitpicks, okay... If such unnecessary coding > styles were to be enforced, there would be so man

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Dawit Alemayehu
> On Feb. 4, 2011, 8:02 a.m., Pino Toscano wrote: > > Please also add the { } around single line blocks (as per kdelibs coding > > style). Lets us forget about such nitpicks, okay... If such unnecessary coding styles were to be enforced, there would be so many lines of code that would need fi

Re: Initial merge (was: Re: Merge or Cherry-Pick?)

2011-02-04 Thread Thiago Macieira
On Friday, 4 de February de 2011 08:47:08 Johannes Sixt wrote: > I can offer a set of git bundles that contain the merge results. (I don't > have push access yet.) Anyone interested? Send to me. By the way, for the KDE readers here: git mergetool running kdiff3 is very useful too. Select the "Lo

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

2011-02-04 Thread Pino Toscano
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/#review1190 --- Please also add the { } around single line blocks (as per kdelib