equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtDBus module of the Qt Toolkit. |
7 ** This file is part of the QtDBus module of the Qt Toolkit. |
8 ** |
8 ** |
559 if (qstrcmp(signal + 1, "destroyed(QObject*)") == 0) |
559 if (qstrcmp(signal + 1, "destroyed(QObject*)") == 0) |
560 return; |
560 return; |
561 |
561 |
562 QDBusConnectionPrivate *conn = d->connectionPrivate(); |
562 QDBusConnectionPrivate *conn = d->connectionPrivate(); |
563 if (conn) { |
563 if (conn) { |
564 // do we know what our owner is? |
564 conn->connectRelay(d->service, d->path, d->interface, |
565 QString owner; |
|
566 if (!d->service.isEmpty() && d->currentOwner.isNull()) |
|
567 owner = QLatin1String(""); |
|
568 else |
|
569 owner = d->currentOwner; |
|
570 conn->connectRelay(d->service, owner, d->path, d->interface, |
|
571 this, signal); |
565 this, signal); |
572 } |
566 } |
573 } |
567 } |
574 |
568 |
575 /*! |
569 /*! |
583 if (!d->isValid) |
577 if (!d->isValid) |
584 return; |
578 return; |
585 |
579 |
586 QDBusConnectionPrivate *conn = d->connectionPrivate(); |
580 QDBusConnectionPrivate *conn = d->connectionPrivate(); |
587 if (conn) |
581 if (conn) |
588 conn->disconnectRelay(d->service, d->currentOwner, d->path, d->interface, |
582 conn->disconnectRelay(d->service, d->path, d->interface, |
589 this, signal); |
583 this, signal); |
590 } |
584 } |
591 |
585 |
592 /*! |
586 /*! |
593 \internal |
587 \internal |