1.1 --- a/app-manager/app-manager.c Fri Apr 30 20:37:08 2010 +0100
1.2 +++ b/app-manager/app-manager.c Thu Nov 10 11:00:49 2011 +0000
1.3 @@ -46,8 +46,8 @@
1.4 if (!w->window)
1.5 {
1.6 link=list;
1.7 - list=g_slist_remove_link(list,link);
1.8 - g_slist_free_1(link);
1.9 + list=g_list_remove_link(list,link);
1.10 + g_list_free_1(link);
1.11 }
1.12 else
1.13 {
1.14 @@ -62,7 +62,7 @@
1.15 if (gtk_widget_get_display(w)==display)
1.16 gdk_window_set_cursor(w->window,cursor);
1.17 else
1.18 - remaining=g_slist_prepend(remaining,w);
1.19 + remaining=g_list_prepend(remaining,w);
1.20 }
1.21 }
1.22 gdk_display_flush(display);
1.23 @@ -152,9 +152,7 @@
1.24
1.25 static void install_icons(void)
1.26 {
1.27 - int w,h;
1.28 gchar *s;
1.29 - GdkPixbuf *pixbuf;
1.30 GtkIconSource *source;
1.31 GtkIconSet *icon_set;
1.32 GtkIconFactory *factory;
2.1 --- a/app-manager/localmedia.c Fri Apr 30 20:37:08 2010 +0100
2.2 +++ b/app-manager/localmedia.c Thu Nov 10 11:00:49 2011 +0000
2.3 @@ -169,14 +169,15 @@
2.4
2.5 void plover_local_media_store_scan(PloverLocalMediaStore *store)
2.6 {
2.7 - GList *sets,*drives,*link;
2.8 + GSList *sets,*slink;
2.9 + GList *drives,*link;
2.10 GDrive *drive;
2.11 g_return_if_fail(PLOVER_IS_LOCAL_MEDIA_STORE(store));
2.12 sets=
2.13 g_slist_copy(plover_package_store_get_sets(PLOVER_PACKAGE_STORE(store)));
2.14 - for(link=sets;link;link=link->next)
2.15 + for(slink=sets;slink;slink=slink->next)
2.16 plover_package_store_remove_set(PLOVER_PACKAGE_STORE(store),
2.17 - PLOVER_PACKAGE_SET(link->data));
2.18 + PLOVER_PACKAGE_SET(slink->data));
2.19 g_slist_free(sets);
2.20 drives=g_volume_monitor_get_connected_drives(store->monitor);
2.21 for(link=drives;link;link=link->next)
3.1 --- a/app-manager/localmedia.h Fri Apr 30 20:37:08 2010 +0100
3.2 +++ b/app-manager/localmedia.h Thu Nov 10 11:00:49 2011 +0000
3.3 @@ -36,6 +36,6 @@
3.4
3.5 GType plover_local_media_store_get_type(void) G_GNUC_CONST;
3.6 GtkTreeModel *plover_local_media_store_new(void);
3.7 -void plover_local_media_scan(PloverLocalMediaStore *store);
3.8 +void plover_local_media_store_scan(PloverLocalMediaStore *store);
3.9
3.10 G_END_DECLS
4.1 --- a/plover-gtk/Makefile.am Fri Apr 30 20:37:08 2010 +0100
4.2 +++ b/plover-gtk/Makefile.am Thu Nov 10 11:00:49 2011 +0000
4.3 @@ -1,7 +1,7 @@
4.4 AM_CFLAGS=-g $(PLOVER_GTK_CFLAGS)
4.5 LIBS=../plover/libplover.la $(PLOVER_GTK_LIBS)
4.6 INCLUDES=-I$(top_srcdir)
4.7 -LDFLAGS=-no-undefined -version-info $(PLOVER_GTK_LT_VERSION_INFO)
4.8 +AM_LDFLAGS=-no-undefined -version-info $(PLOVER_GTK_LT_VERSION_INFO)
4.9
4.10 pkginclude_HEADERS=error.h package.h packageset.h packagestore.h \
4.11 packagefilestore.h
5.1 --- a/plover-gtk/packagefilestore.c Fri Apr 30 20:37:08 2010 +0100
5.2 +++ b/plover-gtk/packagefilestore.c Thu Nov 10 11:00:49 2011 +0000
5.3 @@ -80,7 +80,6 @@
5.4 static GType
5.5 plover_package_file_store_get_column_type(GtkTreeModel *tree_model,gint indx)
5.6 {
5.7 - PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
5.8 g_return_val_if_fail(indx>=0 && indx<PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS,
5.9 G_TYPE_INVALID);
5.10 return column_types[indx];
5.11 @@ -128,6 +127,9 @@
5.12 case PLOVER_PACKAGE_FILE_STORE_NAME_COLUMN:
5.13 g_value_set_string(value,name);
5.14 break;
5.15 + case PLOVER_PACKAGE_FILE_STORE_NO_COLUMNS:
5.16 + /* Quieten compiler warning */
5.17 + break;
5.18 }
5.19 }
5.20
5.21 @@ -144,7 +146,6 @@
5.22 GtkTreeIter *iter,GtkTreeIter *parent)
5.23 {
5.24 PloverPackageFileStorePrivate *priv;
5.25 - PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
5.26 priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
5.27 /* this is a list, nodes have no children */
5.28 if (parent)
5.29 @@ -170,7 +171,6 @@
5.30 GtkTreeIter *iter)
5.31 {
5.32 PloverPackageFileStorePrivate *priv;
5.33 - PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
5.34 priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
5.35 if (!iter)
5.36 return g_sequence_get_length(priv->seq);
5.37 @@ -183,7 +183,6 @@
5.38 GtkTreeIter *iter,GtkTreeIter *parent,gint n)
5.39 {
5.40 PloverPackageFileStorePrivate *priv;
5.41 - PloverPackageFileStore *store=(PloverPackageFileStore *)tree_model;
5.42 priv=PLOVER_PACKAGE_FILE_STORE_GET_PRIVATE(tree_model);
5.43 GSequenceIter *child;
5.44 if (parent)
5.45 @@ -248,7 +247,8 @@
5.46 #ifdef WIN32
5.47 s=g_strdelimit(s,"/",'\\');
5.48 #endif
5.49 - si=g_sequence_insert_sorted(priv->seq,s,g_strcmp0,NULL);
5.50 + si=g_sequence_insert_sorted(priv->seq,s,(GCompareDataFunc)g_strcmp0,
5.51 + NULL);
5.52 *indices=g_sequence_iter_get_position(si);
5.53 ti.stamp=priv->stamp;
5.54 ti.user_data=si;
6.1 --- a/plover-gtk/packagestore.c Fri Apr 30 20:37:08 2010 +0100
6.2 +++ b/plover-gtk/packagestore.c Thu Nov 10 11:00:49 2011 +0000
6.3 @@ -100,7 +100,6 @@
6.4 static GType
6.5 plover_package_store_get_column_type(GtkTreeModel *tree_model,gint indx)
6.6 {
6.7 - PloverPackageStore *store=(PloverPackageStore *)tree_model;
6.8 g_return_val_if_fail(indx>=0 && indx<PLOVER_PACKAGE_STORE_NO_COLUMNS,
6.9 G_TYPE_INVALID);
6.10 return column_types[indx];
6.11 @@ -172,6 +171,9 @@
6.12 g_free(s);
6.13 }
6.14 break;
6.15 + case PLOVER_PACKAGE_STORE_NO_COLUMNS:
6.16 + /* Quieten compiler warning */
6.17 + break;
6.18 }
6.19 }
6.20
6.21 @@ -187,7 +189,6 @@
6.22 GtkTreeIter *iter,GtkTreeIter *parent)
6.23 {
6.24 PloverPackageStorePrivate *priv;
6.25 - PloverPackageStore *store=(PloverPackageStore *)tree_model;
6.26 priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
6.27 /* this is a list, nodes have no children */
6.28 if (parent)
6.29 @@ -212,7 +213,6 @@
6.30 GtkTreeIter *iter)
6.31 {
6.32 PloverPackageStorePrivate *priv;
6.33 - PloverPackageStore *store=(PloverPackageStore *)tree_model;
6.34 priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
6.35 if (!iter)
6.36 return g_sequence_get_length(priv->seq);
6.37 @@ -224,7 +224,6 @@
6.38 GtkTreeIter *iter,GtkTreeIter *parent,gint n)
6.39 {
6.40 PloverPackageStorePrivate *priv;
6.41 - PloverPackageStore *store=(PloverPackageStore *)tree_model;
6.42 priv=PLOVER_PACKAGE_STORE_GET_PRIVATE(tree_model);
6.43 GSequenceIter *child;
6.44 if (parent)
7.1 --- a/plover/Makefile.am Fri Apr 30 20:37:08 2010 +0100
7.2 +++ b/plover/Makefile.am Thu Nov 10 11:00:49 2011 +0000
7.3 @@ -1,7 +1,7 @@
7.4 AM_CFLAGS=-g $(LIBPLOVER_CFLAGS)
7.5 LIBS=$(LIBPLOVER_LIBS)
7.6 INCLUDES=-I$(top_srcdir)
7.7 -LDFLAGS=-no-undefined -version-info $(LIBPLOVER_LT_VERSION_INFO)
7.8 +AM_LDFLAGS=-no-undefined -version-info $(LIBPLOVER_LT_VERSION_INFO)
7.9
7.10 pkginclude_HEADERS=plover.h
7.11