From eab4f1879e20dbbb16bbcbc9d5ade57ae07bca01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 20 Jul 2013 11:59:43 +0200 Subject: RPM Packaging: fix kdbusnotification --- .../kdbusnotification-14.0.0-fix_utf8.patch | 15 +++++++++++++++ redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch delete mode 100644 redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch new file mode 100644 index 000000000..4ed8c1c52 --- /dev/null +++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch @@ -0,0 +1,15 @@ +--- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200 ++++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200 +@@ -231,9 +231,10 @@ + } + + // Send a notification request to KDE here... +- TQString messageText = TQString(body); ++ TQString messageCaption = TQString::fromLocal8Bit(summary); ++ TQString messageText = TQString::fromLocal8Bit(body); + +- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y); ++ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y); + + return_id = 0; + diff --git a/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch b/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch deleted file mode 100644 index 46941f46f..000000000 --- a/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trinity-tdelibs-14.0.0~pre599+bae79307/tdeui/kpassivepopup.cpp.ORI 2013-07-19 22:31:16.453073343 +0200 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/tdeui/kpassivepopup.cpp 2013-07-19 22:31:55.288484612 +0200 -@@ -120,7 +120,9 @@ - const TQPixmap &icon ) - { - // kdDebug() << "KPassivePopup::setView " << caption << ", " << text << endl; -- setView( standardView( caption, text, icon, this ) ); -+ const TQString captionISO = TQString::fromLocal8Bit(caption.latin1()); -+ const TQString textISO = TQString::fromLocal8Bit(text.latin1()); -+ setView( standardView( captionISO, textISO, icon, this ) ); - } - - TQVBox * KPassivePopup::standardView( const TQString& caption, -- cgit v1.2.3