Attachment 912477 Details for Bug 1052203 – /scp-dbus-service-do-not-hang-when-searching-openprinting-for-drivers.patch

[patch] /scp-dbus-service-do-not-hang-when-searching-openprinting-for-drivers.patch

scp-dbus-service-do-not-hang-when-searching-openprinting-for-drivers.patch (text/plain), 3.95 KB, created by Till Kamppeter on 2014-06-26 16:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Till Kamppeter

Created: 2014-06-26 16:00:21 UTC

Size: 3.95 KB

patch

obsolete

>--- /usr/share/system-config-printer/newprinter.py~	2014-05-05 22:13:43.000000000 +0200
>+++ /usr/share/system-config-printer/newprinter.py	2014-06-26 17:41:37.960964228 +0200
>@@ -1332,30 +1332,36 @@
>                                 # on the result
>                                 if self.drivers_lock.locked ():
>                                     # Still searching for drivers.
>-                                    self._searchdialog_canceled = False
>-                                    fmt = _("Searching")
>-                                    self._searchdialog = Gtk.MessageDialog (parent=self.NewPrinterWindow,
>-                                                                            flags=Gtk.DialogFlags.MODAL |
>-                                                                            Gtk.DialogFlags.DESTROY_WITH_PARENT,
>-                                                                            type=Gtk.MessageType.INFO,
>-                                                                            buttons=Gtk.ButtonsType.CANCEL,
>-                                                                            message_format=fmt)
>+                                    if self.dialog_mode != "download_driver":
>+                                        self._searchdialog_canceled = False
>+                                        fmt = _("Searching")
>+                                        self._searchdialog = Gtk.MessageDialog (parent=self.NewPrinterWindow,
>+                                                                                flags=Gtk.DialogFlags.MODAL |
>+                                                                                Gtk.DialogFlags.DESTROY_WITH_PARENT,
>+                                                                                type=Gtk.MessageType.INFO,
>+                                                                                buttons=Gtk.ButtonsType.CANCEL,
>+                                                                                message_format=fmt)
> 
>-                                    self._searchdialog.format_secondary_text (_("Searching for drivers"))
>+                                        self._searchdialog.format_secondary_text (_("Searching for drivers"))
> 
>-                                    self._searchdialog.connect ("response", self._searchdialog_response)
>-                                    self._searchdialog.show_all ()
>+                                        self._searchdialog.connect ("response", self._searchdialog_response)
>+                                        self._searchdialog.show_all ()
> 
>                                     # Keep the UI refreshed while we wait for
>                                     # the drivers query to complete.
>                                     while self.drivers_lock.locked ():
>-                                        while Gtk.events_pending ():
>-                                            Gtk.main_iteration ()
>+                                        if (self.dialog_mode !=
>+                                            "download_driver"):
>+                                            while Gtk.events_pending ():
>+                                                Gtk.main_iteration ()
>                                         time.sleep (0.1)
> 
>-                                    self._searchdialog.hide ()
>-                                    self._searchdialog.destroy ()
>-                                    self._searchdialog = None
>+                                    if self.dialog_mode != "download_driver":
>+                                        self._searchdialog.hide ()
>+                                        self._searchdialog.destroy ()
>+                                        self._searchdialog = None
>+                                        while Gtk.events_pending ():
>+                                            Gtk.main_iteration ()
> 
>                                 if self._searchdialog_canceled:
>                                     # Cancel clicked

Actions: View | Diff

Attachments on bug 1052203: 849370 | 849371 | 850570 | 912477