Skip to content

Commit

Permalink
#438 remove call_synced altogether as we always call the cursor code …
Browse files Browse the repository at this point in the history
…from the UI thread

git-svn-id: https://xpra.org/svn/Xpra/trunk@4899 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Dec 9, 2013
1 parent 27705e6 commit dd488a4
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/xpra/client/gtk2/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
gtk.threads_init()


try:
from xpra.x11.gtk_x11.error import trap
call_synced = trap.call_synced
except ImportError:
#this is not available on osx and win32
def call_synced(fun, *args, **kwargs):
return fun(*args, **kwargs)

from xpra.platform.ui_thread_watcher import get_UI_watcher
get_UI_watcher(gobject.timeout_add).start()

Expand Down Expand Up @@ -313,7 +305,7 @@ def make_cursor(self, cursor_data):
gdk_cursor = cursor_names.get(cursor_name.upper())
if gdk_cursor is not None:
log("setting new cursor by name: %s=%s", cursor_name, gdk_cursor)
return call_synced(gdk.Cursor, gdk_cursor)
return gdk.Cursor(gdk_cursor)
else:
log.warn("cursor name '%s' not found", cursor_name)
#create cursor from the pixel data:
Expand Down

0 comments on commit dd488a4

Please sign in to comment.