← Back to branch summary

~ubuntu-branches/ubuntu/vivid/system-config-printer/vivid

« back to all changes in this revision

Viewing changes to asyncipp.py

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2014-07-06 09:41:43 UTC
  • mfrom: (1.1.81)
  • Revision ID: package-import@ubuntu.com-20140706094143-yvp3kzo7ti1ghih8
Tags: 1.4.5+20140706-0ubuntu1
* New upstream release
   o GIT 1.4.x snapshot from 6 July 2014
   o Some codec fixes
   o Traceback fixes
   o IPv6 address entry fix
   o Auth info saving improvement
   o Some loop/hang bug fixes
   o Use LockButton for fewer auth dialogs
* 30_newprinter-driver-download-override-false-error-alarm.patch,
  33_dont-use-hp-makeuri-with-non-hp-printers.patch:
  Removed, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
asyncipp.py
459
459
 
460
460
        # If we've previously prompted, explain why we're prompting again.
461
461
        if self._dialog_shown:
462
 
            d = Gtk.MessageDialog (self._conn.parent,
463
 
                                   Gtk.DialogFlags.MODAL |
464
 
                                   Gtk.DialogFlags.DESTROY_WITH_PARENT,
465
 
                                   Gtk.MessageType.ERROR,
466
 
                                   Gtk.ButtonsType.CLOSE,
467
 
                                   _("Not authorized"))
 
462
            d = Gtk.MessageDialog (parent=self._conn.parent,
 
463
                                   flags=Gtk.DialogFlags.MODAL |
 
464
                                         Gtk.DialogFlags.DESTROY_WITH_PARENT,
 
465
                                   message_type=Gtk.MessageType.ERROR,
 
466
                                   buttons=Gtk.ButtonsType.CLOSE,
 
467
                                   message_format=_("Not authorized"))
468
468
            d.format_secondary_text (_("The password may be incorrect."))
469
469
            d.run ()
470
470
            d.destroy ()
555
555
        else:
556
556
            msg = _("CUPS server error (%s)") % op
557
557
 
558
 
        d = Gtk.MessageDialog (self._conn.parent,
559
 
                               Gtk.DialogFlags.MODAL |
560
 
                               Gtk.DialogFlags.DESTROY_WITH_PARENT,
561
 
                               Gtk.MessageType.ERROR,
562
 
                               Gtk.ButtonsType.NONE,
563
 
                               msg)
 
558
        d = Gtk.MessageDialog (parent=self._conn.parent,
 
559
                               flags=Gtk.DialogFlags.MODAL |
 
560
                                     Gtk.DialogFlags.DESTROY_WITH_PARENT,
 
561
                               message_type=Gtk.MessageType.ERROR,
 
562
                               buttons=Gtk.ButtonsType.NONE,
 
563
                               message_format=msg)
564
564
 
565
565
        if self._client_fn == None and type (exc) == RuntimeError:
566
566
            # This was a connection failure.
657
657
if __name__ == "__main__":
658
658
    # Demo
659
659
    set_debugging (True)
660
 
    GObject.threads_init ()
661
660
    class UI:
662
661
        def __init__ (self):
663
662
            w = Gtk.Window ()
664
663
            w.connect ("destroy", self.destroy)
665
 
            b = Gtk.Button ("Connect")
 
664
            b = Gtk.Button.new_with_label ("Connect")
666
665
            b.connect ("clicked", self.connect_clicked)
667
666
            vbox = Gtk.VBox ()
668
667
            vbox.pack_start (b, False, False, 0)
669
668
            w.add (vbox)
670
 
            self.get_devices_button = Gtk.Button ("Get Devices")
 
669
            self.get_devices_button = Gtk.Button.new_with_label ("Get Devices")
671
670
            self.get_devices_button.connect ("clicked", self.get_devices)
672
671
            self.get_devices_button.set_sensitive (False)
673
672
            vbox.pack_start (self.get_devices_button, False, False, 0)