Compare commits

..

1 Commits

Author SHA1 Message Date
Mario Fetka 858a70fe82 Import release 2.0.6.1 2011-02-17 09:46:29 +00:00
16 changed files with 2066 additions and 2714 deletions
+16
View File
@@ -0,0 +1,16 @@
# Build files and dirs
build*
# KDevelop and other IDE-specific project files
*.kdev*
# Doxygen files
apidocs/
kmess.tag
# Mac stuff
.DS_Store
finkbuild
# ./configure script stuff
Makefile
+3
View File
@@ -0,0 +1,3 @@
[submodule "contrib/isf-qt"]
path = contrib/isf-qt
url = git://gitorious.org/kmess/libisf-qt.git
+2 -2
View File
@@ -150,7 +150,7 @@ INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${LIBXM
# Switch between the following two commands to force using a predefined version number
# EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-git-version.sh OUTPUT_VARIABLE KMESS_VERSION )
SET( KMESS_VERSION "2.0.6" )
SET( KMESS_VERSION "2.0.6.1" )
#### Define compiler flags ####
@@ -178,7 +178,7 @@ ENDIF( CMAKE_COMPILER_IS_GNUCXX )
# - relwithdebinfo (release with debug info)
# - minsizerel (minsize release)
# Uncomment the next line to always force building in full debug mode
SET( CMAKE_BUILD_TYPE debugfull )
SET( CMAKE_BUILD_TYPE relwithdebinfo )
# Enable the KMess debug output when compiling a debug build
IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
+6
View File
@@ -1,4 +1,10 @@
--- 2.0.6.1 released ---
2011-02-16 (Adam)
* Fix yet another login bug caused because our initial profile data no
longer includes a language preference.
--- 2.0.6 released ---
2011-01-13 (Adam)
+1 -1
View File
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = KMess
PROJECT_NUMBER = 2.0.6
PROJECT_NUMBER = 2.0.6.1
OUTPUT_DIRECTORY = ./apidocs
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
+10 -1
View File
@@ -1,9 +1,18 @@
Changes between KMess Git and 2.0.6:
Changes between KMess Git and 2.0.6.1:
--------------------------------------
- None yet.
Changes between KMess 2.0.6 and 2.0.6.1:
--------------------------------------
- Fix bug where KMess couldn't login due to missing language preference codes.
- Updated Catalan translation by Adrià Arrufat.
- Updated French translation by Scias.
- Updated Turkish translation by Uğur Çetin.
- Updated Dutch translation by Heimen Stoffels.
Changes between KMess 2.0.6 and 2.0.5:
--------------------------------------
+6
View File
@@ -0,0 +1,6 @@
# Build files and dirs
build*
# KDevelop and other IDE-specific project files
*.kdev*
+31 -40
View File
@@ -1,21 +1,21 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Adrià Arrufat <swiftscythe@gmail.com>, 2009, 2010.
# Adrià Arrufat <swiftscythe@gmail.com>, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: http://www.kmess.org/board/\n"
"POT-Creation-Date: 2010-08-04 19:23+0200\n"
"PO-Revision-Date: 2010-05-20 17:49+0200\n"
"Last-Translator: \n"
"PO-Revision-Date: 2011-02-08 00:53+0100\n"
"Last-Translator: Adrià Arrufat <swiftscythe@gmail.com>\n"
"Language-Team: American English <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.0\n"
"X-Generator: Lokalize 1.2\n"
"First-Translator: Adrià Arrufat <swiftscythe@gmail.com>\n"
#: account.cpp:45 account.cpp:755
@@ -115,13 +115,14 @@ msgid "%1 (This message was sent automatically)"
msgstr "%1 (Aquest missatge ha estat enviat automàticament)"
#: chat/chat.cpp:821
#, fuzzy, kde-format
#, kde-format
msgid ""
"<html>KMess could not save the log for the chat with &quot;%1&quot;:<br /"
">The chat logs directory, &quot;%2&quot;, does not exist.</html>"
msgstr ""
"<html>KMess no ha pogut desar el registre d'aquesta conversa:<br />La "
"carpeta dels registres , &quot;%1&quot;, no existeix.</html>"
"<html>KMess no ha pogut desar el registre d'aquesta conversa amb &quot;%"
"1&quot;:<br /> "
"El directori de registres, &quot;%2&quot;, no existeix.</html>"
#: chat/chat.cpp:956
msgctxt "Message shown in the chat window (when the wink name is unknown)"
@@ -463,7 +464,6 @@ msgstr ""
"registres de conversa."
#: chat/chatview.cpp:563
#, fuzzy
msgctxt "Chat log saving dialog, file type filter"
msgid ""
"*.html *.htm|Web Page (*.html)\n"
@@ -471,7 +471,6 @@ msgid ""
msgstr ""
"*.html *.htm|Pàgina web (*.html)\n"
"*.txt|Document de text pla (*.txt)\n"
"*.xml|Document XML(*.xml)"
#: chat/chatview.cpp:581
#, kde-format
@@ -2040,9 +2039,8 @@ msgid "[%1] %2 goes offline"
msgstr "[%1] %2 s'ha desconnectat"
#: kmessview.cpp:440
#, fuzzy
msgid "Search in contact list..."
msgstr "Busca entre els contactes..."
msgstr "Cerca entre els contactes..."
#: kmessview.cpp:704
msgid "Cha&t"
@@ -4107,44 +4105,39 @@ msgstr "<html><b>%1</b><br/>ha anat a menjar</html>"
#: notification/macnotification.cpp:61
msgid "Contact changed status"
msgstr ""
msgstr "El contacte ha canviat l'estat"
#: notification/macnotification.cpp:66
#, fuzzy
msgid "You received a new e-mail message"
msgstr "%1 correu electrònic nou"
msgstr "Heu rebut un nou correu electrònic"
#: notification/macnotification.cpp:72
msgid "A contact nudged you!"
msgstr ""
msgstr "Un contacte us envia un avís!"
#: notification/macnotification.cpp:78
msgid "A contact started a chat with you"
msgstr ""
msgstr "Un contacte ha iniciat una conversa"
#: notification/macnotification.cpp:84
#, fuzzy
msgid "A contact messaged you"
msgstr "Per a contactes d'un mateix grup"
msgstr "Un contacte us ha enviat un missatge"
#: notification/macnotification.cpp:90
#, fuzzy
msgid "A contact came online"
msgstr "Aquest contacte no està connectat"
msgstr "Un contacte s'ha connectat"
#: notification/macnotification.cpp:96
#, fuzzy
msgid "A contact went offline"
msgstr "Aquest contacte no està connectat"
msgstr "Un contacte s'ha desconnectat"
#: notification/macnotification.cpp:102
msgid "A contact changed status"
msgstr ""
msgstr "Un contacte ha canviat l'estat"
#: notification/macnotification.cpp:107
#, fuzzy
msgid "KMess notification"
msgstr "Icona de KMess"
msgstr "Notificació de KMess"
#: notification/newemailnotification.cpp:92
#, kde-format
@@ -4153,15 +4146,16 @@ msgid "<html><b>New email:</b><br/>'%1'<br/>by '%2'</html>"
msgstr "<html><b>Nou correu electrònic:</b><br/>'%1'<br/>de '%2'</html>"
#: notification/newsystemtraywidget.cpp:94
#, fuzzy
msgid ""
"<p>Closing the main window will keep KMess running in the system tray.</"
"p><p>You can open KMess again by clicking on the bird icon, which is now "
"flashing.<br/>Use 'Quit' from the 'Connect' menu to quit the application.</p>"
msgstr ""
"Tancar la finestra principal de KMess farà que segueixi funcionant a la "
"safata del sistema. Feu servir 'Abandona' del menú 'Connecta' per sortir de "
"l'aplicació."
"<p>Tancar la finestra principal de KMess farà que segueixi funcionant a la "
"safata del sistema.</p><p>Podeu obrir KMess un altre cop clicant sobre la "
"icona de l'ocell, que ara fa pampallugues.</br>Feu servir 'Abandona' del menú "
"'Connecta' per sortir de "
"l'aplicació.<p>"
#: notification/newsystemtraywidget.cpp:108
#: notification/systemtraywidget.cpp:96 notification/systemtraywidget.cpp:195
@@ -4170,32 +4164,30 @@ msgid "Docking in System Tray"
msgstr "Anclant-se a la safata del sistema"
#: notification/newsystemtraywidget.cpp:205
#, fuzzy, kde-format
#, kde-format
msgctxt ""
"Tray icon text tooltip when connected, %1 is the friendly name, %2 is the "
"status"
msgid "Connected as %1 (%2)"
msgstr "Connectant-se a %1, port %2"
msgstr "Connectat a %1 (%2)"
#: notification/newsystemtraywidget.cpp:209
#, fuzzy, kde-format
#, kde-format
msgctxt ""
"Tray icon HTML tooltip when connected, %1 is the friendly name, %2 is the "
"status"
msgid "<p>Connected as:<br/><b>%1</b> (%2)</p>"
msgstr "<br><b>%1</b> (%2)%3"
msgstr "<p>Connectat com a: <br/><b>%1</b> (%2)</p>"
#: notification/newsystemtraywidget.cpp:216
#, fuzzy
msgctxt "Tray icon text tooltip when not connected"
msgid "Not connected"
msgstr "Connectat"
msgstr "No connectat"
#: notification/newsystemtraywidget.cpp:219
#, fuzzy
msgctxt "Tray icon HTML tooltip when not connected"
msgid "<p>Not connected</p>"
msgstr "<p>S'ha perdut la connexió.</p>"
msgstr "<p>No connectat</p>"
#: notification/notificationmanager.cpp:120
msgctxt "Button text for KDE notification boxes"
@@ -4876,9 +4868,8 @@ msgstr "Filtre del registre de converses"
#. i18n: file: dialogs/chathistorydialog.ui:83
#. i18n: ectx: property (text), widget (QLabel, label_)
#: rc.cpp:113
#, fuzzy
msgid "Chat date:"
msgstr "Estil de conversa"
msgstr "Data de la conversa:"
#. i18n: file: dialogs/contactaddeduserdialog.ui:52
#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -6145,7 +6136,7 @@ msgid ""
"Contacts may send multiple nudges at once, but KMess only shakes the chat "
"window with the first nudge.</p></qt>"
msgstr ""
"<qt>Quan els vostres contactes vulguin cridar la vostra atenció, upo poden "
"<qt>Quan els vostres contactes vulguin cridar la vostra atenció, us poden "
"enviar un avís. Per defecte, la finestra de conversa es mou quan es rep un "
"avís. Desactiveu aquesta opció si l'efecte de moviment és massa intrusiu.</"
"p>\n"
+1537 -2273
View File
File diff suppressed because it is too large Load Diff
+417 -355
View File
File diff suppressed because it is too large Load Diff
+27 -37
View File
@@ -1,18 +1,18 @@
# translation of tr.po to Turkish
# Uğur Çetin <jnmbk@users.sourceforge.net>, 2006, 2007, 2009, 2010.
# Uğur Çetin <jnmbk@users.sourceforge.net>, 2006, 2007, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: http://www.kmess.org/board/\n"
"POT-Creation-Date: 2010-08-04 19:23+0200\n"
"PO-Revision-Date: 2010-03-01 06:55+0200\n"
"PO-Revision-Date: 2011-01-30 10:39+0200\n"
"Last-Translator: Uğur Çetin <jnmbk@users.sourceforge.net>\n"
"Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: account.cpp:45 account.cpp:755
@@ -4114,12 +4114,12 @@ msgid "Connected as %1 (%2)"
msgstr "Bağlanıyor %1, port %2"
#: notification/newsystemtraywidget.cpp:209
#, fuzzy, kde-format
#, kde-format
msgctxt ""
"Tray icon HTML tooltip when connected, %1 is the friendly name, %2 is the "
"status"
msgid "<p>Connected as:<br/><b>%1</b> (%2)</p>"
msgstr "<br><b>%1</b> (%2)"
msgstr "<p>Bağlı hesap:<br/><b>%1</b> (%2)</p>"
#: notification/newsystemtraywidget.cpp:216
#, fuzzy
@@ -4328,9 +4328,8 @@ msgid "Accounts"
msgstr "Hesaplar"
#: settings/globalsettingsdialog.cpp:65 settings/globalsettingsdialog.cpp:67
#, fuzzy
msgid "Notifications"
msgstr "E-posta bildirimi"
msgstr "Bildirimler"
#: settings/miscellaneouspage.cpp:74
msgid "No selectable web browsers detected."
@@ -5560,9 +5559,8 @@ msgstr ""
#. i18n: file: settings/chatloggingpage.ui:39
#. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_)
#: rc.cpp:528
#, fuzzy
msgid "Additionally save chat logs to file"
msgstr "Sohbeti &Dosyaya Kaydet"
msgstr "Sohbetleri başka dosyaya da kaydet"
#. i18n: file: settings/chatloggingpage.ui:51
#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
@@ -5573,9 +5571,8 @@ msgstr ""
#. i18n: file: settings/chatloggingpage.ui:54
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: rc.cpp:534
#, fuzzy
msgid "Save chat logs as:"
msgstr "Sohbeti &Dosyaya Kaydet"
msgstr "Sohbetleri bu türde kaydet:"
#. i18n: file: settings/chatloggingpage.ui:86
#. i18n: ectx: property (whatsThis), widget (QComboBox, fileFormatComboBox_)
@@ -5624,9 +5621,8 @@ msgstr ""
#. i18n: file: settings/chatloggingpage.ui:140
#. i18n: ectx: property (text), widget (QLabel, label)
#: rc.cpp:556
#, fuzzy
msgid "Separate logged chats by:"
msgstr "Sohbeti Kaydet"
msgstr "Kayıtlı sohbetleri buna göre grupla:"
#. i18n: file: settings/chatloggingpage.ui:156
#. i18n: ectx: property (toolTip), widget (QRadioButton, yearRadioButton_)
@@ -5731,7 +5727,7 @@ msgstr ""
#. i18n: ectx: property (text), widget (QRadioButton, singleDirectoryRadioButton_)
#: rc.cpp:603
msgid "Do not organize files"
msgstr ""
msgstr "Dosyaları gruplama"
#. i18n: file: settings/chatloggingpage.ui:273
#. i18n: ectx: property (toolTip), widget (QToolButton, chatSavePathButton_)
@@ -5756,7 +5752,6 @@ msgstr "Sohbet kayıtlarının duracağı dizini seçin."
#. i18n: file: settings/chatloggingpage.ui:308
#. i18n: ectx: property (text), widget (QLabel, chatSavePathLabel_)
#: rc.cpp:618
#, fuzzy
msgid "Save chat logs in the following directory:"
msgstr "Sohbetleri bu dizine kaydet:"
@@ -5901,9 +5896,8 @@ msgstr ""
#. i18n: file: settings/chatstylepage.ui:461
#. i18n: ectx: property (text), widget (QCheckBox, useContactFontCheckBox_)
#: rc.cpp:690
#, fuzzy
msgid "&Force messages from your contacts to use this font:"
msgstr "Kişinin iletilerinde bu yazı tipinin kullanmasını zorla:"
msgstr "Gelen iletilerde bu yazı tipinin kullanmasını &zorla:"
#. i18n: file: settings/chatstylepage.ui:536
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
@@ -5926,10 +5920,10 @@ msgstr ""
#. i18n: file: settings/chatstylepage.ui:545
#. i18n: ectx: property (text), widget (QCheckBox, useFontEffectsCheckBox_)
#: rc.cpp:699
#, fuzzy
msgid "Use font &effects in messages, like *bold*, /italic/, and _underline_"
msgstr ""
"Mesajlarda &yazıtipi efektleri kullan, ör: *koyu*, /italik/, ve _altı çizili_"
"İletilerde, *koyu*, /italik/, ve _altı çizili_ gibi &yazıtipi efektleri "
"kullan"
#. i18n: file: settings/chatstylepage.ui:555
#. i18n: ectx: property (whatsThis), widget (QCheckBox, enableChatFormattingCheckBox_)
@@ -6088,7 +6082,7 @@ msgstr "\"Messenger &Plus!\" biçimlendirmesini etkinleştir"
#. i18n: ectx: property (text), widget (QCheckBox, showContactEmailCheckBox_)
#: rc.cpp:778
msgid "Show the &email address of contacts instead of their friendly name"
msgstr ""
msgstr "Kişilerimin görünen adlarının yerine &e-posta adreslerini göster"
#. i18n: file: settings/emoticonspage.ui:24
#. i18n: ectx: attribute (title), widget (QWidget, tab)
@@ -6099,9 +6093,8 @@ msgstr "İfade &Temaları"
#. i18n: file: settings/emoticonspage.ui:36
#. i18n: ectx: property (text), widget (QLabel, textLabel1)
#: rc.cpp:784
#, fuzzy
msgid "Available emoticon themes:"
msgstr "Mümkün olan İfade stilleri:"
msgstr "Mümkün olan ifade temaları:"
#. i18n: file: settings/emoticonspage.ui:73
#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
@@ -6149,9 +6142,8 @@ msgstr "&Sil"
#. i18n: file: settings/emoticonspage.ui:173
#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
#: rc.cpp:817
#, fuzzy
msgid "Available custom emoticons:"
msgstr "Mümkün olan İfade stilleri:"
msgstr "Mümkün olan özel ifadeler:"
#. i18n: file: settings/miscellaneouspage.ui:27
#. i18n: ectx: attribute (title), widget (QWidget, tab)
@@ -6169,7 +6161,7 @@ msgstr ""
#. i18n: ectx: property (text), widget (QRadioButton, useKDEBrowserRadio_)
#: rc.cpp:826
msgid "&Use the KDE default browser"
msgstr ""
msgstr "Ö&ntanımlı KDE tarayıcısını kullan"
#. i18n: file: settings/miscellaneouspage.ui:43
#. i18n: ectx: property (toolTip), widget (QRadioButton, useListedBrowserRadio_)
@@ -6183,7 +6175,7 @@ msgstr ""
#. i18n: ectx: property (text), widget (QRadioButton, useListedBrowserRadio_)
#: rc.cpp:832
msgid "&Use an installed browser:"
msgstr ""
msgstr "&Kurulu bir tarayıcıyı kullan:"
#. i18n: file: settings/miscellaneouspage.ui:80
#. i18n: ectx: property (toolTip), widget (QRadioButton, useCustomBrowserRadio_)
@@ -6198,9 +6190,8 @@ msgstr ""
#. i18n: file: settings/miscellaneouspage.ui:217
#. i18n: ectx: property (text), widget (QRadioButton, useCustomMailClientRadio_)
#: rc.cpp:838 rc.cpp:873
#, fuzzy
msgid "&Specify a custom command:"
msgstr "Uzakta durumu için ileti belirle"
msgstr "Ö&zel bir komut belirle:"
#. i18n: file: settings/miscellaneouspage.ui:113
#. i18n: ectx: property (whatsThis), widget (QLineEdit, customBrowserEdit_)
@@ -6218,7 +6209,7 @@ msgstr ""
#: rc.cpp:846
#, no-c-format
msgid "Use '%u' to insert the URL in the command line."
msgstr ""
msgstr "Komut satırına URL'yi eklemek için '%u' kullanın."
#. i18n: file: settings/miscellaneouspage.ui:151
#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
@@ -6238,7 +6229,7 @@ msgstr ""
#. i18n: ectx: property (text), widget (QCheckBox, useLiveMailCheckbox_)
#: rc.cpp:855
msgid "Use &Live Mail if the account supports it"
msgstr ""
msgstr "Hesap destekliyorsa &Live Mail Kullan"
#. i18n: file: settings/miscellaneouspage.ui:167
#. i18n: ectx: property (toolTip), widget (QRadioButton, useKDEMailClientRadio_)
@@ -6250,33 +6241,32 @@ msgstr ""
#. i18n: ectx: property (text), widget (QRadioButton, useKDEMailClientRadio_)
#: rc.cpp:861
msgid "Use the &KDE default email client"
msgstr ""
msgstr "Öntanımlı &KDE e-posta istemcisini kullan"
#. i18n: file: settings/miscellaneouspage.ui:180
#. i18n: ectx: property (text), widget (QRadioButton, useListedMailClientRadio_)
#: rc.cpp:867
msgid "Use an &installed email client:"
msgstr ""
msgstr "K&urulu bir e-posta istemcisini kullan:"
#. i18n: file: settings/miscellaneouspage.ui:260
#. i18n: ectx: property (text), widget (QLabel, customMailClientInfo_)
#: rc.cpp:881
#, no-c-format
msgid "Use '%u' to insert the email address in the command line."
msgstr ""
msgstr "Komut satırına e-posta adresini eklemek için '%u' kullanın."
#. i18n: file: settings/miscellaneouspage.ui:294
#. i18n: ectx: property (text), widget (QCheckBox, useReceivedFilesDir_)
#: rc.cpp:887
#, fuzzy
msgid "&Save all received files in one directory:"
msgstr "Sohbetleri bu dizine kaydet:"
msgstr "Alınan tüm dosyaları bir dizinde &kaydet:"
#. i18n: file: settings/miscellaneouspage.ui:343
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: rc.cpp:893
msgid "&Use ports between"
msgstr ""
msgstr "Dosya aktarımları için"
#. i18n: file: settings/miscellaneouspage.ui:369
#. i18n: ectx: property (text), widget (QLabel, label_3)
@@ -6288,7 +6278,7 @@ msgstr "ve"
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: rc.cpp:899
msgid "for file transfers"
msgstr "dosya aktarımları için"
msgstr "aralığındaki portları kullan"
#. i18n: file: utils/inlineeditlabel.ui:14
#. i18n: ectx: property (windowTitle), widget (QWidget, InlineEditLabel)
+2
View File
@@ -419,6 +419,8 @@ ChatHistoryWriter* ChatHistoryManager::getWriter( const QString& handle )
/**
* Add a new chat to the logs, or update an ongoing one.
*
* @param handle
* Handle of the main contact in conversation
* @param chatLogData
* The details of the chat log to be updated
*/
+1 -1
View File
@@ -377,7 +377,7 @@ void ChatHistoryDialog::showLogs( const QDate& day )
* Set the contact for whom the logs will be initially shown
*
* @param handle the account to search logs in
* @param handle the handle to get contact history for
* @param account the handle to get contact history for
* @returns whether there was history for the given contact
*/
bool ChatHistoryDialog::setInitialContact( const QString &account, const QString &handle )
+1
View File
@@ -32,6 +32,7 @@
*
* @param contactHandle Reference to the handle of the contact that has added you
* @param contactFriendlyName The friendly name of the contact
* @param parent Parent window of this one
*/
ContactAddedUserDialog::ContactAddedUserDialog( const QString& contactHandle, const QString& contactFriendlyName, QWidget* parent )
: KDialog(parent)
+3 -1
View File
@@ -1033,7 +1033,9 @@ void MsnNotificationConnection::goOnline()
hash.insert( QString::number(ack), "COMPOSE" );
// Ask the personal profile URL
ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) );
// default to US English if no preference
quint32 langcode = CurrentAccount::instance()->getLanguageCode().toInt();
ack = sendCommand("URL", "PROFILE 0x" + QString::number( ( langcode == 0 ? 1033 : langcode ), 8 ) );
hash.insert( QString::number(ack), "PROFILE" );
}
+3 -3
View File
@@ -58,7 +58,7 @@
* and thus natural sorting keeps them in the right temporal order.
*
* @param name1 First filename
* @param name1 Second filename
* @param name2 Second filename
* @return bool whether the first is lesser than the second
*/
bool KMessShared::compareFileNames( const QString& name1, const QString& name2 )
@@ -142,7 +142,7 @@ QString KMessShared::createRequestFile( const QString &mailto, const QString &fo
// this will have our (urlencoded) dodgy email address we used to satisfy URL COMPOSE
// at the initial login. replace it where we actually want it to go.
QString command( folder );
command = command.replace( "some.invalid%40kmess.email", mailto );
// Use the method into passport to compute the token
@@ -739,7 +739,7 @@ bool KMessShared::selectNextFile( const QString &directory, const QString &baseN
*
* etc.
*
* @param baseDir The full path to the base directory.
* @param baseDirPath The full path to the base directory.
* @param baseFileName The base file name, minus the extension or numbering.
* @param extension The extension of the file.
* @param lastFile [out] Set to the full path of the last existing file in the sequence, or an empty string if none exists.