From f9e6d2019524412388c8707539ec4e5907c983e9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2014 13:21:37 +0000 Subject: [PATCH] don't bother processing configure events for the corral window: this hook is there for catch client window resize only git-svn-id: https://xpra.org/svn/Xpra/trunk@5804 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/x11/gtk_x11/window.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xpra/x11/gtk_x11/window.py b/src/xpra/x11/gtk_x11/window.py index f723889468..45274b1729 100644 --- a/src/xpra/x11/gtk_x11/window.py +++ b/src/xpra/x11/gtk_x11/window.py @@ -1066,6 +1066,9 @@ def _do_update_client_geometry(self, window_size_cb, window_position_cb, force_n def do_xpra_configure_event(self, event): log("WindowModel.do_xpra_configure_event(%s)", event) + if event.window!=self.client_window: + #we only care about events on the client window + return def can_resize(): if not self._managed: return False @@ -1187,8 +1190,7 @@ def _handle_net_wm_icon(self): if surf is not None: # FIXME: There is no Pixmap.new_for_display(), so this isn't # actually display-clean. Oh well. - pixmap = gtk.gdk.Pixmap(None, - surf.get_width(), surf.get_height(), 32) + pixmap = gtk.gdk.Pixmap(None, surf.get_width(), surf.get_height(), 32) screen = get_display_for(pixmap).get_default_screen() pixmap.set_colormap(screen.get_rgba_colormap()) cr = pixmap.cairo_create() @@ -1202,7 +1204,7 @@ def _handle_net_wm_icon(self): pixmap = None self._internal_set_property("icon", surf) self._internal_set_property("icon-pixmap", pixmap) - log("icon is now %r", self.get_property("icon")) + log("icon is now %r", surf) _property_handlers["_NET_WM_ICON"] = _handle_net_wm_icon def _read_initial_properties(self):