From 2f8a8f8f4476ea4f44261a1fa03f63b4655219be Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 13 Jul 2007 22:52:32 +0000 Subject: [PATCH] fix integration with the shell svn path=/trunk/KDE/kdegraphics/okular/; revision=687581 --- part.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/part.cpp b/part.cpp index 7f596137b..462338092 100644 --- a/part.cpp +++ b/part.cpp @@ -129,7 +129,7 @@ m_searchStarted(false), m_cliPresentation(false) connect( m_document->bookmarkManager(), SIGNAL( openUrl(const KUrl &) ), this, SLOT( openUrlFromBookmarks(const KUrl &) ) ); connect( m_document, SIGNAL( close() ), this, SLOT( close() ) ); - if ( parent && parent->metaObject()->indexOfSlot( SLOT( slotQuit() ) ) != -1 ) + if ( parent && parent->metaObject()->indexOfSlot( QMetaObject::normalizedSignature( "slotQuit()" ) ) != -1 ) connect( m_document, SIGNAL( quit() ), parent, SLOT( slotQuit() ) ); else connect( m_document, SIGNAL( quit() ), this, SLOT( cannotQuit() ) ); @@ -841,7 +841,8 @@ bool Part::closeUrl() void Part::close() { - if (parent() && (parent()->objectName() == QLatin1String("okular::Shell"))) + // NOTE: don't know why, but the correct object name should be "okular::Shell" + if (parent() && (parent()->objectName() == QLatin1String("okular/okular__Shell"))) { closeUrl(); }