From a513a89bebab63ea439e7f6090cf474c67a7a3b0 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 26 Apr 2012 11:26:51 +0200 Subject: [PATCH] RHEL/Fedora: updates kaffeine 3.5.13 --- ...8e4c4940afb4529b16e2c3e3d0f379ac7b161.diff | 84 ++++++ ...0e3db3a01b75376fa6b83e5b01efe104ccaec.diff | 31 +++ ...d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff | 240 ++++++++++++++++++ redhat/applications/kaffeine/508cb342-logo | Bin 0 -> 20734 bytes redhat/applications/kaffeine/kaffeine.1 | 1 + 5 files changed, 356 insertions(+) create mode 100644 redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff create mode 100644 redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff create mode 100644 redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff create mode 100644 redhat/applications/kaffeine/508cb342-logo create mode 120000 redhat/applications/kaffeine/kaffeine.1 diff --git a/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff b/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff new file mode 100644 index 000000000..111f11b9c --- /dev/null +++ b/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff @@ -0,0 +1,84 @@ +commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161 +Author: Darrell Anderson +Date: 1331343133 -0600 + + Fix nominal "tqt" typos and fix slow DVB start. + This closes bug reports 729 and 899. + +diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp +index 96752aa..32c8817 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp +@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame ) + case FOURBYTHREE: factor = 4.0 / 3.0; break; + case ANAMORPHIC: factor = 16.0 / 9.0; break; + case DVB: factor = 2.11; break; +- case STQUARE: factor = 1.0; break; ++ case SQUARE: factor = 1.0; break; + } + + float frameAspect = (float)frame.width() / (float)frame.height(); +@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB() + + void VideoWindow::slotAspectRatioSquare() + { +- m_aspectRatio = STQUARE; ++ m_aspectRatio = SQUARE; + TQSize frame = getFrameSize(); + correctByAspectRatio( frame ); + emit signalNewFrameSize( frame ); +diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h +index c4d9f74..f7c5180 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/video.h ++++ b/kaffeine/src/player-parts/gstreamer-part/video.h +@@ -47,7 +47,7 @@ public: + FOURBYTHREE, + ANAMORPHIC, + DVB, +- STQUARE ++ SQUARE + }; + + void newState(); +diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h +index edc2fa9..6987de3 100644 +--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h ++++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h +@@ -18,8 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#ifndef DEINTERLACETQUALITY_H +-#define DEINTERLACETQUALITY_H ++#ifndef DEINTERLACEQUALITY_H ++#define DEINTERLACEQUALITY_H + + #include + +@@ -77,4 +77,4 @@ private: + KPushButton* m_customConfigButton; + }; + +-#endif /* DEINTERLACETQUALITY_H */ ++#endif /* DEINTERLACEQUALITY_H */ +diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h +index 7d43ec0..2e81096 100644 +--- a/kaffeine/src/player-parts/xine-part/equalizer.h ++++ b/kaffeine/src/player-parts/xine-part/equalizer.h +@@ -18,8 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#ifndef ETQUALIZER_H +-#define ETQUALIZER_H ++#ifndef EQUALIZER_H ++#define EQUALIZER_H + + #include + #include +@@ -77,4 +77,4 @@ private: + TQSlider* eq16kSlider; + }; + +-#endif /* ETQUALIZER_H */ ++#endif /* EQUALIZER_H */ diff --git a/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff b/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff new file mode 100644 index 000000000..07d58235a --- /dev/null +++ b/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff @@ -0,0 +1,31 @@ +commit b480e3db3a01b75376fa6b83e5b01efe104ccaec +Author: Darrell Anderson +Date: 1331957353 -0500 + + Change location where Kaffeine stores temporary pipe files from $HOME to + the more appropriate $TDEHOME/tmp-$HOSTNAME. + +diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp +index 365b7ac..969b62b 100644 +--- a/kaffeine/src/input/dvb/dvbpanel.cpp ++++ b/kaffeine/src/input/dvb/dvbpanel.cpp +@@ -1065,7 +1065,8 @@ void DvbPanel::setConfig() + connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) ); + connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) ); + } +- fifoName = TQDir::homeDirPath()+"/.kaxtv.ts"; ++// fifoName = TQDir::homeDirPath()+"/.kaxtv.ts"; ++ fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts"; + TQFile f( fifoName ); + if ( f.exists() ) + f.remove(); +@@ -1073,7 +1074,8 @@ void DvbPanel::setConfig() + perror( fifoName.latin1() ); + fifoName = ""; + } +- fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts"; ++// fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts"; ++ fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts"; + TQFile f1( fifoName1 ); + if ( f1.exists() ) + f1.remove(); diff --git a/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff b/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff new file mode 100644 index 000000000..fd5d6aea0 --- /dev/null +++ b/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff @@ -0,0 +1,240 @@ +commit 0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b +Author: Darrell Anderson +Date: 1333649519 -0500 + + Fix typos, branding, and inadvertent tqt changes. + +diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp +index 969b62b..bbc4e32 100644 +--- a/kaffeine/src/input/dvb/dvbpanel.cpp ++++ b/kaffeine/src/input/dvb/dvbpanel.cpp +@@ -1065,8 +1065,7 @@ void DvbPanel::setConfig() + connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) ); + connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) ); + } +-// fifoName = TQDir::homeDirPath()+"/.kaxtv.ts"; +- fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts"; ++ fifoName = KGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts"; + TQFile f( fifoName ); + if ( f.exists() ) + f.remove(); +@@ -1074,8 +1073,7 @@ void DvbPanel::setConfig() + perror( fifoName.latin1() ); + fifoName = ""; + } +-// fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts"; +- fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts"; ++ fifoName1 = KGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts"; + TQFile f1( fifoName1 ); + if ( f1.exists() ) + f1.remove(); +diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h +index 2b1d2e7..57b9254 100644 +--- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h ++++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h +@@ -42,7 +42,7 @@ extern "C" { + * @param session_number Session number concerned. + * @param auth_protocol_id Auth protocol id. + * @param auth_data Data for the request. +- * @param auth_data_lenghth Number of bytes. ++ * @param auth_data_length Number of bytes. + * @return 0 on success, -1 on failure. + */ + typedef int (*en50221_app_auth_request_callback) (void *arg, +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index 8d85e01..e8148a7 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -347,7 +347,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString& + tab->installEventFilter(this); + tab->showActiveTabText(m_showActiveTabTexts); + +- if (m_style==KMultiTabBar::KONTQSBC) ++ if (m_style==KMultiTabBar::KONQSBC) + { + if (m_expandedTabSizeneededSize()) { + m_expandedTabSize=tab->neededSize(); +@@ -570,7 +570,7 @@ void KMultiTabBarTab::setState(bool b) + void KMultiTabBarTab::updateState() + { + +- if (m_style!=KMultiTabBar::KONTQSBC) { ++ if (m_style!=KMultiTabBar::KONQSBC) { + if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { + TQPushButton::setText(m_text); + } else { +@@ -626,7 +626,7 @@ void KMultiTabBarTab::drawButtonLabel(TQPainter *p) { + } + void KMultiTabBarTab::drawButton(TQPainter *paint) + { +- if (m_style!=KMultiTabBar::KONTQSBC) drawButtonStyled(paint); ++ if (m_style!=KMultiTabBar::KONQSBC) drawButtonStyled(paint); + else drawButtonClassic(paint); + } + +@@ -858,7 +858,7 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam + setPosition((bm==KMultiTabBar::Vertical)?KMultiTabBar::Right:KMultiTabBar::Bottom); + setStyle(VSNET); + // setStyle(KDEV3); +- //setStyle(KONTQSBC); ++ //setStyle(KONQSBC); + m_l->insertWidget(0,m_internal); + m_l->insertWidget(0,m_btnTabSep=new TQFrame(this)); + m_btnTabSep->setFixedHeight(4); +diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h +index 72fa884..2932cc2 100644 +--- kaffeine/kaffeine/src/kmultitabbar.h.orig 2011-08-17 23:23:42.000000000 +0200 ++++ kaffeine/kaffeine/src/kmultitabbar.h 2012-04-25 23:51:09.339505891 +0200 +@@ -55,16 +55,16 @@ + Q_OBJECT + TQ_OBJECT + public: +- enum KMultiTabBarMode{Horizontal,Vertical}; ++ enum KMultiTabBarMode{Horizontal, Vertical}; + enum KMultiTabBarPosition{Left, Right, Top, Bottom}; + + /** + * VSNET == Visual Studio .Net like (only show the text of active tabs + * KDEV3 == Kdevelop 3 like (always show the text) +- * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled ++ * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled + * at the moment, but will be renabled soon too + */ +- enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff}; ++ enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff}; + + KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0); + virtual ~KMultiTabBar(); +diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +index ccb56f3..b7e88c7 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +@@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin + label = new TQLabel(i18n("Prefered audio driver"), frame); + tqlayout->addWidget(label, 1, 0); + tqlayout->addWidget(m_audioDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + + //Video Page + frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, +@@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin + label = new TQLabel(i18n("Prefered video driver")+ "*", frame); + tqlayout->addWidget(label, 1, 0); + tqlayout->addWidget(m_videoDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + tqlayout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); + + //Media page +@@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin + label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); + tqlayout->addWidget(label, 1, 0); + tqlayout->addWidget(m_driveEdit, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + } + + GStreamerConfig::~GStreamerConfig() +diff --git a/kaffeine/src/player-parts/xine-part/positionslider.cpp b/kaffeine/src/player-parts/xine-part/positionslider.cpp +index 16b3978..9d64e26 100644 +--- a/kaffeine/src/player-parts/xine-part/positionslider.cpp ++++ b/kaffeine/src/player-parts/xine-part/positionslider.cpp +@@ -97,8 +97,8 @@ bool PositionSlider::eventFilter(TQObject *obj, TQEvent *ev) + return false; + + int range = maxValue() - minValue(); +- int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y(); +- int maxpos = (orientation() ==Qt::Horizontal) ? width() : height(); ++ int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y(); ++ int maxpos = (orientation() == Horizontal) ? width() : height(); + int value = pos * range / maxpos + minValue(); + + if (TQApplication::reverseLayout()) +diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp +index 8a691b8..4ed3eb6 100644 +--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp ++++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp +@@ -153,7 +153,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* + m_xinePostParameter++; + } + } +- KSeparator* sep = new KSeparator(Qt::Horizontal, m_groupBox); ++ KSeparator* sep = new KSeparator(KSeparator::Horizontal, m_groupBox); + grid->addMultiCellWidget(sep, row, row, 0, 1); + row++; + KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox); +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp +index 98ff969..9fc18e6 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp ++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp +@@ -1373,10 +1373,10 @@ void XinePart::initActions() + KStdAction::zoomIn(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); + KStdAction::zoomOut(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); + KStdAction::fitToPage(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off"); +- new KAction(i18n("Zoom InQt::Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x"); +- new KAction(i18n("Zoom OutQt::Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x"); +- new KAction(i18n("Zoom InQt::Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y"); +- new KAction(i18n("Zoom OutQt::Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y"); ++ new KAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x"); ++ new KAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x"); ++ new KAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y"); ++ new KAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y"); + new KAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality"); + new KAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture"); + new KAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer"); +@@ -1423,7 +1423,7 @@ void XinePart::initActions() + connect(m_xine, TQT_SIGNAL(signalSyncVolume()), TQT_TQOBJECT(this), TQT_SLOT(slotSyncVolume())); + new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume"); + +- m_position = new PositionSlider(Qt::Horizontal); ++ m_position = new PositionSlider(Horizontal); + TQToolTip::add + (m_position, i18n("Position")); + m_position->setRange(0, 65535); +@@ -2061,7 +2061,7 @@ void XinePart::zoomOff() + /********** volume slider ****************/ + + +-VolumeSlider::VolumeSlider() : TQSlider(Qt::Horizontal, 0) ++VolumeSlider::VolumeSlider() : TQSlider(Horizontal, 0) + { + installEventFilter(this); + } +@@ -2092,8 +2092,8 @@ void VolumeSlider::wheelEvent(TQWheelEvent* e) + return FALSE; + + int range = maxValue() - minValue(); +- int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y(); +- int maxpos = (orientation() ==Qt::Horizontal) ? width() : height(); ++ int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y(); ++ int maxpos = (orientation() == Horizontal) ? width() : height(); + int value = pos * range / maxpos + minValue(); + + if (TQApplication::reverseLayout()) +diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +index 6d6a2d4..1281911 100644 +--- kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp.orig 2011-08-17 23:23:40.000000000 +0200 ++++ kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp 2012-04-25 23:53:25.094399051 +0200 +@@ -135,7 +135,7 @@ + description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + grid->addWidget(description, row, 1); + +- KSeparator* separator = new KSeparator(Qt::Horizontal, parent); ++ KSeparator* separator = new KSeparator(KSeparator::Horizontal, parent); + grid->addMultiCellWidget(separator, row+1, row+1, 0, 1); + } + +diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp +index 745360f..e781ba0 100644 +--- a/kaffeine/src/systemtray.cpp ++++ b/kaffeine/src/systemtray.cpp +@@ -100,7 +100,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e) + default: + KSystemTray::mousePressEvent(e); + break; +- case Qt::MidButton: ++ case MidButton: + if(!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + return; + actionCollection()->action("trayplay")->activate(); diff --git a/redhat/applications/kaffeine/508cb342-logo b/redhat/applications/kaffeine/508cb342-logo new file mode 100644 index 0000000000000000000000000000000000000000..7b76dfe92cce390d6712b09d68ebc5dad8facca8 GIT binary patch literal 20734 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 G)c*sgM?cU2 literal 0 HcmV?d00001 diff --git a/redhat/applications/kaffeine/kaffeine.1 b/redhat/applications/kaffeine/kaffeine.1 new file mode 120000 index 000000000..cd8a25b2f --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine.1 @@ -0,0 +1 @@ +../../../ubuntu/maverick/applications/kaffeine/debian/kaffeine.1 \ No newline at end of file