diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-09-06 11:09:30 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-09-07 09:14:27 (GMT) |
| commit | 1e02e81ca73dd7ae285add65b8e732bec0fbe92d (patch) | |
| tree | 85f2ba3e68ed714fb48036c178dfbd664c4eb30f /src | |
| parent | 9f2af9d8accd8832d1d962c375b6ec1fcbe3a965 (diff) | |
Use foreign_new_for_display API in GdkX11
gdk-window-foreign-new has been deprecated [1], so we have to use
gdk-x11-window-foreign-new-for-display [2].
[1] http://developer.gnome.org/gdk/stable/gdk-X-Window-System-Interaction.html#gdk-window-foreign-new
[2] http://developer.gnome.org/gdk/stable/gdk-X-Window-System-Interaction.html#gdk-x11-window-foreign-new-for-display
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/journal/journalactivity.py | 5 | ||||
| -rw-r--r-- | src/jarabe/model/shell.py | 5 | ||||
| -rw-r--r-- | src/jarabe/view/viewsource.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index 7cd0c41..b287c54 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -21,6 +21,7 @@ import uuid from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkX11 import dbus import statvfs import os @@ -91,7 +92,9 @@ class JournalActivityDBusService(dbus.service.Object): def ChooseObject(self, parent_xid, what_filter=''): chooser_id = uuid.uuid4().hex if parent_xid > 0: - parent = Gdk.window_foreign_new(parent_xid) + display = Gdk.Display.get_default() + parent = GdkX11.X11Window.foreign_new_for_display( \ + display, parent_xid) else: parent = None chooser = ObjectChooser(parent, what_filter) diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 8143699..437ff90 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -23,6 +23,7 @@ from gi.repository import Wnck from gi.repository import GObject from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkX11 import dbus from sugar3 import dispatch @@ -539,7 +540,9 @@ class ShellModel(GObject.GObject): if activity_id: home_activity = self.get_activity_by_id(activity_id) - gdk_window = Gdk.window_foreign_new(xid) + display = Gdk.Display.get_default() + gdk_window = GdkX11.X11Window.foreign_new_for_display(display, + xid) gdk_window.set_decorations(0) window.maximize() diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py index 651fdc0..bdc47fb 100644 --- a/src/jarabe/view/viewsource.py +++ b/src/jarabe/view/viewsource.py @@ -26,6 +26,7 @@ from gi.repository import GObject from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkX11 from gi.repository import GtkSource import dbus from gi.repository import GConf @@ -201,7 +202,9 @@ class ViewSource(Gtk.Window): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.window.set_accept_focus(True) - parent = Gdk.window_foreign_new(self._parent_window_xid) + display = Gdk.Display.get_default() + parent = GdkX11.X11Window.foreign_new_for_display( \ + display, self._parent_window_xid) self.set_transient_for(parent) def __stop_clicked_cb(self, widget): |