# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1446490910 0
# Node ID 3ee18a3a0f58984e7201d1718a41f73156ae7bb3
# Parent  5b85f7066d98d72a86c5f1c679b4e813580bcdd7
Fix compiler warnings

diff -r 5b85f7066d98 -r 3ee18a3a0f58 plover-gtk/packagestore.c
--- a/plover-gtk/packagestore.c	Sun Nov 01 21:44:52 2015 +0000
+++ b/plover-gtk/packagestore.c	Mon Nov 02 19:01:50 2015 +0000
@@ -136,7 +136,8 @@
 static void plover_package_store_get_value(GtkTreeModel *tree_model,
   GtkTreeIter *iter,gint column,GValue *value)
 {
-    char *s;
+    gchar *s;
+    const char *summary;
     PloverPackageStore *store=(PloverPackageStore *)tree_model;
     PloverPackage *package;
     GInputStream *stream;
@@ -170,9 +171,9 @@
 	    g_value_set_string(value,plover_package_get_version(package));
 	    break;
 	case PLOVER_PACKAGE_STORE_SUMMARY_COLUMN:
-	    s=plover_package_get_summary(package);
-	    if (*s)
-		g_value_set_string(value,s);
+	    summary=plover_package_get_summary(package);
+	    if (*summary)
+		g_value_set_string(value,summary);
 	    else
 	    {
 		s=g_strconcat("The ",plover_package_get_name(package),
diff -r 5b85f7066d98 -r 3ee18a3a0f58 plover-gtk/stockicons.c
--- a/plover-gtk/stockicons.c	Sun Nov 01 21:44:52 2015 +0000
+++ b/plover-gtk/stockicons.c	Mon Nov 02 19:01:50 2015 +0000
@@ -101,7 +101,7 @@
     if (plover_pixbuf_supports_svg())
     {
 	source=gtk_icon_source_new();
-	s=g_strconcat(name,".svg");
+	s=g_strconcat(name,".svg",NULL);
 	filename=g_build_filename(prefix?prefix:"/usr",
 	  "share/icons/hicolor/scalable",type,s,NULL);
 	g_free(s);
@@ -112,7 +112,7 @@
     }
     else
     {
-	s=g_strconcat(name,".png");
+	s=g_strconcat(name,".png",NULL);
 	filename=g_build_filename(prefix?prefix:"/usr",
 	  "share/icons/hicolor/24x24",type,s,NULL);
 	plover_install_icon_at_size(name,icon_set,GTK_ICON_SIZE_MENU,
diff -r 5b85f7066d98 -r 3ee18a3a0f58 plover-open/plover-open.c
--- a/plover-open/plover-open.c	Sun Nov 01 21:44:52 2015 +0000
+++ b/plover-open/plover-open.c	Mon Nov 02 19:01:50 2015 +0000
@@ -40,7 +40,7 @@
 gboolean install(PloverPackageSet *installed,const char *path)
 {
     gchar *s;
-    const char *prefix,*name,*unsatisfied;
+    const char *prefix,*unsatisfied;
     const char *filenames[2];
     GError *error=NULL;
     GSList *packages,*lnk;
@@ -135,15 +135,13 @@
 int main(int argc,char **argv)
 {
     GError *err=0;
-    GtkWidget *w;
-    gchar *s,*t,*contents;
     gchar *install_path=NULL;
-    gsize len;
     PloverPackageSet *set;
 #if 0
+    gsize len;
+    gchar *s,*t,*contents;
     GSList *objects,*lnk;
 #endif
-    gboolean started;
     GOptionEntry options[]={
 	{"install",0,0,G_OPTION_ARG_FILENAME,&install_path,
 	  "Install an RPM","path"},
diff -r 5b85f7066d98 -r 3ee18a3a0f58 plover/package.h
--- a/plover/package.h	Sun Nov 01 21:44:52 2015 +0000
+++ b/plover/package.h	Mon Nov 02 19:01:50 2015 +0000
@@ -44,7 +44,7 @@
 const char *plover_package_get_arch(PloverPackage *package);
 const char *plover_package_get_description(PloverPackage *package);
 const char *plover_package_get_URL(PloverPackage *package);
-GInputStream *plover_package_get_icon_stream(PloverPackage *package);
+GInputStream *plover_package_read_icon(PloverPackage *package,GError **error);
 struct razor_property_iterator *
   plover_package_property_iterator_create(PloverPackage *package);
 struct razor_file_iterator *
diff -r 5b85f7066d98 -r 3ee18a3a0f58 plover/packageset.h
--- a/plover/packageset.h	Sun Nov 01 21:44:52 2015 +0000
+++ b/plover/packageset.h	Mon Nov 02 19:01:50 2015 +0000
@@ -63,7 +63,7 @@
 PloverPackage *plover_package_set_find_custom(PloverPackageSet *set,
   gconstpointer data,GCompareFunc func);
 PloverPackage *plover_package_set_find_matching(PloverPackageSet *set,
-  PloverPackage *template);
+  PloverPackage *_template);
 gboolean plover_package_set_get_no_details(PloverPackageSet *set);
 const char *plover_package_set_guess_prefix(PloverPackageSet *set,
   GError **error);