diff -ruN a/gucharmap/gucharmap-chapters-model.c b/gucharmap/gucharmap-chapters-model.c
--- a/gucharmap/gucharmap-chapters-model.c	2013-03-16 21:17:06.826282000 -0400
+++ b/gucharmap/gucharmap-chapters-model.c	2013-03-16 21:15:23.806282000 -0400
@@ -27,7 +27,7 @@
 
 G_DEFINE_TYPE (GucharmapChaptersModel, gucharmap_chapters_model, GTK_TYPE_LIST_STORE)
 
-static GucharmapCodepointList * 
+static GucharmapCodepointList *
 default_get_codepoint_list (GucharmapChaptersModel *chapters,
                             GtkTreeIter *iter)
 {
@@ -76,7 +76,7 @@
  * or NULL if there is no chapter selected. The caller should release the
  * result with g_object_unref() when finished.
  **/
-GucharmapCodepointList * 
+GucharmapCodepointList *
 gucharmap_chapters_model_get_codepoint_list (GucharmapChaptersModel *chapters,
                                        GtkTreeIter       *iter)
 {
@@ -127,10 +127,18 @@
   return GUCHARMAP_CHAPTERS_MODEL_GET_CLASS (chapters)->title;
 }
 
+/**
+ * gucharmap_chapters_model_id_to_iter:
+ * @chapters_model: a #GucharmapChaptersModel
+ * @id: name
+ * @treeiter: (out): a #GtkTreeIter
+ *
+ * Return value: %TRUE on success, %FALSE on failure.
+ **/
 gboolean
 gucharmap_chapters_model_id_to_iter (GucharmapChaptersModel *chapters_model,
                                      const char *id,
-                                     GtkTreeIter *_iter)
+                                     GtkTreeIter *treeiter)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (chapters_model);
   GtkTreeIter iter;
@@ -150,7 +158,7 @@
     match = strcmp (id, str);
     g_free(str);
     if (0 == match) {
-      *_iter = iter;
+      *treeiter = iter;
       break;
     }
   } while (gtk_tree_model_iter_next (model, &iter));
diff -ruN a/gucharmap/gucharmap-chapters-model.h b/gucharmap/gucharmap-chapters-model.h
--- a/gucharmap/gucharmap-chapters-model.h	2013-03-16 21:17:06.826282000 -0400
+++ b/gucharmap/gucharmap-chapters-model.h	2013-03-16 21:14:37.942282000 -0400
@@ -80,7 +80,7 @@
                                                                            GtkTreeIter            *iter);
 gboolean                 gucharmap_chapters_model_id_to_iter              (GucharmapChaptersModel *model,
                                                                            const char             *id,
-                                                                           GtkTreeIter            *iter);
+                                                                           GtkTreeIter            *treeiter);
 
 G_END_DECLS
 
