On Monday 22 June 2009 03:21:07 pm Raphael Kubo da Costa wrote: > 2009/6/22 Pali Rohár <pali.ro...@gmail.com>: > > SVN commit 985395 by pali: > > > > Added option to merge all messages from all jabber contact's resources > > (default enabled) > > > > BUG: 111537 > > BUG: 142650 > > BUG: 175078 > > BUG: 194808 > > > > > > M +10 -0 jabberaccount.cpp > > M +10 -0 jabberaccount.h > > M +12 -3 jabbercontact.cpp > > M +7 -0 ui/dlgjabbereditaccountwidget.ui > > M +4 -0 ui/jabbereditaccountwidget.cpp > > > > --- > > trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabbereditaccountwidge > >t.ui #985394:985395 @@ -590,6 +590,13 @@ > > </widget> > > </item> > > <item> > > + <widget class="QCheckBox" name="mergeMessages"> > > + <property name="text"> > > + <string>Merge all messages from all resources to one > > window/tab</string> + </property> > > + </widget> > > + </item> > > + <item> > > <spacer> > > <property name="orientation" > > > <enum>Qt::Vertical</enum> > > Doesn't this violate the string freeze?
Indeed it does. Sorry Pali, but we'll need to revert this. I'll do it later unless somebody else gets to it first. -- Matt _______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
