Merge lp:~joe-yasi/libdbusmenu-qt/fix-x-timestamp into lp:libdbusmenu-qt

Proposed by Joseph Yasi
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 249
Merged at revision: 248
Proposed branch: lp:~joe-yasi/libdbusmenu-qt/fix-x-timestamp
Merge into: lp:libdbusmenu-qt
Diff against target: 12 lines (+1/-2)
1 file modified
src/dbusmenuimporter.cpp (+1/-2)
To merge this branch: bzr merge lp:~joe-yasi/libdbusmenu-qt/fix-x-timestamp
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Charles Kerr Pending
Review via email: mp+174573@code.launchpad.net

Description of the change

This fixes bug #1035755, [firefox] Extension causes context/drop down menus to disappear. The patch uses the correct X11 event timestamp instead of the system time.

To post a comment you must log in.
Revision history for this message
Joseph Yasi (joe-yasi) wrote :

Will someone review this?

Revision history for this message
Joseph Yasi (joe-yasi) wrote :

Is anyone maintaining this?

Revision history for this message
Joseph Yasi (joe-yasi) wrote :

Anyone? This bug makes firefox unusable in KDE on Ubuntu.

Revision history for this message
Albert Astals Cid (aacid) wrote :
Revision history for this message
Joseph Yasi (joe-yasi) wrote :

This change has support for QT5. The other one only includes the fixes for QT4.

Revision history for this message
Joseph Yasi (joe-yasi) wrote :

> So we have this and https://code.launchpad.net/~gnumdk/libdbusmenu-qt/fix-
> dropdown-firefox/+merge/152920
>
> Which is better?

This change has support for QT5. The other one only includes the fixes for QT4, otherwise they are the same. The other branch is based on the original patch I posted to the bug report. This has been sitting for months. I'd like a review soon.

Revision history for this message
Albert Astals Cid (aacid) wrote :

I was wondering if instead of all that "complicated" code, you could just pass "0" since it seems that "0" is

./X.h:139:#define CurrentTime 0L /* special Time */

Which may be good enough?

Revision history for this message
Joseph Yasi (joe-yasi) wrote :

Yeah. That's good enough. I just changed it to that push pushed it to this branch.

248. By Joseph Yasi

Fix X11 timestamp. Current time is 0.

249. By Joseph Yasi

Merge fixed commit

Revision history for this message
Joseph Yasi (joe-yasi) wrote :

> I was wondering if instead of all that "complicated" code, you could just pass
> "0" since it seems that "0" is
>
> ./X.h:139:#define CurrentTime 0L /* special Time */
>
> Which may be good enough?

Yep. That cleaned it up quite a bit. That change is now in bzr and ready for merge.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good :-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dbusmenuimporter.cpp'
2--- src/dbusmenuimporter.cpp 2012-03-29 12:45:27 +0000
3+++ src/dbusmenuimporter.cpp 2013-08-25 18:44:25 +0000
4@@ -276,8 +276,7 @@
5 void sendEvent(int id, const QString &eventId)
6 {
7 QVariant empty = QVariant::fromValue(QDBusVariant(QString()));
8- uint timestamp = QDateTime::currentDateTime().toTime_t();
9- m_interface->asyncCall("Event", id, eventId, empty, timestamp);
10+ m_interface->asyncCall("Event", id, eventId, empty, 0u);
11 }
12 };
13

Subscribers

People subscribed via source and target branches

to all changes: