Fixed documentation to work with Gtk-Doc 1.14 and produce as few warnings as possible

[rodin/chimara.git] / libchimara / glkunix.c

diff --git a/libchimara/glkunix.c b/libchimara/glkunix.c
index ee1194357682a1b8ae619006663a136c013989b0..13b44ec4fb91eb38b58bd55f287df7fa371826c1 100644 (file)
--- a/libchimara/glkunix.c
+++ b/libchimara/glkunix.c
@@ -7,12 +7,12 @@
 #include "fileref.h"
 #include "stream.h"
 
-extern ChimaraGlkPrivate *glk_data;
+extern GPrivate *glk_data_key;
 
 /**
  * glkunix_stream_open_pathname:
  * @pathname: A path to a file, in the system filename encoding. 
- * @usage: Bitfield with one or more of the <code>fileusage_</code> constants.
+ * @textmode: Bitfield with one or more of the <code>fileusage_</code> constants.
  * @rock: The new stream's rock value.
  *
  * Opens an arbitrary file, in read-only mode. Note that this function is
@@ -23,8 +23,10 @@ extern ChimaraGlkPrivate *glk_data;
  * Returns: A new stream, or %NULL if the file operation failed.
  */
 strid_t
-glkunix_stream_open_pathname(char *pathname, glui32 usage, glui32 rock)
+glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock)
 {
+       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+       
        if(!glk_data->in_startup)
                ILLEGAL("glkunix_stream_open_pathname() may only be called from "
                                "glkunix_startup_code().");
@@ -53,6 +55,8 @@ glkunix_set_base_file(char *filename)
 {
        g_return_if_fail(filename);
        g_return_if_fail(strlen(filename) > 0);
+
+       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        
        gchar *dirname = g_path_get_dirname(filename);
        if(!g_file_test(dirname, G_FILE_TEST_IS_DIR))