# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1320922849 0
# Node ID 1d18b9c34d2653692f6171b098ac3c40b73d867f
# Parent  8b50be3e299822b947ea8e5d7d6c2597a17ca9b9
Fix warnings

diff -r 8b50be3e2998 -r 1d18b9c34d26 app-manager/app-manager.c
--- a/app-manager/app-manager.c	Fri Apr 30 20:37:08 2010 +0100
+++ b/app-manager/app-manager.c	Thu Nov 10 11:00:49 2011 +0000
@@ -46,8 +46,8 @@
 	if (!w->window)
 	{
 	    link=list;
-	    list=g_slist_remove_link(list,link);
-	    g_slist_free_1(link);
+	    list=g_list_remove_link(list,link);
+	    g_list_free_1(link);
 	}
 	else
 	{
@@ -62,7 +62,7 @@
 		    if (gtk_widget_get_display(w)==display)
 			gdk_window_set_cursor(w->window,cursor);
 		    else
-			remaining=g_slist_prepend(remaining,w);
+			remaining=g_list_prepend(remaining,w);
 		}
 	    }
 	    gdk_display_flush(display);
@@ -152,9 +152,7 @@
 
 static void install_icons(void)
 {
-    int w,h;
     gchar *s;
-    GdkPixbuf *pixbuf;
     GtkIconSource *source;
     GtkIconSet *icon_set;
     GtkIconFactory *factory;
diff -r 8b50be3e2998 -r 1d18b9c34d26 app-manager/localmedia.c
--- a/app-manager/localmedia.c	Fri Apr 30 20:37:08 2010 +0100
+++ b/app-manager/localmedia.c	Thu Nov 10 11:00:49 2011 +0000
@@ -169,14 +169,15 @@
 
 void plover_local_media_store_scan(PloverLocalMediaStore *store)
 {
-    GList *sets,*drives,*link;
+    GSList *sets,*slink;
+    GList *drives,*link;
     GDrive *drive;
     g_return_if_fail(PLOVER_IS_LOCAL_MEDIA_STORE(store));
     sets=
       g_slist_copy(plover_package_store_get_sets(PLOVER_PACKAGE_STORE(store)));
-    for(link=sets;link;link=link->next)
+    for(slink=sets;slink;slink=slink->next)
 	plover_package_store_remove_set(PLOVER_PACKAGE_STORE(store),
-	  PLOVER_PACKAGE_SET(link->data));
+	  PLOVER_PACKAGE_SET(slink->data));
     g_slist_free(sets);
     drives=g_volume_monitor_get_connected_drives(store->monitor);
     for(link=drives;link;link=link->next)
diff -r 8b50be3e2998 -r 1d18b9c34d26 app-manager/localmedia.h
--- a/app-manager/localmedia.h	Fri Apr 30 20:37:08 2010 +0100
+++ b/app-manager/localmedia.h	Thu Nov 10 11:00:49 2011 +0000
@@ -36,6 +36,6 @@
 
 GType plover_local_media_store_get_type(void) G_GNUC_CONST;
 GtkTreeModel *plover_local_media_store_new(void);
-void plover_local_media_scan(PloverLocalMediaStore *store);
+void plover_local_media_store_scan(PloverLocalMediaStore *store);
 
 G_END_DECLS
diff -r 8b50be3e2998 -r 1d18b9c34d26 plover-gtk/Makefile.am
--- a/plover-gtk/Makefile.am	Fri Apr 30 20:37:08 2010 +0100
+++ b/plover-gtk/Makefile.am	Thu Nov 10 11:00:49 2011 +0000
@@ -1,7 +1,7 @@
 AM_CFLAGS=-g $(PLOVER_GTK_CFLAGS)
 LIBS=../plover/libplover.la $(PLOVER_GTK_LIBS)
 INCLUDES=-I$(top_srcdir)
-LDFLAGS=-no-undefined -version-info $(PLOVER_GTK_LT_VERSION_INFO)
+AM_LDFLAGS=-no-undefined -version-info $(PLOVER_GTK_LT_VERSION_INFO)
 
 pkginclude_HEADERS=error.h package.h packageset.h packagestore.h \
 		packagefilestore.h
diff -r 8b50be3e2998 -r 1d18b9c34d26 plover-gtk/packagefilestore.c
--- a/plover-gtk/packagefilestore.c	Fri Apr 30 20:37:08 2010 +0100
+++ b/plover-gtk/packagefilestore.c	Thu Nov 10 11:00:49 2011 +0000
@@ -80,7 +80,6 @@
 static GType
   plover_package_file_store_get_column_type(GtkTreeModel *tree_model,gint indx)
 {
-    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
     g_return_val_if_fail(indx>=0 && indx<PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS,
       G_TYPE_INVALID);
     return column_types[indx];
@@ -128,6 +127,9 @@
 	case PLOVER_PACKAGE_FILE_STORE_NAME_COLUMN:
 	    g_value_set_string(value,name);
 	    break;
+	case PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS:
+	    /* Quieten compiler warning */
+	    break;
     }
 }
 
@@ -144,7 +146,6 @@
   GtkTreeIter *iter,GtkTreeIter *parent)
 {
     PloverPackageFileStorePrivate *priv;
-    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
     priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
     /* this is a list, nodes have no children */
     if (parent)
@@ -170,7 +171,6 @@
   GtkTreeIter *iter)
 {
     PloverPackageFileStorePrivate *priv;
-    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
     priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
     if (!iter)
 	return g_sequence_get_length(priv->seq);
@@ -183,7 +183,6 @@
   GtkTreeIter *iter,GtkTreeIter *parent,gint n)
 {
     PloverPackageFileStorePrivate *priv;
-    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
     priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
     GSequenceIter *child;
     if (parent)
@@ -248,7 +247,8 @@
 #ifdef WIN32
 	s=g_strdelimit(s,"/",'\\');
 #endif
-	si=g_sequence_insert_sorted(priv->seq,s,g_strcmp0,NULL);
+	si=g_sequence_insert_sorted(priv->seq,s,(GCompareDataFunc)g_strcmp0,
+	  NULL);
 	*indices=g_sequence_iter_get_position(si);
 	ti.stamp=priv->stamp;
 	ti.user_data=si;
diff -r 8b50be3e2998 -r 1d18b9c34d26 plover-gtk/packagestore.c
--- a/plover-gtk/packagestore.c	Fri Apr 30 20:37:08 2010 +0100
+++ b/plover-gtk/packagestore.c	Thu Nov 10 11:00:49 2011 +0000
@@ -100,7 +100,6 @@
 static GType
   plover_package_store_get_column_type(GtkTreeModel *tree_model,gint indx)
 {
-    PloverPackageStore *store=(PloverPackageStore *)tree_model;
     g_return_val_if_fail(indx>=0 && indx<PLOVER_PACKAGE_STORE_NO_COLUMNS,
       G_TYPE_INVALID);
     return column_types[indx];
@@ -172,6 +171,9 @@
 		g_free(s);
 	    }
 	    break;
+	case PLOVER_PACKAGE_STORE_NO_COLUMNS:
+	    /* Quieten compiler warning */
+	    break;
     }
 }
 
@@ -187,7 +189,6 @@
   GtkTreeIter *iter,GtkTreeIter *parent)
 {
     PloverPackageStorePrivate *priv;
-    PloverPackageStore *store=(PloverPackageStore *)tree_model;
     priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
     /* this is a list, nodes have no children */
     if (parent)
@@ -212,7 +213,6 @@
   GtkTreeIter *iter)
 {
     PloverPackageStorePrivate *priv;
-    PloverPackageStore *store=(PloverPackageStore *)tree_model;
     priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
     if (!iter)
 	return g_sequence_get_length(priv->seq);
@@ -224,7 +224,6 @@
   GtkTreeIter *iter,GtkTreeIter *parent,gint n)
 {
     PloverPackageStorePrivate *priv;
-    PloverPackageStore *store=(PloverPackageStore *)tree_model;
     priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
     GSequenceIter *child;
     if (parent)
diff -r 8b50be3e2998 -r 1d18b9c34d26 plover/Makefile.am
--- a/plover/Makefile.am	Fri Apr 30 20:37:08 2010 +0100
+++ b/plover/Makefile.am	Thu Nov 10 11:00:49 2011 +0000
@@ -1,7 +1,7 @@
 AM_CFLAGS=-g $(LIBPLOVER_CFLAGS)
 LIBS=$(LIBPLOVER_LIBS)
 INCLUDES=-I$(top_srcdir)
-LDFLAGS=-no-undefined -version-info $(LIBPLOVER_LT_VERSION_INFO)
+AM_LDFLAGS=-no-undefined -version-info $(LIBPLOVER_LT_VERSION_INFO)
 
 pkginclude_HEADERS=plover.h