| 1 |
matsuu 10/02/16 15:39:28 |
| 2 |
|
| 3 |
Added: scim-fix-disappeared-status-icon.patch |
| 4 |
Log: |
| 5 |
Fixed gnome-panel issue, bug #283317. |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-i18n/scim/files/scim-fix-disappeared-status-icon.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: scim-fix-disappeared-status-icon.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/extras/panel/scim_panel_gtk.cpp b/extras/panel/scim_panel_gtk.cpp |
| 17 |
index 613613f..b53ef75 100644 |
| 18 |
--- a/extras/panel/scim_panel_gtk.cpp |
| 19 |
+++ b/extras/panel/scim_panel_gtk.cpp |
| 20 |
@@ -1072,11 +1072,13 @@ ui_initialize (void) |
| 21 |
#ifdef GDK_WINDOWING_X11 |
| 22 |
// Add an event filter function to observe X root window's properties. |
| 23 |
GdkWindow *root_window = gdk_get_default_root_window (); |
| 24 |
+ GdkEventMask event_mask; |
| 25 |
#if GDK_MULTIHEAD_SAFE |
| 26 |
if (_current_screen) |
| 27 |
root_window = gdk_screen_get_root_window (_current_screen); |
| 28 |
#endif |
| 29 |
- gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY); |
| 30 |
+ event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY); |
| 31 |
+ gdk_window_set_events (root_window, event_mask); |
| 32 |
gdk_window_add_filter (root_window, ui_event_filter, NULL); |
| 33 |
#endif |
| 34 |
|
| 35 |
@@ -1323,9 +1325,11 @@ ui_switch_screen (GdkScreen *screen) |
| 36 |
|
| 37 |
#ifdef GDK_WINDOWING_X11 |
| 38 |
GdkWindow *root_window = gdk_get_default_root_window (); |
| 39 |
+ GdkEventMask event_mask; |
| 40 |
if (_current_screen) |
| 41 |
root_window = gdk_screen_get_root_window (_current_screen); |
| 42 |
- gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY); |
| 43 |
+ event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY); |
| 44 |
+ gdk_window_set_events (root_window, event_mask); |
| 45 |
gdk_window_add_filter (root_window, ui_event_filter, NULL); |
| 46 |
#endif |
Archives