-
Committer:
Martin Pitt
-
Date:
2010-11-25 12:36:44 UTC
-
mfrom:
(105.1.544 trunk)
-
Revision ID:
martin.pitt@canonical.com-20101125123644-f3l9wrk5iy61ffy3
* Merge changes from trunk:
- Put back "Additional Drivers" progress window title. Thanks Bilal
Akhtar! (LP: #323815)
- jockey/detection.py, get_hardware(): Disable printer detection.
cupshelpers.getDevices() is excruciatingly slow (about 15 seconds), and
jockey is not normally used directly to install printer drivers.
Instead, system-config-printer picks up new printers, and calls jockey
with the device ID, so jockey does not need to detect printers by
itself.
- jockey-kde: Use runtime .ui loading instead of pykdeuic4; the latter
just keeps breaking.
- gtk/jockey-gtk.ui: Drop obsolete has_separator property; Explicitly set
topmost GtkVBox fill property to True, as the default changed in GTK 3.0
(GNOME #634592)
- Various test suite fixes.
* debian/control: Drop now obsolete python-{qt4,kde}* build dependencies.
* debian/jockey-kde.install: Install the KDE *.ui files.