[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konversation/1.4] /: Fix auto-replace for text from Large Paste Warning
From:       Juan Carlos Torres <carlosdgtorres () gmail ! com>
Date:       2013-04-15 5:22:15
Message-ID: 20130415052215.BA51BA605E () git ! kde ! org
[Download RAW message or body]

Git commit 049f91328f366a8a115cc083d238436d285345ff by Juan Carlos Torres.
Committed on 15/04/2013 at 06:16.
Pushed by jucato into branch '1.4'.

Fix auto-replace for text from Large Paste Warning

This patch applies auto-replace on text that is sent
from the Large Paste Warning dialog, whether the user
chooses to invoke the paste editor or not.

BUG:223891

M  +2    -0    ChangeLog
M  +2    -0    src/viewer/ircinput.cpp

http://commits.kde.org/konversation/049f91328f366a8a115cc083d238436d285345ff

diff --git a/ChangeLog b/ChangeLog
index 9f69f9c..9d048ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@ Changes since 1.4:
   handled incorrectly. Tilde expansion now occurs as well.
 * Clicking a channel link starting with more than one # character would join a
   channel starting with one # too few; this has been fixed.
+* Fixed auto-replace not being applied to messages that are sent from the
+  Large Paste Warning dialog.
 
 
 Changes from 1.4-beta1 to 1.4:
diff --git a/src/viewer/ircinput.cpp b/src/viewer/ircinput.cpp
index c399e4e..9e58dbd 100644
--- a/src/viewer/ircinput.cpp
+++ b/src/viewer/ircinput.cpp
@@ -459,6 +459,8 @@ void IRCInput::insertFromMimeData(const QMimeData * source)
             // ask the user on long pastes
             if(checkPaste(pasteText))
             {
+              pasteText = Application::instance()->doAutoreplace(pasteText, true);
+
               Konversation::sterilizeUnicode(pasteText);
               // signal pasted text
               emit textPasted(pasteText);
[prev in list] [next in list] [prev in thread] [next in thread]