[gnome-software/wip/ubuntu-3-20] apt: backport small fixes

[Robert Ancell <rancell src gnome org>]

commit 85aa11942a5b3f1d17dff30cb2ba35fc8f874d87
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue May 23 21:01:02 2017 +1200

    apt: backport small fixes

 src/plugins/gs-plugin-apt.cc |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/gs-plugin-apt.cc b/src/plugins/gs-plugin-apt.cc
index 38c61c6..54c82cd 100644
--- a/src/plugins/gs-plugin-apt.cc
+++ b/src/plugins/gs-plugin-apt.cc
@@ -184,7 +184,6 @@ read_list_file_cb (GObject *object,
        g_autoptr(GFileInfo) info = NULL;
        g_auto(GStrv) file_lines = NULL;
        g_auto(GStrv) file_components = NULL;
-       gchar *line;
 
        file = G_FILE (object);
        data = (ReadListData *) user_data;
@@ -532,12 +531,6 @@ get_changelog (GsPlugin *plugin, GsApp *app)
 }
 
 static gboolean
-is_official (PackageInfo *info)
-{
-       return g_strcmp0 (info->origin, "Ubuntu") == 0;
-}
-
-static gboolean
 is_open_source (PackageInfo *info)
 {
        const gchar *open_source_components[] = { "main", "universe", NULL };
@@ -894,7 +887,7 @@ debconf_client_read_cb (gint fd, GIOCondition condition, gpointer user_data)
 {
        DebconfData *data = (DebconfData *) user_data;
        gchar buffer[1024];
-       gsize n_read;
+       gssize n_read;
        g_autoptr(GError) error = NULL;
 
        n_read = read (fd, buffer, 1024);