Hello community, here is the log from the commit of package konversation checked in at Sat Apr 26 11:34:51 CEST 2008. -------- --- KDE/konversation/konversation.changes 2008-04-10 19:14:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/konversation/konversation.changes 2008-04-26 00:13:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 26 00:13:16 CEST 2008 - dmueller@suse.de + +- fix OSD not appearing when run under KDE 4.x + +------------------------------------------------------------------- New: ---- fix-osd-for-kde4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.N19803/_old 2008-04-26 11:34:43.000000000 +0200 +++ /var/tmp/diff_new_pack.N19803/_new 2008-04-26 11:34:43.000000000 +0200 @@ -19,7 +19,7 @@ Group: Productivity/Networking/IRC AutoReqProv: on Version: 1.0.1 -Release: 181 +Release: 185 Summary: A User-Friendly IRC Client for KDE 3 Source: konversation-%version.tar.bz2 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -32,6 +32,7 @@ Patch3: SVN_r604746.diff Patch4: konversation_networkstatus_branch.diff Patch5: protocolhandler-show-channel.diff +Patch6: fix-osd-for-kde4.diff %description Konversation is a user-friendly IRC client for KDE 3.x. @@ -63,6 +64,7 @@ %patch4 %endif %patch5 +%patch6 . /etc/opt/kde3/common_options update_admin @@ -103,6 +105,8 @@ /opt/kde3/share/services/* %changelog +* Sat Apr 26 2008 dmueller@suse.de +- fix OSD not appearing when run under KDE 4.x * Thu Apr 10 2008 stbinner@suse.de - remove Requires:kdepim3 to fix urgent problem part (bnc#377523) * Thu Aug 02 2007 stbinner@suse.de ++++++ fix-osd-for-kde4.diff ++++++ --- konversation/src/osd.cpp +++ konversation/src/osd.cpp @@ -241,7 +241,7 @@ void OSDWidget::mousePressEvent( QMouseE void OSDWidget::show() { // Don't show the OSD widget when the desktop is locked - if ( isKDesktopLockRunning() ) + if ( isKDesktopLockRunning() == Locked ) { minReached(); // don't queue the message return; @@ -409,11 +409,10 @@ OSDWidget::KDesktopLockStatus OSDWidget: DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); - // Can't tell, very weird, err on the side of safety. + // Can't tell, very weird if (!dcopptr || !dcopptr->isAttached()) { - kdWarning() << k_funcinfo << ": Could not make DCOP connection. " - << "Assuming screensaver is active." << endl; + kdWarning() << k_funcinfo << ": Could not make DCOP connection." << endl; return DCOPError; } @@ -423,9 +422,8 @@ OSDWidget::KDesktopLockStatus OSDWidget: if (!dcopptr->call("kdesktop","KScreensaverIface","isBlanked()", data,returnType,returnValue,true)) { - kdWarning() << k_funcinfo << ": Check for screensaver failed." - << "Assuming screensaver is active." << endl; - // Err on the side of safety again. + // KDesktop is not running. Maybe we are in a KDE4 desktop... + kdDebug() << k_funcinfo << ": Check for screensaver failed." << endl; return DCOPError; } @@ -441,7 +439,7 @@ OSDWidget::KDesktopLockStatus OSDWidget: kdWarning() << k_funcinfo << ": Strange return value from screensaver. " << "Assuming screensaver is active." << endl; // Err on the side of safety. - return DCOPError; + return Locked; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de