1.1 --- a/plover-gtk/packagefilestore.c	Fri Apr 30 20:37:08 2010 +0100
     1.2 +++ b/plover-gtk/packagefilestore.c	Tue Feb 21 22:55:40 2012 +0000
     1.3 @@ -80,7 +80,6 @@
     1.4  static GType
     1.5    plover_package_file_store_get_column_type(GtkTreeModel *tree_model,gint indx)
     1.6  {
     1.7 -    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
     1.8      g_return_val_if_fail(indx>=0 && indx<PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS,
     1.9        G_TYPE_INVALID);
    1.10      return column_types[indx];
    1.11 @@ -128,6 +127,9 @@
    1.12  	case PLOVER_PACKAGE_FILE_STORE_NAME_COLUMN:
    1.13  	    g_value_set_string(value,name);
    1.14  	    break;
    1.15 +	case PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS:
    1.16 +	    /* Quieten compiler warning */
    1.17 +	    break;
    1.18      }
    1.19  }
    1.20  
    1.21 @@ -144,7 +146,6 @@
    1.22    GtkTreeIter *iter,GtkTreeIter *parent)
    1.23  {
    1.24      PloverPackageFileStorePrivate *priv;
    1.25 -    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
    1.26      priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
    1.27      /* this is a list, nodes have no children */
    1.28      if (parent)
    1.29 @@ -170,7 +171,6 @@
    1.30    GtkTreeIter *iter)
    1.31  {
    1.32      PloverPackageFileStorePrivate *priv;
    1.33 -    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
    1.34      priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
    1.35      if (!iter)
    1.36  	return g_sequence_get_length(priv->seq);
    1.37 @@ -183,7 +183,6 @@
    1.38    GtkTreeIter *iter,GtkTreeIter *parent,gint n)
    1.39  {
    1.40      PloverPackageFileStorePrivate *priv;
    1.41 -    PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
    1.42      priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
    1.43      GSequenceIter *child;
    1.44      if (parent)
    1.45 @@ -248,7 +247,8 @@
    1.46  #ifdef WIN32
    1.47  	s=g_strdelimit(s,"/",'\\');
    1.48  #endif
    1.49 -	si=g_sequence_insert_sorted(priv->seq,s,g_strcmp0,NULL);
    1.50 +	si=g_sequence_insert_sorted(priv->seq,s,(GCompareDataFunc)g_strcmp0,
    1.51 +	  NULL);
    1.52  	*indices=g_sequence_iter_get_position(si);
    1.53  	ti.stamp=priv->stamp;
    1.54  	ti.user_data=si;