From 281892e0115a34e209607821c0d38848c2d0b6a8 Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Tue, 26 Jan 2010 15:02:45 +0100 Subject: [PATCH] Fix a few small compile warnings --- po/Makefile.in.in | 4 ++-- src/plugin.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/po/Makefile.in.in b/po/Makefile.in.in index c7e8302..cc8a222 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ install-data-yes: all done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff --git a/src/plugin.c b/src/plugin.c index 2f97b16..764ca87 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -38,6 +38,7 @@ #include #include +#include static void wp_add(GtkWidget *cat_tree); static void wp_selected(GtkWidget *container); static void wp_unselected(GtkWidget *container); @@ -291,7 +292,8 @@ static WebKitNavigationResponse wp_navigation_requested(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gpointer user_data) { - gchar *uri, *decoded_uri; + const gchar *uri; + gchar *decoded_uri; GError *error = NULL; GdkScreen *screen; @@ -368,7 +370,7 @@ void wp_init() void wp_add(GtkWidget *cat_tree) { GtkTreePath *path = NULL; - GtkTreeStore *pl3_tree = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cat_tree)); + GtkListStore *pl3_tree = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cat_tree)); GtkTreeIter iter; if(!cfg_get_single_value_as_int_with_default(config, "wp-plugin", "enable", 0)) return; gtk_list_store_append(pl3_tree, &iter); -- 2.11.4.GIT