On Mon, Sep 19, 2016 at 10:58:10AM -0400, Stephen Smalley wrote:
> On 09/18/2016 11:46 AM, Laurent Bigonville wrote:
> > From: Laurent Bigonville <bi...@bigon.be>
> > 
> > sandbox command is also now using GTK 3.0
> > 
> > This patch comes from Fedora patch set
> 
> Need a Signed-off-by.  If you can extract the actual original patch with
> its author and signed-off-by, that's preferable.

I'm the author of the original patches. However I consider the new patch
better and we'll adopt it in Fedora as soon as it's pushed upstream.

I'm completely fine with Laurent resend this patch again with his
Signed-Off-By


Petr

> 
> > ---
> >  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")
> > 
> 

-- 
Petr Lautrbach
_______________________________________________
Selinux mailing list
Selinux@tycho.nsa.gov
To unsubscribe, send email to selinux-le...@tycho.nsa.gov.
To get help, send an email containing "help" to selinux-requ...@tycho.nsa.gov.

Reply via email to