Merge lp:~cimi/overlay-scrollbar/protect-846562 into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 344
Merge reported by: Andrea Cimitan
Merged at revision: not available
Proposed branch: lp:~cimi/overlay-scrollbar/protect-846562
Merge into: lp:overlay-scrollbar
Diff against target: 19 lines (+6/-3)
1 file modified
os/os-scrollbar.c (+6/-3)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/protect-846562
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+100390@code.launchpad.net

Description of the change

Protect against 846562

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

This is weird bug, I don't know if this is a correct fix for that, because the widget logically has to be realized.

In fact, on scrollbar unmap we hide the thumb. This function is called when the thumb receives a button press, so the scrollbar should not have received an unmap otherwise the click is not possible :-\ Opinions?

Revision history for this message
Ted Gould (ted) wrote :

The protection can't hurt... see if we still get the crash I guess.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2012-03-21 13:44:55 +0000
3+++ os/os-scrollbar.c 2012-04-02 11:43:18 +0000
4@@ -1561,9 +1561,12 @@
5 present_gdk_window_with_timestamp (GtkWidget *widget,
6 guint32 timestamp)
7 {
8- present_window_with_timestamp (GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
9- GDK_WINDOW_XID (gtk_widget_get_window (widget)),
10- timestamp);
11+ /* Check if the widget is realized, to protect against:
12+ * https://bugs.launchpad.net/ayatana-scrollbar/+bug/846562 */
13+ if (gtk_widget_get_realized (widget))
14+ present_window_with_timestamp (GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
15+ GDK_WINDOW_XID (gtk_widget_get_window (widget)),
16+ timestamp);
17 }
18
19 static gboolean

Subscribers

People subscribed via source and target branches