summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid King <amigadave@amigadave.com>2015-02-09 15:51:40 +0000
committerDavid King <amigadave@amigadave.com>2015-02-09 22:35:45 +0000
commitb997c542786e5a4c52cc206224f6f64119bb901d (patch)
tree1e1c0e7eba945d96c945df0db8a282a9d9a5d79f
parentce89be151607f8d254fd26056a44bca84bc4de2b (diff)
downloadyelp-b997c542786e5a4c52cc206224f6f64119bb901d.tar.gz
Fix unused variable warnings
-rw-r--r--libyelp/yelp-bz2-decompressor.c1
-rw-r--r--libyelp/yelp-docbook-document.c4
-rw-r--r--libyelp/yelp-help-list.c2
-rw-r--r--libyelp/yelp-info-parser.c2
-rw-r--r--libyelp/yelp-lzma-decompressor.c1
-rw-r--r--libyelp/yelp-mallard-document.c4
-rw-r--r--libyelp/yelp-search-entry.c8
-rw-r--r--libyelp/yelp-settings.c13
-rw-r--r--libyelp/yelp-simple-document.c2
-rw-r--r--libyelp/yelp-transform.c1
-rw-r--r--libyelp/yelp-view.c4
11 files changed, 4 insertions, 38 deletions
diff --git a/libyelp/yelp-bz2-decompressor.c b/libyelp/yelp-bz2-decompressor.c
index d8a73c9a..e1053815 100644
--- a/libyelp/yelp-bz2-decompressor.c
+++ b/libyelp/yelp-bz2-decompressor.c
@@ -126,7 +126,6 @@ yelp_bz2_decompressor_convert (GConverter *converter,
GError **error)
{
YelpBz2Decompressor *decompressor;
- gsize header_size;
int res;
decompressor = YELP_BZ2_DECOMPRESSOR (converter);
diff --git a/libyelp/yelp-docbook-document.c b/libyelp/yelp-docbook-document.c
index 4d4523bd..57d96dbe 100644
--- a/libyelp/yelp-docbook-document.c
+++ b/libyelp/yelp-docbook-document.c
@@ -539,7 +539,6 @@ docbook_walk (YelpDocbookDocument *docbook)
gchar autoidstr[20];
xmlChar *id = NULL;
xmlChar *title = NULL;
- gchar *old_page_id = NULL;
xmlNodePtr cur, old_cur;
gboolean chunkQ;
YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook);
@@ -596,7 +595,6 @@ docbook_walk (YelpDocbookDocument *docbook)
if (priv->cur_page_id)
yelp_document_set_up_id (document, (gchar *) id, priv->cur_page_id);
- old_page_id = priv->cur_page_id;
priv->cur_page_id = g_strdup ((gchar *) id);
}
@@ -684,7 +682,6 @@ static gchar *
docbook_walk_get_title (YelpDocbookDocument *docbook,
xmlNodePtr cur)
{
- YelpDocbookDocumentPrivate *priv = GET_PRIV (docbook);
gchar *infoname = NULL;
xmlNodePtr child = NULL;
xmlNodePtr title = NULL;
@@ -925,7 +922,6 @@ static void
docbook_index_node (DocbookIndexData *index)
{
xmlNodePtr oldcur, child;
- YelpDocbookDocumentPrivate *priv = GET_PRIV (index->docbook);
if ((g_str_equal (index->cur->parent->name, "menuchoice") ||
g_str_equal (index->cur->parent->name, "keycombo")) &&
diff --git a/libyelp/yelp-help-list.c b/libyelp/yelp-help-list.c
index 35783592..dc3774c0 100644
--- a/libyelp/yelp-help-list.c
+++ b/libyelp/yelp-help-list.c
@@ -223,7 +223,7 @@ help_list_think (YelpHelpList *list)
YelpHelpListPrivate *priv = GET_PRIV (list);
/* The strings are still owned by GLib; we just own the array. */
gchar **datadirs;
- gint datadir_i, subdir_i, lang_i;
+ gint datadir_i, lang_i;
GList *cur;
GtkIconTheme *theme;
diff --git a/libyelp/yelp-info-parser.c b/libyelp/yelp-info-parser.c
index fd8f3797..eee97220 100644
--- a/libyelp/yelp-info-parser.c
+++ b/libyelp/yelp-info-parser.c
@@ -1334,7 +1334,7 @@ info_process_text_notes (xmlNodePtr *node, gchar *content, GtkTreeStore *tree)
notes = g_regex_split_simple ("\\*[Nn]ote(?!_)", content, 0, 0);
for (current = notes; *current != NULL; current++) {
- gchar *url, **urls, **ulink;
+ gchar *url, **urls;
gchar *append;
gchar *alt_append, *alt_append1;
gchar *link_text;
diff --git a/libyelp/yelp-lzma-decompressor.c b/libyelp/yelp-lzma-decompressor.c
index 1b594045..8e04cfdf 100644
--- a/libyelp/yelp-lzma-decompressor.c
+++ b/libyelp/yelp-lzma-decompressor.c
@@ -135,7 +135,6 @@ yelp_lzma_decompressor_convert (GConverter *converter,
GError **error)
{
YelpLzmaDecompressor *decompressor;
- gsize header_size;
lzma_ret res;
decompressor = YELP_LZMA_DECOMPRESSOR (converter);
diff --git a/libyelp/yelp-mallard-document.c b/libyelp/yelp-mallard-document.c
index 62b85ec3..00a77463 100644
--- a/libyelp/yelp-mallard-document.c
+++ b/libyelp/yelp-mallard-document.c
@@ -621,14 +621,13 @@ mallard_page_data_info (MallardPageData *page_data,
xmlNodePtr cache_node)
{
xmlNodePtr child;
- gboolean editor_mode = yelp_settings_get_editor_mode (yelp_settings_get_default ());
for (child = info_node->children; child; child = child->next) {
if (xml_node_is_ns_name (child, MALLARD_NS, BAD_CAST "info")) {
mallard_page_data_info (page_data, child, cache_node);
}
else if (xml_node_is_ns_name (child, MALLARD_NS, BAD_CAST "title")) {
- xmlNodePtr node, title_node;
+ xmlNodePtr title_node;
xmlChar *type, *role;
title_node = xmlCopyNode (child, 1);
xmlAddChild (cache_node, title_node);
@@ -701,7 +700,6 @@ mallard_page_data_run (MallardPageData *page_data)
{
YelpSettings *settings = yelp_settings_get_default ();
YelpMallardDocumentPrivate *priv = GET_PRIV (page_data->mallard);
- gint i, ix;
gchar **params = NULL;
mallard_page_data_cancel (page_data);
diff --git a/libyelp/yelp-search-entry.c b/libyelp/yelp-search-entry.c
index 44080873..67995a1b 100644
--- a/libyelp/yelp-search-entry.c
+++ b/libyelp/yelp-search-entry.c
@@ -202,15 +202,11 @@ yelp_search_entry_class_init (YelpSearchEntryClass *klass)
static void
yelp_search_entry_init (YelpSearchEntry *entry)
{
- YelpSearchEntryPrivate *priv = GET_PRIV (entry);
}
static void
search_entry_constructed (GObject *object)
{
- GtkCellRenderer *bookmark_cell;
- GList *cells;
- GtkTreeIter iter;
YelpSearchEntryPrivate *priv = GET_PRIV (object);
g_signal_connect (object, "activate",
@@ -388,7 +384,6 @@ static void
entry_activate_cb (GtkEntry *text_entry,
gpointer user_data)
{
- YelpSearchEntryPrivate *priv = GET_PRIV (user_data);
gchar *text = g_strdup (gtk_entry_get_text (text_entry));
if (text == NULL || strlen(text) == 0)
@@ -433,7 +428,6 @@ cell_set_completion_text_cell (GtkCellLayout *layout,
{
gchar *title;
gint flags;
- YelpSearchEntryPrivate *priv = GET_PRIV (entry);
gtk_tree_model_get (model, iter, COMPLETION_COL_FLAGS, &flags, -1);
if (flags & COMPLETION_FLAG_ACTIVATE_SEARCH) {
@@ -463,7 +457,6 @@ entry_match_func (GtkEntryCompletion *completion,
gchar **strs;
gint flags;
GtkTreeModel *model = gtk_entry_completion_get_model (completion);
- YelpSearchEntryPrivate *priv = GET_PRIV (entry);
static GRegex *nonword = NULL;
if (nonword == NULL)
@@ -587,7 +580,6 @@ view_loaded (YelpView *view,
gchar **ids;
gint i;
GtkTreeIter iter;
- gint flags;
YelpUri *uri;
gchar *doc_uri;
GtkTreeModel *completion;
diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c
index 56df4c8d..5c84e56c 100644
--- a/libyelp/yelp-settings.c
+++ b/libyelp/yelp-settings.c
@@ -77,7 +77,6 @@ G_DEFINE_TYPE (YelpSettings, yelp_settings, G_TYPE_OBJECT)
#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_SETTINGS, YelpSettingsPriv))
static void yelp_settings_constructed (GObject *object);
-static void yelp_settings_dispose (GObject *object);
static void yelp_settings_finalize (GObject *object);
static void yelp_settings_get_property (GObject *object,
guint prop_id,
@@ -117,7 +116,6 @@ yelp_settings_class_init (YelpSettingsClass *klass)
gint i;
object_class->constructed = yelp_settings_constructed;
- object_class->dispose = yelp_settings_dispose;
object_class->finalize = yelp_settings_finalize;
object_class->get_property = yelp_settings_get_property;
object_class->set_property = yelp_settings_set_property;
@@ -242,7 +240,6 @@ yelp_settings_constructed (GObject *object)
YelpSettings *settings = YELP_SETTINGS (object);
GDBusConnection *connection;
GVariant *ret, *names;
- GVariant *ret2;
GVariantIter iter;
gchar *name;
gboolean env_shell, env_classic, env_panel, env_unity, env_xfce;
@@ -331,14 +328,6 @@ yelp_settings_constructed (GObject *object)
}
static void
-yelp_settings_dispose (GObject *object)
-{
- YelpSettings *settings = YELP_SETTINGS (object);
-
- G_OBJECT_CLASS (yelp_settings_parent_class)->dispose (object);
-}
-
-static void
yelp_settings_finalize (GObject *object)
{
YelpSettings *settings = YELP_SETTINGS (object);
@@ -1111,12 +1100,10 @@ static void
hsv_to_hex (gdouble h, gdouble s, gdouble v, gchar *str)
{
gint hue;
- gdouble c;
gdouble m1, m2, m3;
gdouble r, g, b;
guint8 red, green, blue;
- c = v * s;
h /= 60;
hue = (int) h;
m1 = v * (1 - s);
diff --git a/libyelp/yelp-simple-document.c b/libyelp/yelp-simple-document.c
index 34e4076d..51148b1e 100644
--- a/libyelp/yelp-simple-document.c
+++ b/libyelp/yelp-simple-document.c
@@ -409,8 +409,6 @@ stream_close_cb (GInputStream *stream,
GAsyncResult *result,
YelpSimpleDocument *document)
{
- GSList *cur;
-
document->priv->finished = TRUE;
document_signal_all (document);
}
diff --git a/libyelp/yelp-transform.c b/libyelp/yelp-transform.c
index 810010ea..c9af3e3f 100644
--- a/libyelp/yelp-transform.c
+++ b/libyelp/yelp-transform.c
@@ -217,7 +217,6 @@ static void
yelp_transform_finalize (GObject *object)
{
YelpTransformPrivate *priv = GET_PRIV (object);
- xsltDocumentPtr xsltdoc;
GHashTableIter iter;
gpointer chunk;
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index f857a463..80278898 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -241,7 +241,6 @@ enum {
static void
yelp_view_init (YelpView *view)
{
- GtkAction *action;
YelpViewPrivate *priv = GET_PRIV (view);
g_object_set (view, "settings", websettings, NULL);
@@ -1486,7 +1485,6 @@ view_resource_request (WebKitWebView *view,
{
YelpViewPrivate *priv = GET_PRIV (view);
const gchar *requri = webkit_network_request_get_uri (request);
- gchar last;
gchar *newpath;
if (!g_str_has_prefix (requri, BOGUS_URI))
@@ -1744,7 +1742,7 @@ view_show_error_page (YelpView *view,
"</div></div>"
"</body></html>";
YelpSettings *settings = yelp_settings_get_default ();
- gchar *page, *title = NULL, *link = NULL, *title_m, *content_beg, *content_end;
+ gchar *page, *title = NULL, *title_m, *content_beg, *content_end;
gchar *textcolor, *bgcolor, *noteborder, *notebg, *titlecolor, *noteicon, *linkcolor;
gint iconsize;
GParamSpec *spec;