Merge lp:~mvo/gdebi/add-linitan into lp:gdebi

[Michael Vogt]

This branch adds a "lintian" tab to the main notebook that show the
lintian status of the deb in question

=== modified file 'GDebi/GDebi.py'
--- GDebi/GDebi.py	2012-10-05 10:32:37 +0000
+++ GDebi/GDebi.py	2012-10-08 06:56:32 +0000
@@ -52,7 +52,7 @@
 from gettext import gettext as _
 
 # the timeout when the termial is expanded if no activity from dpkg
-# is happening 
+# is happening
 GDEBI_TERMINAL_TIMEOUT=4*60.0
 
 # HACK - there are two ubuntu specific patches, one for VTE, one
@@ -67,7 +67,7 @@
 class GDebi(SimpleGtkbuilderApp, GDebiCommon):
 
     def __init__(self, datadir, options, file=""):
-        GDebiCommon.__init__(self,datadir,options,file)
+        GDebiCommon.__init__(self,datadir, options, file)
         localesApp="gdebi"
         localesDir="/usr/share/locale"
 
@@ -79,13 +79,13 @@
           logo=icons.load_icon("gnome-mime-application-x-deb", 48, 0)
           if logo != "":
             Gtk.Window.set_default_icon_list([logo])
-        except Exception, e:
+        except Exception as e:
           print "Error loading logo"
           pass
 
         # create terminal
         self.vte_terminal = Vte.Terminal()
-        # FIXME: this sucks but without it the terminal window is only 
+        # FIXME: this sucks but without it the terminal window is only
         #        1 line height
         self.vte_terminal.set_size_request(80*10, 25*10)
         menu = Gtk.Menu()
@@ -124,7 +124,7 @@
             self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
             sys.exit(1)
         self.statusbar_main.push(self.context, "")
-        
+
         # setup the details treeview
         self.details_list = Gtk.ListStore(GObject.TYPE_STRING)
         column = Gtk.TreeViewColumn("")
@@ -145,6 +145,7 @@
         self.synaptic_config = apt_pkg.Configuration()
 
         if file != "" and os.path.exists(file):
+<<<<<<< TREE
             self.open(file)
         self.window_main.set_sensitive(True)
 
@@ -158,6 +159,15 @@
                 Gtk.main_iteration()        
         else:
             win.set_cursor(None)
+=======
+            self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
+            while Gtk.events_pending():
+                Gtk.main_iteration()
+            self.open(file)
+            self.window_main.get_window().set_cursor(None)
+
+        self.window_main.set_sensitive(True)
+>>>>>>> MERGE-SOURCE
 
     def gio_progress_callback(self, bytes_read, bytes_total, data):
         self.progressbar_download.set_fraction(bytes_read/float(bytes_total))
@@ -173,7 +183,7 @@
         if (gio_file.get_uri_scheme() == "file"):
             return file
         if (os.getuid()==0):
-            self.show_alert(Gtk.MessageType.ERROR, 
+            self.show_alert(Gtk.MessageType.ERROR,
                             _("Can not download as root"),
                             _("Remote packages can not be downloaded when "
                               "running as root. Please try again as a "
@@ -194,7 +204,7 @@
                 file = gio_dest.get_path()
             self.dialog_gio_download.hide()
         except Exception, e:
-            self.show_alert(Gtk.MessageType.ERROR, 
+            self.show_alert(Gtk.MessageType.ERROR,
                             _("Download failed"),
                             _("Downloading the package failed: "
                               "file '%s' '%s'") % (file, e))
@@ -213,7 +223,7 @@
         elif path.startswith('file:'): # xffm
             path = path[5:] # 5 is len('file:')
         return path
-    
+
     def on_menuitem_quit_activate(self, widget):
         try:
             Gtk.main_quit()
@@ -230,20 +240,31 @@
             path = self._get_file_path_from_dnd_dropped_uri(uri)
             #print 'path to open', path
             if path.endswith(".deb"):
+<<<<<<< TREE
+=======
+                self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+>>>>>>> MERGE-SOURCE
                 self.open(path)
 
+<<<<<<< TREE
     def open(self, file, downloaded=False):
         self._show_busy_cursor(True)
         res = GDebiCommon.open(self, file, downloaded)
         self._show_busy_cursor(False)
+=======
+    def open(self, filename, downloaded=False):
+        res = GDebiCommon.open(self, filename, downloaded)
+>>>>>>> MERGE-SOURCE
         if res == False:
             self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
             return False
-            
+
         self.statusbar_main.push(self.context, "")
 
         # set window title
-        self.window_main.set_title(_("Package Installer - %s") % 
+        self.window_main.set_title(_("Package Installer - %s") %
                                    self._deb.pkgname)
 
         # set name and ungrey some widgets
@@ -315,6 +336,11 @@
         # and the file content textview
         font_desc = Pango.FontDescription('monospace')
         self.textview_file_content.modify_font(font_desc)
+        self.textview_lintian_output.modify_font(font_desc)
+
+        # run lintian async
+        if self._options and self._options.non_interactive is False:
+            self._run_lintian(filename)
 
         # check the deps
         if not self._deb.check():
@@ -322,7 +348,7 @@
                 "<span foreground=\"red\" weight=\"bold\">"+
                 _("Error: ") +
                 #glib.markup_escape_text(self._deb._failure_string) +
-                self._deb._failure_string + 
+                self._deb._failure_string +
                 "</span>")
 	    self.button_install.set_label(_("_Install Package"))
 
@@ -376,7 +402,7 @@
             self.button_details.hide()
         else:
             self.button_details.show()
-            
+
         self.label_status.set_markup(self.deps)
         #img = Gtk.Image()
         #img.set_from_stock(Gtk.STOCK_APPLY,Gtk.IconSize.BUTTON)
@@ -386,6 +412,44 @@
         self.button_install.grab_default()
         self.button_remove.hide()
 
+    def _run_lintian(self, filename):
+        buf = self.textview_lintian_output.get_buffer()
+        if not os.path.exists("/usr/bin/lintian"):
+            buf.set_text(
+                _("No lintian available.\n"
+                  "Please install using sudo apt-get install lintian"))
+            return
+        buf.set_text(_("Running lintian..."))
+        self._lintian_output = ""
+        self._lintian_exit_status = None
+        cmd = ["/usr/bin/lintian", filename]
+        (pid, stdin, stdout, stderr) = GLib.spawn_async(
+            cmd, flags=GObject.SPAWN_DO_NOT_REAP_CHILD,
+            standard_output=True, standard_error=True)
+        for fd in [stdout, stderr]:
+            channel = GLib.IOChannel(filedes=fd)
+            channel.set_flags(GLib.IOFlags.NONBLOCK)
+            channel.add_watch(GLib.IOCondition.IN, self._on_lintian_output)
+        GObject.child_watch_add(
+            pid, self._on_lintian_finished)
+
+    def _on_lintian_finished(self, pid, condition):
+        exit_status = os.WEXITSTATUS(condition)
+        self._lintian_exit_status = exit_status
+        text = _("\nLintian finished with exit status %s") % exit_status
+        self._lintian_output += text
+        buf = self.textview_lintian_output.get_buffer()
+        buf.set_text(self._lintian_output)
+
+    def _on_lintian_output(self, gio_file, condition):
+        if condition & GLib.IOCondition.IN:
+            content = gio_file.read()
+            if content:
+                self._lintian_output += content
+                buf = self.textview_lintian_output.get_buffer()
+                buf.set_text(self._lintian_output)
+        return True
+
     def on_treeview_files_cursor_changed(self, treeview):
         " the selection in the files list chanaged "
         model = treeview.get_model()
@@ -437,9 +501,9 @@
         # build dialog
         self.window_main.set_sensitive(False)
         fs = Gtk.FileChooserDialog(parent=self.window_main,
-                                   buttons=(Gtk.STOCK_CANCEL, 
-                                            Gtk.ResponseType.CANCEL, 
-                                            Gtk.STOCK_OPEN, 
+                                   buttons=(Gtk.STOCK_CANCEL,
+                                            Gtk.ResponseType.CANCEL,
+                                            Gtk.STOCK_OPEN,
                                             Gtk.ResponseType.OK),
                                    action=Gtk.FileChooserAction.OPEN,
                                    title=_("Open Software Package"))
@@ -466,7 +530,7 @@
         self.window_main.set_sensitive(True)
 
     def on_copy_activate(self, widget):
-        clipboard = Gtk.Clipboard.get(Gdk.atom_intern('CLIPBOARD', True)) 
+        clipboard = Gtk.Clipboard.get(Gdk.atom_intern('CLIPBOARD', True))
         buf = self.textview_description.get_buffer()
         if buf.get_has_selection():
             buf.copy_clipboard(clipboard)
@@ -535,7 +599,7 @@
             scrolled = Gtk.ScrolledWindow()
             textview = Gtk.TextView()
             textview.set_cursor_visible(False)
-            textview.set_editable(False) 
+            textview.set_editable(False)
             buf = textview.get_buffer()
             buf.set_text("\n".join(self.unauthenticated))
             scrolled.add(textview)
@@ -584,13 +648,13 @@
             self.statusbar_main.push(self.context, msgstring)
             self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
             return False
-            
+
         # lock for install
         self.window_main.set_sensitive(False)
         self.button_deb_install_close.set_sensitive(False)
         # clear terminal
         #self.vte_terminal.feed(str(0x1b)+"[2J")
-        
+
         # Get whether we auto close from synaptic's config file and
         # update the toggle button as neccessary
         config = apt_pkg.Configuration()
@@ -602,7 +666,7 @@
             config["Synaptic::closeZvt"] = "false"
         self.synaptic_config = config.subtree("Synaptic")
         self.checkbutton_autoclose.set_active(self.synaptic_config.find_b("closeZvt"))
-        
+
         self.dialog_deb_install.set_transient_for(self.window_main)
         self.dialog_deb_install.show_all()
 
@@ -638,13 +702,13 @@
             if not res:
                 self.show_alert(Gtk.MessageType.ERROR, header, body, msg,
                                 parent=self.dialog_deb_install)
-                    
+
                 self.label_install_status.set_markup("<span foreground=\"red\" weight=\"bold\">%s</span>" % header)
                 self.button_deb_install_close.set_sensitive(True)
                 self.button_deb_install_close.grab_default()
                 self.statusbar_main.push(self.context,_("Failed to install package file"))
-                return 
-    
+                return
+
         # install the package itself
         self.dialog_deb_install.set_title(self.window_main.get_title())
         if install:
@@ -683,10 +747,10 @@
                 self.label_install_status.set_markup("<i>"+_("Package '%s' was removed") % os.path.basename(self._deb.pkgname)+"</i>")
         else:
             if install:
-                self.label_install_status.set_markup("<b>"+_("Failed to install package '%s'") % 
+                self.label_install_status.set_markup("<b>"+_("Failed to install package '%s'") %
                                                      os.path.basename(self._deb.filename)+"</b>")
             else:
-                self.label_install_status.set_markup("<b>"+_("Failed to remove package '%s'") % 
+                self.label_install_status.set_markup("<b>"+_("Failed to remove package '%s'") %
                                                     os.path.basename(self._deb.pkgname)+"</b>")
             self.expander_install.set_expanded(True)
         if install:
@@ -718,7 +782,7 @@
 
     def on_button_remove_clicked(self, widget):
         self.dpkg_action(widget, False)
-        
+
     def on_button_deb_install_close_clicked(self, widget):
         # Set the autoclose option when we close
         autoclose = self.checkbutton_autoclose.get_active()
@@ -731,17 +795,17 @@
             self._gio_cancellable.cancel()
         self.dialog_deb_install.hide()
         self.window_main.set_sensitive(True)
-    
+
     def on_checkbutton_autoclose_clicked(self, widget):
         if self.action_completed:
-            self.on_button_deb_install_close_clicked(None)            
+            self.on_button_deb_install_close_clicked(None)
 
     def on_window_main_delete_event(self, *args):
         if self.window_main.get_property("sensitive"):
             if Gtk.main_level() > 0:
                 Gtk.main_quit()
             return False
-        else: 
+        else:
             return True
 
     def show_alert(self, type, header, body=None, details=None, parent=None):
@@ -754,26 +818,26 @@
         if not body == None:
              message = "%s\n\n%s" % (message, body)
         self.label_hig.set_markup(message)
-  
+
         if not details == None:
              buffer = self.textview_hig.get_buffer()
              buffer.set_text(str(details))
              self.expander_hig.set_expanded(False)
              self.expander_hig.show()
-             
+
         if type == Gtk.MessageType.ERROR:
              self.image_hig.set_property("stock", "gtk-dialog-error")
         elif type == Gtk.MessageType.WARNING:
              self.image_hig.set_property("stock", "gtk-dialog-warning")
         elif type == Gtk.MessageType.INFO:
              self.image_hig.set_property("stock", "gtk-dialog-info")
-             
+
         res = self.dialog_hig.run()
         self.dialog_hig.hide()
         if res == Gtk.ResponseType.CLOSE:
             return True
         return False
-        
+
     def write_synaptic_config_file(self, config, path):
         if not os.path.exists(path):
             return
@@ -791,7 +855,7 @@
 
     def menu_action(self, widget, terminal):
         terminal.copy_clipboard()
-        
+
     # embedded classes
     class DpkgActionProgress(object):
         def __init__(self, debfile, status, progress, term, expander, install=True):
@@ -838,7 +902,7 @@
 
             # the command
             argv = ["/usr/bin/dpkg", "--auto-deconfigure"]
-            # ubuntu supports VTE_PTY_KEEP_FD, see 
+            # ubuntu supports VTE_PTY_KEEP_FD, see
             # https://bugzilla.gnome.org/320128 for the upstream bug
             if UBUNTU:
                 argv += ["--status-fd", "%s"%writefd]
@@ -857,8 +921,8 @@
             self.term.connect("child-exited", finish_dpkg, lock)
             (res, pid) =self.term.fork_command_full(
                 Vte.PtyFlags.DEFAULT,
-                "/", 
-                argv, 
+                "/",
+                argv,
                 env,
                 GLib.SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
                 # FIXME: add setup_func that closes all fds excpet for writefd
@@ -895,11 +959,11 @@
                     Gtk.main_iteration()
                 time.sleep(0.2)
                 # if the terminal has not reacted for some time, do something
-                if (not self.term_expander.get_expanded() and 
+                if (not self.term_expander.get_expanded() and
                     (self.time_last_update + GDEBI_TERMINAL_TIMEOUT) < time.time()):
                   self.term_expander.set_expanded(True)
             self.progress.set_fraction(1.0)
-    
+
     class InstallProgressAdapter(InstallProgress):
         def __init__(self,progress,term,label,term_expander):
             InstallProgress.__init__(self)
@@ -941,7 +1005,7 @@
             InstallProgress.update_interface(self)
             while Gtk.events_pending():
                 Gtk.main_iteration()
-            if (not self.term_expander.get_expanded() and 
+            if (not self.term_expander.get_expanded() and
                 (self.time_last_update + GDEBI_TERMINAL_TIMEOUT) < time.time()):
               self.term_expander.set_expanded(True)
             # sleep just long enough to not create a busy loop
@@ -965,7 +1029,7 @@
             while not self.finished:
                 self.update_interface()
             return self.apt_status
-        
+
     class FetchProgressAdapter(apt.progress.base.AcquireProgress):
         def __init__(self,progress,action,main):
             super(GDebi.FetchProgressAdapter, self).__init__()
@@ -1017,7 +1081,7 @@
                 Gtk.main_iteration()
         def done(self):
             self.progressbar.hide()
-        
+
 if __name__ == "__main__":
     app = GDebi("data/",None)
 
@@ -1033,16 +1097,16 @@
     apt_pkg.pkgsystem_lock()
     app.dialog_deb_install.set_transient_for(app.window_main)
     app.dialog_deb_install.show_all()
- 
+
     # install the dependecnies
     fprogress = app.FetchProgressAdapter(app.progressbar_install,
                                          app.label_action,
                                          app.dialog_deb_install)
-    iprogress = app.InstallProgressAdapter(app.progressbar_install, 
+    iprogress = app.InstallProgressAdapter(app.progressbar_install,
                                            app.vte_terminal,
                                            app.label_action,
                                            app.expander_install)
     res = app._cache.commit(fprogress,iprogress)
     print "commit retured: %s" % res
-    
+
     Gtk.main()
 
=== modified file 'GDebi/GDebiCommon.py'
--- GDebi/GDebiCommon.py	2012-09-12 21:28:17 +0000
+++ GDebi/GDebiCommon.py	2012-10-08 06:56:32 +0000
@@ -49,6 +49,7 @@
         return unicode(str, 'latin1')
 	  
 class GDebiCommon(object):
+
     # cprogress may be different in child classes
     def __init__(self, datadir, options, file=""):
         self.cprogress = None
@@ -64,14 +65,14 @@
     def openCache(self):
         self._cache = Cache(self.cprogress)
         if self._cache._depcache.broken_count > 0:
-                self.error_header = _("Broken dependencies")
-                self.error_body = _("Your system has broken dependencies. "
-                             "This application can not continue until "
-                             "this is fixed. "
-                             "To fix it run 'gksudo synaptic' or "
-                             "'sudo apt-get install -f' "
-                             "in a terminal window.")
-		return False
+            self.error_header = _("Broken dependencies")
+            self.error_body = _("Your system has broken dependencies. "
+                                "This application can not continue until "
+                                "this is fixed. "
+                                "To fix it run 'gksudo synaptic' or "
+                                "'sudo apt-get install -f' "
+                                "in a terminal window.")
+            return False
         return True
 
     def open(self, file, downloaded=False):
 
=== modified file 'data/gdebi.ui'
--- data/gdebi.ui	2012-09-13 21:32:07 +0000
+++ data/gdebi.ui	2012-10-08 06:56:32 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkAboutDialog" id="dialog_about">
     <property name="can_focus">False</property>
@@ -69,7 +69,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_deb_install_close_clicked" swapped="no"/>
               </object>
@@ -180,8 +179,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.5</property>
                 <property name="draw_indicator">True</property>
                 <signal name="clicked" handler="on_checkbutton_autoclose_clicked" swapped="no"/>
               </object>
@@ -230,7 +229,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -328,7 +326,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -439,7 +436,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -589,7 +585,6 @@
               <object class="GtkMenuItem" id="menuitem1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -600,7 +595,6 @@
                         <property name="label" translatable="yes">_Open…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">image1</property>
                         <property name="use_stock">False</property>
@@ -614,7 +608,6 @@
                         <property name="label" translatable="yes">_Refresh</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">image2</property>
                         <property name="use_stock">False</property>
@@ -634,7 +627,6 @@
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -649,7 +641,6 @@
               <object class="GtkMenuItem" id="menuitem3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -660,7 +651,6 @@
                         <property name="label">gtk-copy</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -675,7 +665,6 @@
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -686,7 +675,6 @@
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -727,7 +715,7 @@
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -737,14 +725,12 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;   &lt;/big&gt;&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                    <property name="selectable">False</property>
-                    <property name="sensitive">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -758,8 +744,6 @@
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="wrap">True</property>
-                        <property name="selectable">False</property>
-                        <property name="sensitive">True</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -777,7 +761,6 @@
                             <property name="label" translatable="yes">_Details</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_details_clicked" swapped="no"/>
                           </object>
@@ -804,7 +787,7 @@
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -832,7 +815,7 @@
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -846,7 +829,7 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
               </object>
@@ -869,7 +852,6 @@
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_install_clicked" swapped="no"/>
                   </object>
@@ -880,13 +862,28 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkButton" id="button_remove">
+                    <property name="label" translatable="yes">_Remove Package</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkButton" id="button_download">
                     <property name="label" translatable="yes">_Download Package</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_download_clicked" swapped="no"/>
                   </object>
@@ -897,24 +894,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button_remove">
-                    <property name="label" translatable="yes">_Remove Package</property>
-                    <property name="visible">False</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
                   <placeholder/>
                 </child>
               </object>
@@ -987,7 +966,7 @@
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1002,7 +981,7 @@
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1017,7 +996,7 @@
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1032,7 +1011,7 @@
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1047,7 +1026,7 @@
                     <property name="top_attach">4</property>
                     <property name="bottom_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1063,7 +1042,7 @@
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1079,7 +1058,7 @@
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1095,7 +1074,7 @@
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1109,7 +1088,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -1124,7 +1103,7 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">4</property>
                     <property name="bottom_attach">5</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
               </object>
@@ -1216,6 +1195,34 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkTextView" id="textview_lintian_output">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label_lintian">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Lintian output</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
 
=== added file 'tests/test_gdebi_gtk_lintian.py'
--- tests/test_gdebi_gtk_lintian.py	1970-01-01 00:00:00 +0000
+++ tests/test_gdebi_gtk_lintian.py	2012-10-08 06:56:32 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+import os
+import time
+import unittest
+
+from gi.repository import GObject
+from mock import patch
+
+from GDebi.GDebi import GDebi
+from GDebi.GDebiCommon import GDebiCommon
+
+EXPECTED_LINTIAN_OUTPUT = """E: error-package: file-in-etc-not-marked-as-conffile etc/foo
+E: error-package: control-file-has-bad-owner postinst egon/egon != root/root
+E: error-package: no-copyright-file
+E: error-package: package-has-no-description
+E: error-package: no-maintainer-field
+W: error-package: no-section-field
+W: error-package: no-priority-field
+E: error-package: wrong-file-owner-uid-or-gid etc/ 1000/1000
+E: error-package: wrong-file-owner-uid-or-gid etc/foo 1000/1000
+W: error-package: maintainer-script-ignores-errors postinst
+
+Lintian finished with exit status 1"""
+
+
+def do_events():
+    context = GObject.main_context_default()
+    while context.pending():
+        context.iteration()
+
+
+class GDebiGtkTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.testsdir = os.path.dirname(__file__)
+        self.datadir = os.path.join(self.testsdir, "..", "data")
+        self.options = None
+
+    # we don't need a cache for this test so patch it out
+    @patch.object(GDebiCommon, "openCache")
+    def test_lintian(self, mock_open_cache):
+        gdebi = GDebi(self.datadir, self.options)
+        gdebi._run_lintian(
+            os.path.join(self.testsdir, "error-package_1.0_all.deb"))
+        # wait for lintian to finish
+        for i in range(25):
+            time.sleep(0.2)
+            do_events()
+            if gdebi._lintian_exit_status is not None:
+                break
+        else:
+            self.fail("lintian did not finish")
+        # compare the results
+        buf = gdebi.textview_lintian_output.get_buffer()
+        start = buf.get_start_iter()
+        end = buf.get_end_iter()
+        lintian_output = buf.get_text(start, end, False)
+        self.assertEqual(lintian_output.strip(), EXPECTED_LINTIAN_OUTPUT)
+
+
+if __name__ == "__main__":
+    unittest.main()