Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2014-04-02 17:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2014-03-10 12:18:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2014-04-02 17:22:08.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:34 UTC 2014 - [email protected] + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kemoticons-4.97.0.tar.xz New: ---- kemoticons-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.OP98VB/_old 2014-04-02 17:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.OP98VB/_new 2014-04-02 17:22:09.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Emoticons5 Name: kemoticons -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: karchive-devel >= %{_kf5_version} BuildRequires: kconfig-devel >= %{_kf5_version} @@ -94,6 +94,7 @@ %{_kf5_servicesdir}/emoticonstheme_pidgin.desktop %{_kf5_servicesdir}/emoticonstheme_xmpp.desktop %{_kf5_servicetypesdir}/kemoticonsTheme.desktop +%{_kf5_datadir}/emoticons/ %files devel %defattr(-,root,root) ++++++ kemoticons-4.97.0.tar.xz -> kemoticons-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/CMakeLists.txt new/kemoticons-4.98.0/CMakeLists.txt --- old/kemoticons-4.97.0/CMakeLists.txt 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -2,7 +2,7 @@ project(KEmoticons) -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -19,7 +19,7 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" @@ -39,6 +39,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) add_subdirectory(src) +add_subdirectory(themes) add_subdirectory(autotests) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/CMakeLists.txt new/kemoticons-4.98.0/autotests/CMakeLists.txt --- old/kemoticons-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -12,3 +12,6 @@ kemoticons_unit_tests(kemoticontest) +target_compile_definitions(kemoticontest PRIVATE + LOCAL_THEMES_DIR="${KEmoticons_SOURCE_DIR}/themes") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/kemoticontest.cpp new/kemoticons-4.98.0/autotests/kemoticontest.cpp --- old/kemoticons-4.97.0/autotests/kemoticontest.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/kemoticontest.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -3,6 +3,7 @@ Copyright (c) 2004 by Richard Smith <[email protected]> Copyright (c) 2005 by Duncan Mac-Vicar <[email protected]> + Copyright (c) 2014 by Alex Merry <[email protected]> Kopete (c) 2002-2005 by the Kopete developers <[email protected]> @@ -16,17 +17,16 @@ ************************************************************************* */ -#include "kemoticontest.h" - #include <QTest> #include <QDir> #include <QFile> +#include <QStandardPaths> #include <QTextStream> #include <QDebug> #include <kemoticons.h> -QTEST_MAIN(KEmoticonTest) +static const char * default_theme = "Glass"; /* There are three sets of tests, the Kopete 0.7 baseline with tests that were @@ -35,65 +35,112 @@ The second set are those known to work in the current codebase. The last set is the set with tests that are known to fail right now. - the name convention is working|broken-number.input|output + the name convention is (working|broken)-number.input|output */ -void KEmoticonTest::testEmoticonParser() +class KEmoticonTest : public QObject { - KEmoticonsTheme emo = KEmoticons().theme("kde4"); - QString basePath = QFINDTESTDATA("emoticon-parser-testcases"); - QVERIFY(!basePath.isEmpty()); - QDir testCasesDir(basePath); - - QStringList inputFileNames = testCasesDir.entryList(QStringList(QLatin1String("*.input"))); - Q_FOREACH (const QString &fileName, inputFileNames) { - // qDebug() << "testcase: " << fileName; - QString outputFileName = fileName; - outputFileName.replace("input", "output"); - // open the input file - QFile inputFile(basePath + QString::fromLatin1("/") + fileName); - QFile expectedFile(basePath + QString::fromLatin1("/") + outputFileName); - // check if the expected output file exists - // if it doesn't, skip the testcase + Q_OBJECT + +private Q_SLOTS: + void initTestCase() + { + QStandardPaths::setTestModeEnabled(true); + QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + + QString destThemePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + QDir themeDir(destThemePath); + if (themeDir.exists()) { + QVERIFY(themeDir.removeRecursively()); + } + QVERIFY(themeDir.mkpath(".")); + + QDir sourceThemeDir(QFile::decodeName(LOCAL_THEMES_DIR) + QLatin1String("/") + default_theme); + QVERIFY(sourceThemeDir.exists()); + + foreach (QString fileName, sourceThemeDir.entryList(QDir::Files)) { + QVERIFY(QFile::copy(sourceThemeDir.filePath(fileName), + themeDir.filePath(fileName))); + } + + // check it can actually be found + themePath = QStandardPaths::locate( + QStandardPaths::GenericDataLocation, + QString::fromLatin1("emoticons/") + default_theme, + QStandardPaths::LocateDirectory); + QVERIFY2(!themePath.isEmpty(), qPrintable(themePath)); + // testEmoticonParser() wants a trailing / + themePath += "/"; + } + + void cleanupTestCase() + { + QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + QString themePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + QDir themeDir(themePath); + QVERIFY(themeDir.removeRecursively()); + } + + void testEmoticonParser_data() + { + QTest::addColumn<QString>("inputFileName"); + QTest::addColumn<QString>("outputFileName"); + QTest::addColumn<bool>("xfail"); + + QString basePath = QFINDTESTDATA("emoticon-parser-testcases"); + QVERIFY(!basePath.isEmpty()); + QDir testCasesDir(basePath); + + QStringList inputFileNames = testCasesDir.entryList(QStringList(QLatin1String("*.input"))); + Q_FOREACH (const QString &fileName, inputFileNames) { + QString outputFileName = fileName; + outputFileName.replace("input", "output"); + QTest::newRow(qPrintable(fileName.left(fileName.lastIndexOf('.')))) + << basePath + QString::fromLatin1("/") + fileName + << basePath + QString::fromLatin1("/") + outputFileName + << (fileName.section("-", 0, 0) == QLatin1String("broken")); + } + } + + void testEmoticonParser() + { + KEmoticonsTheme emo = KEmoticons().theme(default_theme); + + QFETCH(QString, inputFileName); + QFETCH(QString, outputFileName); + QFETCH(bool, xfail); + + QFile inputFile(inputFileName); + QFile expectedFile(outputFileName); if (! expectedFile.exists()) { QSKIP("Warning! expected output for testcase not found. Skiping testcase"); - continue; - } - if (inputFile.open(QIODevice::ReadOnly) && expectedFile.open(QIODevice::ReadOnly)) { + } else if (inputFile.open(QIODevice::ReadOnly) && expectedFile.open(QIODevice::ReadOnly)) { const QString inputData = QString::fromLatin1(inputFile.readAll().constData()); const QString expectedData = QString::fromLatin1(expectedFile.readAll().constData()); inputFile.close(); expectedFile.close(); - const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/kde4/smile.png").remove("smile.png"); - if (path.isEmpty()) { - QSKIP("Emoticons not installed, skipping. kdebase-runtime needed."); - } - - QString result = emo.parseEmoticons(inputData, KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML).replace(path, QString()); - - // qDebug() << "Parse result: " << result; + QString result = emo.parseEmoticons(inputData, + KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML); + result.replace(themePath, QString()); - // HACK to know the test case we applied, concatenate testcase name to both - // input and expected string. WIll remove when I can add some sort of metadata - // to a CHECK so debug its origin testcase - //result = fileName + QString::fromLatin1(": ") + result; - //expectedData = fileName + QString::fromLatin1(": ") + expectedData; - // if the test case begins with broken, we expect it to fail, then use XFAIL - // otherwise use CHECK - if (fileName.section("-", 0, 0) == QString::fromLatin1("broken")) { - // qDebug() << "checking known-broken testcase: " << fileName; - QEXPECT_FAIL("", "Checking know-broken testcase", Continue); + if (xfail) { + QEXPECT_FAIL("", "Checking known-broken testcase", Continue); QCOMPARE(result, expectedData); } else { - // qDebug() << "checking known-working testcase: " << fileName; QCOMPARE(result, expectedData); } } else { QSKIP("Warning! can't open testcase files. Skiping testcase"); - continue; } } -} +private: + QString themePath; +}; + +QTEST_MAIN(KEmoticonTest) + +#include <kemoticontest.moc> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/kemoticontest.h new/kemoticons-4.98.0/autotests/kemoticontest.h --- old/kemoticons-4.97.0/autotests/kemoticontest.h 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/kemoticontest.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* - Tests for Kopete::Message::parseEmoticons - - Copyright (c) 2004 by Richard Smith <[email protected]> - Copyright (c) 2005 by Duncan Mac-Vicar <[email protected]> - Copyright (c) 2006 by Michael Larouche <[email protected]> - - Kopete (c) 2002-2006 by the Kopete developers <[email protected]> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#ifndef KEMOTICON_TEST_H -#define KEMOTICON_TEST_H - -#include <QObject> - -/** - * QTestLib automatic test to test Emoticon parsing. - */ -class KEmoticonTest : public QObject -{ - Q_OBJECT -private Q_SLOTS: - void testEmoticonParser(); -}; - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/core/kemoticons.cpp new/kemoticons-4.98.0/src/core/kemoticons.cpp --- old/kemoticons-4.97.0/src/core/kemoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/core/kemoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -29,6 +29,7 @@ #include <kpluginloader.h> #include <kconfiggroup.h> +#include <ksharedconfig.h> #include <ktar.h> #include <kzip.h> @@ -139,7 +140,7 @@ QString KEmoticons::currentThemeName() { KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); - QString name = config.readEntry("emoticonsTheme", "kde4"); + QString name = config.readEntry("emoticonsTheme", "Glass"); return name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/adium/adium_emoticons.cpp new/kemoticons-4.98.0/src/providers/adium/adium_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/adium/adium_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/adium/adium_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -21,6 +21,7 @@ #include <QtCore/QFile> #include <QtCore/QDir> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QDebug> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/kde/kde_emoticons.cpp new/kemoticons-4.98.0/src/providers/kde/kde_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/kde/kde_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/kde/kde_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QImageReader> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/pidgin/pidgin_emoticons.cpp new/kemoticons-4.98.0/src/providers/pidgin/pidgin_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/pidgin/pidgin_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/pidgin/pidgin_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -23,6 +23,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/xmpp/xmpp_emoticons.cpp new/kemoticons-4.98.0/src/providers/xmpp/xmpp_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/xmpp/xmpp_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/xmpp/xmpp_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QImageReader> #include <QMimeDatabase> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/tests/main.cpp new/kemoticons-4.98.0/tests/main.cpp --- old/kemoticons-4.97.0/tests/main.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/tests/main.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -57,7 +57,7 @@ comboBox = new QComboBox; emoticonTheme = emoticons.theme(); - // Theme list is repeating three times the same two themes: "Oxygen" and "kde4" + // Theme list is repeating three times the same two themes: "Oxygen" and "Glass" qDebug() << "Theme list: " << emoticons.themeList(); // Theme name is empty!! qDebug() << "Theme name: " << emoticonTheme.themeName(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/themes/CMakeLists.txt new/kemoticons-4.98.0/themes/CMakeLists.txt --- old/kemoticons-4.97.0/themes/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-4.98.0/themes/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -0,0 +1,9 @@ +install( + DIRECTORY + Glass + DESTINATION + ${SHARE_INSTALL_PREFIX}/emoticons/ + FILES_MATCHING + PATTERN "*.png" + PATTERN "emoticons.xml" +) Files old/kemoticons-4.97.0/themes/Glass/angry.png and new/kemoticons-4.98.0/themes/Glass/angry.png differ Files old/kemoticons-4.97.0/themes/Glass/bat.png and new/kemoticons-4.98.0/themes/Glass/bat.png differ Files old/kemoticons-4.97.0/themes/Glass/beer.png and new/kemoticons-4.98.0/themes/Glass/beer.png differ Files old/kemoticons-4.97.0/themes/Glass/biggrin.png and new/kemoticons-4.98.0/themes/Glass/biggrin.png differ Files old/kemoticons-4.97.0/themes/Glass/cake.png and new/kemoticons-4.98.0/themes/Glass/cake.png differ Files old/kemoticons-4.97.0/themes/Glass/camera.png and new/kemoticons-4.98.0/themes/Glass/camera.png differ Files old/kemoticons-4.97.0/themes/Glass/cat.png and new/kemoticons-4.98.0/themes/Glass/cat.png differ Files old/kemoticons-4.97.0/themes/Glass/clock.png and new/kemoticons-4.98.0/themes/Glass/clock.png differ Files old/kemoticons-4.97.0/themes/Glass/cocktail.png and new/kemoticons-4.98.0/themes/Glass/cocktail.png differ Files old/kemoticons-4.97.0/themes/Glass/confused.png and new/kemoticons-4.98.0/themes/Glass/confused.png differ Files old/kemoticons-4.97.0/themes/Glass/cry.png and new/kemoticons-4.98.0/themes/Glass/cry.png differ Files old/kemoticons-4.97.0/themes/Glass/cup.png and new/kemoticons-4.98.0/themes/Glass/cup.png differ Files old/kemoticons-4.97.0/themes/Glass/dog.png and new/kemoticons-4.98.0/themes/Glass/dog.png differ Files old/kemoticons-4.97.0/themes/Glass/email.png and new/kemoticons-4.98.0/themes/Glass/email.png differ Files old/kemoticons-4.97.0/themes/Glass/embarassed.png and new/kemoticons-4.98.0/themes/Glass/embarassed.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/themes/Glass/emoticons.xml new/kemoticons-4.98.0/themes/Glass/emoticons.xml --- old/kemoticons-4.97.0/themes/Glass/emoticons.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-4.98.0/themes/Glass/emoticons.xml 2014-03-29 08:16:54.000000000 +0100 @@ -0,0 +1,185 @@ +<?xml version="1.0"?> +<messaging-emoticon-map > + +<emoticon file="angry"> + <string>:-@</string> + <string>:@</string> + <string>>:-(</string> + <string>>:(</string> +</emoticon> + +<emoticon file="bat"> + <string>:-[</string> + <string>:[</string> +</emoticon> + +<emoticon file="beer"> + <string>(B)</string> + <string>(b)</string> +</emoticon> + +<emoticon file="cake"> + <string>(^)</string> +</emoticon> + +<emoticon file="camera"> + <string>(P)</string> + <string>(p)</string> +</emoticon> + +<emoticon file="cat"> + <string>(@)</string> +</emoticon> + +<emoticon file="clock"> + <string>(O)</string> + <string>(o)</string> +</emoticon> + +<emoticon file="cocktail"> + <string>(D)</string> + <string>(d)</string> +</emoticon> + +<emoticon file="confused"> + <string>:-S</string> + <string>:S</string> + <string>:-s</string> + <string>:s</string> +</emoticon> + +<emoticon file="cry"> + <string>:'(</string> + <string>:'-(</string> + <string>;-(</string> + <string>;(</string> +</emoticon> + +<emoticon file="cup"> + <string>(C)</string> + <string>(c)</string> +</emoticon> + +<emoticon file="dog"> + <string>(&)</string> +</emoticon> + +<emoticon file="embarassed"> + <string>:-$</string> + <string>:$</string> +</emoticon> + +<emoticon file="email"> + <string>(E)</string> + <string>(e)</string> +</emoticon> + +<emoticon file="film"> + <string>(~)</string> +</emoticon> + +<emoticon file="kiss"> + <string>(K)</string> + <string>(k)</string> + <string>:-X</string> + <string>:X</string> + <string>:-x</string> + <string>:x</string> +</emoticon> + +<emoticon file="lightbulb"> + <string>(I)</string> + <string>(i)</string> +</emoticon> + +<emoticon file="love"> + <string>(L)</string> + <string>(l)</string> +</emoticon> + +<emoticon file="note"> + <string>(8)</string> +</emoticon> + +<emoticon file="omg"> + <string>:-O</string> + <string>:O</string> + <string>:-o</string> + <string>:o</string> +</emoticon> + +<emoticon file="phone"> + <string>(T)</string> + <string>(t)</string> +</emoticon> + +<emoticon file="present"> + <string>(G)</string> + <string>(g)</string> +</emoticon> + +<emoticon file="rose"> + <string>(F)</string> + <string>(f)</string> +</emoticon> + +<emoticon file="sad"> + <string>:-(</string> + <string>:(</string> +</emoticon> + +<emoticon file="shade"> + <string>(H)</string> + <string>(h)</string> + <string>8-)</string> + <string>8)</string> +</emoticon> + +<emoticon file="smile"> + <string>:-)</string> + <string>:)</string> + <string>:o)</string> +</emoticon> + +<emoticon file="star"> + <string>(*)</string> +</emoticon> + +<emoticon file="teeth"> + <string>:-D</string> + <string>:D</string> +</emoticon> + +<emoticon file="thumbs_down"> + <string>(N)</string> + <string>(n)</string> +</emoticon> + +<emoticon file="thumbs_up"> + <string>(Y)</string> + <string>(y)</string> +</emoticon> + +<emoticon file="tongue"> + <string>:-P</string> + <string>:P</string> + <string>:-p</string> + <string>:p</string> +</emoticon> + +<emoticon file="unlove"> + <string>(U)</string> + <string>(u)</string> +</emoticon> + +<emoticon file="wilted_rose"> + <string>(W)</string> + <string>(w)</string> +</emoticon> + +<emoticon file="wink"> + <string>;-)</string> + <string>;)</string> +</emoticon> + +</messaging-emoticon-map> Files old/kemoticons-4.97.0/themes/Glass/film.png and new/kemoticons-4.98.0/themes/Glass/film.png differ Files old/kemoticons-4.97.0/themes/Glass/foot_in_mouth.png and new/kemoticons-4.98.0/themes/Glass/foot_in_mouth.png differ Files old/kemoticons-4.97.0/themes/Glass/innocent.png and new/kemoticons-4.98.0/themes/Glass/innocent.png differ Files old/kemoticons-4.97.0/themes/Glass/kiss.png and new/kemoticons-4.98.0/themes/Glass/kiss.png differ Files old/kemoticons-4.97.0/themes/Glass/lightbulb.png and new/kemoticons-4.98.0/themes/Glass/lightbulb.png differ Files old/kemoticons-4.97.0/themes/Glass/love.png and new/kemoticons-4.98.0/themes/Glass/love.png differ Files old/kemoticons-4.97.0/themes/Glass/note.png and new/kemoticons-4.98.0/themes/Glass/note.png differ Files old/kemoticons-4.97.0/themes/Glass/oh.png and new/kemoticons-4.98.0/themes/Glass/oh.png differ Files old/kemoticons-4.97.0/themes/Glass/omg.png and new/kemoticons-4.98.0/themes/Glass/omg.png differ Files old/kemoticons-4.97.0/themes/Glass/phone.png and new/kemoticons-4.98.0/themes/Glass/phone.png differ Files old/kemoticons-4.97.0/themes/Glass/present.png and new/kemoticons-4.98.0/themes/Glass/present.png differ Files old/kemoticons-4.97.0/themes/Glass/rose.png and new/kemoticons-4.98.0/themes/Glass/rose.png differ Files old/kemoticons-4.97.0/themes/Glass/sad.png and new/kemoticons-4.98.0/themes/Glass/sad.png differ Files old/kemoticons-4.97.0/themes/Glass/shade.png and new/kemoticons-4.98.0/themes/Glass/shade.png differ Files old/kemoticons-4.97.0/themes/Glass/sleep.png and new/kemoticons-4.98.0/themes/Glass/sleep.png differ Files old/kemoticons-4.97.0/themes/Glass/smile.png and new/kemoticons-4.98.0/themes/Glass/smile.png differ Files old/kemoticons-4.97.0/themes/Glass/star.png and new/kemoticons-4.98.0/themes/Glass/star.png differ Files old/kemoticons-4.97.0/themes/Glass/teeth.png and new/kemoticons-4.98.0/themes/Glass/teeth.png differ Files old/kemoticons-4.97.0/themes/Glass/thumbs_down.png and new/kemoticons-4.98.0/themes/Glass/thumbs_down.png differ Files old/kemoticons-4.97.0/themes/Glass/thumbs_up.png and new/kemoticons-4.98.0/themes/Glass/thumbs_up.png differ Files old/kemoticons-4.97.0/themes/Glass/tongue.png and new/kemoticons-4.98.0/themes/Glass/tongue.png differ Files old/kemoticons-4.97.0/themes/Glass/undecided.png and new/kemoticons-4.98.0/themes/Glass/undecided.png differ Files old/kemoticons-4.97.0/themes/Glass/unhappy.png and new/kemoticons-4.98.0/themes/Glass/unhappy.png differ Files old/kemoticons-4.97.0/themes/Glass/unlove.png and new/kemoticons-4.98.0/themes/Glass/unlove.png differ Files old/kemoticons-4.97.0/themes/Glass/wilted_rose.png and new/kemoticons-4.98.0/themes/Glass/wilted_rose.png differ Files old/kemoticons-4.97.0/themes/Glass/wink.png and new/kemoticons-4.98.0/themes/Glass/wink.png differ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
