diff -Nru ktp-text-ui-0.99.0+git20131230+r1175/app/emoticon-text-edit-selector.cpp ktp-text-ui-0.99.0+git20131231+r1176/app/emoticon-text-edit-selector.cpp --- ktp-text-ui-0.99.0+git20131230+r1175/app/emoticon-text-edit-selector.cpp 2013-12-30 11:18:01.000000000 +0000 +++ ktp-text-ui-0.99.0+git20131231+r1176/app/emoticon-text-edit-selector.cpp 2013-12-31 17:33:05.000000000 +0000 @@ -97,9 +97,11 @@ } const QHash list = sEmoticons->theme( cachedEmoticonsThemeName ).emoticonsMap(); - QHash::const_iterator end = list.constEnd(); - for ( QHash::const_iterator it = list.constBegin(); it != end; ++it ) { - new EmoticonTextEditItem( it.value().first(), it.key(), d->listEmoticon ); + QStringList emoticonKeys = list.keys(); + qSort(emoticonKeys); + + Q_FOREACH(const QString &emoticonPath, emoticonKeys) { + new EmoticonTextEditItem(list[emoticonPath].first(), emoticonPath, d->listEmoticon); } d->listEmoticon->setIconSize( QSize( 32, 32 ) ); diff -Nru ktp-text-ui-0.99.0+git20131230+r1175/debian/bzr-builder.manifest ktp-text-ui-0.99.0+git20131231+r1176/debian/bzr-builder.manifest --- ktp-text-ui-0.99.0+git20131230+r1175/debian/bzr-builder.manifest 2013-12-30 11:18:04.000000000 +0000 +++ ktp-text-ui-0.99.0+git20131231+r1176/debian/bzr-builder.manifest 2013-12-31 17:33:06.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.99.0+git20131230+r1175-13 -lp:~telepathy-kde/telepathy-kde/ktp-text-ui revid:git-v1:6006557489bb5256f6c7a12c101c1894387bc2ca +# bzr-builder format 0.3 deb-version 0.99.0+git20131231+r1176-13 +lp:~telepathy-kde/telepathy-kde/ktp-text-ui revid:git-v1:ed1b73c4d893f2eaaab423e9c736127e1431399c merge packaging lp:~telepathy-kde/telepathy-kde/ktp-text-ui-ubuntu revid:quintasan@kubuntu.org-20130624161158-drzm4sdn1hf9k416 diff -Nru ktp-text-ui-0.99.0+git20131230+r1175/debian/changelog ktp-text-ui-0.99.0+git20131231+r1176/debian/changelog --- ktp-text-ui-0.99.0+git20131230+r1175/debian/changelog 2013-12-30 11:18:04.000000000 +0000 +++ ktp-text-ui-0.99.0+git20131231+r1176/debian/changelog 2013-12-31 17:33:06.000000000 +0000 @@ -1,8 +1,8 @@ -ktp-text-ui (0.99.0+git20131230+r1175-13~ubuntu13.10.1) saucy; urgency=low +ktp-text-ui (0.99.0+git20131231+r1176-13~ubuntu13.10.1) saucy; urgency=low * Auto build. - -- Launchpad Package Builder Mon, 30 Dec 2013 11:18:04 +0000 + -- Launchpad Package Builder Tue, 31 Dec 2013 17:33:06 +0000 ktp-text-ui (0.6.2.1-0ubuntu1) saucy; urgency=low