Merge lp://staging/~larsu/telepathy-indicator/fix-warnings into lp://staging/telepathy-indicator

Proposed by Lars Karlitski
Status: Merged
Approved by: Charles Kerr
Approved revision: 75
Merged at revision: 75
Proposed branch: lp://staging/~larsu/telepathy-indicator/fix-warnings
Merge into: lp://staging/telepathy-indicator
Diff against target: 391 lines (+115/-83)
1 file modified
src/indicator-approver.c (+115/-83)
To merge this branch: bzr merge lp://staging/~larsu/telepathy-indicator/fix-warnings
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email:

Commit message

Listen to telepathy events even when empathy is not running

Description of the change

Listen to telepathy events even when empathy is not running

Clearing the approver and observer objects doesn't seem to disconnect all callbacks from telepathy. This patch keeps both alive and does nothing when empathy is not running.

This gets rid of a lot of warnings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks fine and seems to work. Approve.

On style points, I wish this had been a NullObject rather than a NULL pointer test -- there are so many more logic branches in the code now. This is going to hurt the coverage stats. Oh wait... ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches

to all changes: