1.1 --- a/plover-gtk/packagestore.c	Sun Nov 01 21:44:52 2015 +0000
     1.2 +++ b/plover-gtk/packagestore.c	Mon Nov 02 19:01:50 2015 +0000
     1.3 @@ -136,7 +136,8 @@
     1.4  static void plover_package_store_get_value(GtkTreeModel *tree_model,
     1.5    GtkTreeIter *iter,gint column,GValue *value)
     1.6  {
     1.7 -    char *s;
     1.8 +    gchar *s;
     1.9 +    const char *summary;
    1.10      PloverPackageStore *store=(PloverPackageStore *)tree_model;
    1.11      PloverPackage *package;
    1.12      GInputStream *stream;
    1.13 @@ -170,9 +171,9 @@
    1.14  	    g_value_set_string(value,plover_package_get_version(package));
    1.15  	    break;
    1.16  	case PLOVER_PACKAGE_STORE_SUMMARY_COLUMN:
    1.17 -	    s=plover_package_get_summary(package);
    1.18 -	    if (*s)
    1.19 -		g_value_set_string(value,s);
    1.20 +	    summary=plover_package_get_summary(package);
    1.21 +	    if (*summary)
    1.22 +		g_value_set_string(value,summary);
    1.23  	    else
    1.24  	    {
    1.25  		s=g_strconcat("The ",plover_package_get_name(package),

     2.1 --- a/plover-gtk/stockicons.c	Sun Nov 01 21:44:52 2015 +0000
     2.2 +++ b/plover-gtk/stockicons.c	Mon Nov 02 19:01:50 2015 +0000
     2.3 @@ -101,7 +101,7 @@
     2.4      if (plover_pixbuf_supports_svg())
     2.5      {
     2.6  	source=gtk_icon_source_new();
     2.7 -	s=g_strconcat(name,".svg");
     2.8 +	s=g_strconcat(name,".svg",NULL);
     2.9  	filename=g_build_filename(prefix?prefix:"/usr",
    2.10  	  "share/icons/hicolor/scalable",type,s,NULL);
    2.11  	g_free(s);
    2.12 @@ -112,7 +112,7 @@
    2.13      }
    2.14      else
    2.15      {
    2.16 -	s=g_strconcat(name,".png");
    2.17 +	s=g_strconcat(name,".png",NULL);
    2.18  	filename=g_build_filename(prefix?prefix:"/usr",
    2.19  	  "share/icons/hicolor/24x24",type,s,NULL);
    2.20  	plover_install_icon_at_size(name,icon_set,GTK_ICON_SIZE_MENU,

     3.1 --- a/plover-open/plover-open.c	Sun Nov 01 21:44:52 2015 +0000
     3.2 +++ b/plover-open/plover-open.c	Mon Nov 02 19:01:50 2015 +0000
     3.3 @@ -40,7 +40,7 @@
     3.4  gboolean install(PloverPackageSet *installed,const char *path)
     3.5  {
     3.6      gchar *s;
     3.7 -    const char *prefix,*name,*unsatisfied;
     3.8 +    const char *prefix,*unsatisfied;
     3.9      const char *filenames[2];
    3.10      GError *error=NULL;
    3.11      GSList *packages,*lnk;
    3.12 @@ -135,15 +135,13 @@
    3.13  int main(int argc,char **argv)
    3.14  {
    3.15      GError *err=0;
    3.16 -    GtkWidget *w;
    3.17 -    gchar *s,*t,*contents;
    3.18      gchar *install_path=NULL;
    3.19 -    gsize len;
    3.20      PloverPackageSet *set;
    3.21  #if 0
    3.22 +    gsize len;
    3.23 +    gchar *s,*t,*contents;
    3.24      GSList *objects,*lnk;
    3.25  #endif
    3.26 -    gboolean started;
    3.27      GOptionEntry options[]={
    3.28  	{"install",0,0,G_OPTION_ARG_FILENAME,&install_path,
    3.29  	  "Install an RPM","path"},

     4.1 --- a/plover/package.h	Sun Nov 01 21:44:52 2015 +0000
     4.2 +++ b/plover/package.h	Mon Nov 02 19:01:50 2015 +0000
     4.3 @@ -44,7 +44,7 @@
     4.4  const char *plover_package_get_arch(PloverPackage *package);
     4.5  const char *plover_package_get_description(PloverPackage *package);
     4.6  const char *plover_package_get_URL(PloverPackage *package);
     4.7 -GInputStream *plover_package_get_icon_stream(PloverPackage *package);
     4.8 +GInputStream *plover_package_read_icon(PloverPackage *package,GError **error);
     4.9  struct razor_property_iterator *
    4.10    plover_package_property_iterator_create(PloverPackage *package);
    4.11  struct razor_file_iterator *

     5.1 --- a/plover/packageset.h	Sun Nov 01 21:44:52 2015 +0000
     5.2 +++ b/plover/packageset.h	Mon Nov 02 19:01:50 2015 +0000
     5.3 @@ -63,7 +63,7 @@
     5.4  PloverPackage *plover_package_set_find_custom(PloverPackageSet *set,
     5.5    gconstpointer data,GCompareFunc func);
     5.6  PloverPackage *plover_package_set_find_matching(PloverPackageSet *set,
     5.7 -  PloverPackage *template);
     5.8 +  PloverPackage *_template);
     5.9  gboolean plover_package_set_get_no_details(PloverPackageSet *set);
    5.10  const char *plover_package_set_guess_prefix(PloverPackageSet *set,
    5.11    GError **error);