* [PATCH v2] sandbox: Use GObject introspection binding instead of pygtk2
@ 2016-09-19 18:01 Laurent Bigonville
2016-09-21 16:35 ` Stephen Smalley
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Bigonville @ 2016-09-19 18:01 UTC (permalink / raw)
To: selinux
From: Petr Lautrbach <plautrba@redhat.com>
sandbox command is also now using GTK 3.0
This patch comes from Fedora patch set
Signed-off-by: Laurent Bigonville <bigon@bigon.be>
---
policycoreutils/sandbox/sandbox | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox
index 9f200d5..726ba9b 100644
--- a/policycoreutils/sandbox/sandbox
+++ b/policycoreutils/sandbox/sandbox
@@ -111,16 +111,18 @@ def copyfile(file, srcdir, dest):
def savefile(new, orig, X_ind):
copy = False
if(X_ind):
- import gtk
- dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
- gtk.BUTTONS_YES_NO,
+ import gi
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ dlg = Gtk.MessageDialog(None, 0, Gtk.MessageType.INFO,
+ Gtk.ButtonsType.YES_NO,
_("Do you want to save changes to '%s' (Y/N): ") % orig)
dlg.set_title(_("Sandbox Message"))
- dlg.set_position(gtk.WIN_POS_MOUSE)
+ dlg.set_position(Gtk.WindowPosition.MOUSE)
dlg.show_all()
rc = dlg.run()
dlg.destroy()
- if rc == gtk.RESPONSE_YES:
+ if rc == Gtk.ResponseType.YES:
copy = True
else:
try:
@@ -452,8 +454,10 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
if self.__options.dpi:
dpi = self.__options.dpi
else:
- import gtk
- dpi = str(gtk.settings_get_default().props.gtk_xft_dpi / 1024)
+ import gi
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ dpi = str(Gtk.Settings.get_default().props.gtk_xft_dpi / 1024)
xmodmapfile = self.__homedir + "/.xmodmap"
xd = open(xmodmapfile, "w")
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] sandbox: Use GObject introspection binding instead of pygtk2
2016-09-19 18:01 [PATCH v2] sandbox: Use GObject introspection binding instead of pygtk2 Laurent Bigonville
@ 2016-09-21 16:35 ` Stephen Smalley
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Smalley @ 2016-09-21 16:35 UTC (permalink / raw)
To: Laurent Bigonville, selinux
On 09/19/2016 02:01 PM, Laurent Bigonville wrote:
> From: Petr Lautrbach <plautrba@redhat.com>
>
> sandbox command is also now using GTK 3.0
>
> This patch comes from Fedora patch set
>
> Signed-off-by: Laurent Bigonville <bigon@bigon.be>
Thanks, applied.
> ---
> policycoreutils/sandbox/sandbox | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox
> index 9f200d5..726ba9b 100644
> --- a/policycoreutils/sandbox/sandbox
> +++ b/policycoreutils/sandbox/sandbox
> @@ -111,16 +111,18 @@ def copyfile(file, srcdir, dest):
> def savefile(new, orig, X_ind):
> copy = False
> if(X_ind):
> - import gtk
> - dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
> - gtk.BUTTONS_YES_NO,
> + import gi
> + gi.require_version('Gtk', '3.0')
> + from gi.repository import Gtk
> + dlg = Gtk.MessageDialog(None, 0, Gtk.MessageType.INFO,
> + Gtk.ButtonsType.YES_NO,
> _("Do you want to save changes to '%s' (Y/N): ") % orig)
> dlg.set_title(_("Sandbox Message"))
> - dlg.set_position(gtk.WIN_POS_MOUSE)
> + dlg.set_position(Gtk.WindowPosition.MOUSE)
> dlg.show_all()
> rc = dlg.run()
> dlg.destroy()
> - if rc == gtk.RESPONSE_YES:
> + if rc == Gtk.ResponseType.YES:
> copy = True
> else:
> try:
> @@ -452,8 +454,10 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
> if self.__options.dpi:
> dpi = self.__options.dpi
> else:
> - import gtk
> - dpi = str(gtk.settings_get_default().props.gtk_xft_dpi / 1024)
> + import gi
> + gi.require_version('Gtk', '3.0')
> + from gi.repository import Gtk
> + dpi = str(Gtk.Settings.get_default().props.gtk_xft_dpi / 1024)
>
> xmodmapfile = self.__homedir + "/.xmodmap"
> xd = open(xmodmapfile, "w")
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-21 16:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-19 18:01 [PATCH v2] sandbox: Use GObject introspection binding instead of pygtk2 Laurent Bigonville
2016-09-21 16:35 ` Stephen Smalley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.