From 7f0273082afda2b92f37c8b2bdbcf84cd41ffac1 Mon Sep 17 00:00:00 2001 From: J. Ali Harlow Date: Thu, 10 Nov 2011 11:00:49 +0000 Subject: [PATCH] Fix warnings --- app-manager/app-manager.c | 8 +++----- app-manager/localmedia.c | 7 ++++--- app-manager/localmedia.h | 2 +- plover-gtk/Makefile.am | 2 +- plover-gtk/packagefilestore.c | 10 +++++----- plover-gtk/packagestore.c | 7 +++---- plover/Makefile.am | 2 +- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app-manager/app-manager.c b/app-manager/app-manager.c index 7d42ad6..652e71e 100644 --- a/app-manager/app-manager.c +++ b/app-manager/app-manager.c @@ -46,8 +46,8 @@ void show_busy_cursor(gboolean busy) 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 @@ void show_busy_cursor(gboolean busy) 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_icon_at_size(const char *icon_name,GtkIconSet *icon_set, static void install_icons(void) { - int w,h; gchar *s; - GdkPixbuf *pixbuf; GtkIconSource *source; GtkIconSet *icon_set; GtkIconFactory *factory; diff --git a/app-manager/localmedia.c b/app-manager/localmedia.c index 831bdfe..b4f745e 100644 --- a/app-manager/localmedia.c +++ b/app-manager/localmedia.c @@ -169,14 +169,15 @@ static void local_media_polled(GObject *source,GAsyncResult *res,gpointer data) 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 --git a/app-manager/localmedia.h b/app-manager/localmedia.h index 7fc4484..b142855 100644 --- a/app-manager/localmedia.h +++ b/app-manager/localmedia.h @@ -36,6 +36,6 @@ typedef struct _PloverLocalMediaStoreClass { 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 --git a/plover-gtk/Makefile.am b/plover-gtk/Makefile.am index ab6554e..f5c8f35 100644 --- a/plover-gtk/Makefile.am +++ b/plover-gtk/Makefile.am @@ -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 --git a/plover-gtk/packagefilestore.c b/plover-gtk/packagefilestore.c index 9250c0c..2b1c4e4 100644 --- a/plover-gtk/packagefilestore.c +++ b/plover-gtk/packagefilestore.c @@ -80,7 +80,6 @@ static gint plover_package_file_store_get_n_columns(GtkTreeModel *tree_model) 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 && indxseq); @@ -183,7 +183,6 @@ static gboolean 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 @@ PloverPackageFileStore * #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 --git a/plover-gtk/packagestore.c b/plover-gtk/packagestore.c index 1be7576..e5cb99a 100644 --- a/plover-gtk/packagestore.c +++ b/plover-gtk/packagestore.c @@ -100,7 +100,6 @@ static gint plover_package_store_get_n_columns(GtkTreeModel *tree_model) 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 && indxseq); @@ -224,7 +224,6 @@ static gboolean plover_package_store_iter_nth_child(GtkTreeModel *tree_model, 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 --git a/plover/Makefile.am b/plover/Makefile.am index 1a05feb..03187f0 100644 --- a/plover/Makefile.am +++ b/plover/Makefile.am @@ -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 -- 1.7.1