projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented glk_window_get_size()
[rodin/chimara.git]
/
src
/
fileref.c
diff --git
a/src/fileref.c
b/src/fileref.c
index 921997b08238da2315cc8306c5b34eab9226470f..be4f23f816aa1783c82f6419cef3d2da3168d73b 100644
(file)
--- a/
src/fileref.c
+++ b/
src/fileref.c
@@
-3,10
+3,9
@@
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include "fileref.h"
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include "fileref.h"
-#include "
error
.h"
+#include "
chimara-glk-private
.h"
-/* List of streams currently in existence */
-static GList *fileref_list = NULL;
+extern ChimaraGlkPrivate *glk_data;
/**
* glk_fileref_iterate:
/**
* glk_fileref_iterate:
@@
-31,7
+30,7
@@
glk_fileref_iterate(frefid_t fref, glui32 *rockptr)
GList *retnode;
if(fref == NULL)
GList *retnode;
if(fref == NULL)
- retnode = fileref_list;
+ retnode =
glk_data->
fileref_list;
else
retnode = fref->fileref_list->next;
frefid_t retval = retnode? (frefid_t)retnode->data : NULL;
else
retnode = fref->fileref_list->next;
frefid_t retval = retnode? (frefid_t)retnode->data : NULL;
@@
-71,8
+70,8
@@
fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode)
f->orig_filemode = orig_filemode;
/* Add it to the global fileref list */
f->orig_filemode = orig_filemode;
/* Add it to the global fileref list */
-
fileref_list = g_list_prepend(
fileref_list, f);
- f->fileref_list = fileref_list;
+
glk_data->fileref_list = g_list_prepend(glk_data->
fileref_list, f);
+ f->fileref_list =
glk_data->
fileref_list;
return f;
}
return f;
}
@@
-102,14
+101,14
@@
glk_fileref_create_temp(glui32 usage, glui32 rock)
gint handle = g_file_open_tmp("glkXXXXXX", &filename, &error);
if(handle == -1)
{
gint handle = g_file_open_tmp("glkXXXXXX", &filename, &error);
if(handle == -1)
{
-
error_dialog(NULL, error, "Error creating temporary file: "
);
+
g_warning("Error creating temporary file: %s", error->message
);
if(filename)
g_free(filename);
return NULL;
}
if(close(handle) == -1) /* There is no g_close()? */
{
if(filename)
g_free(filename);
return NULL;
}
if(close(handle) == -1) /* There is no g_close()? */
{
-
error_dialog(NULL, NULL,
"Error closing temporary file.");
+
g_warning(
"Error closing temporary file.");
if(filename)
g_free(filename);
return NULL;
if(filename)
g_free(filename);
return NULL;
@@
-227,7
+226,7
@@
glk_fileref_create_by_name(glui32 usage, char *name, glui32 rock)
&error);
if(osname == NULL)
{
&error);
if(osname == NULL)
{
-
error_dialog(NULL, error, "Error during latin1->filename conversion: "
);
+
g_warning("Error during latin1->filename conversion: %s", error->message
);
return NULL;
}
return NULL;
}
@@
-275,7
+274,7
@@
glk_fileref_create_from_fileref(glui32 usage, frefid_t fref, glui32 rock)
void
glk_fileref_destroy(frefid_t fref)
{
void
glk_fileref_destroy(frefid_t fref)
{
-
fileref_list = g_list_delete_link(
fileref_list, fref->fileref_list);
+
glk_data->fileref_list = g_list_delete_link(glk_data->
fileref_list, fref->fileref_list);
if(fref->filename)
g_free(fref->filename);
g_free(fref);
if(fref->filename)
g_free(fref->filename);
g_free(fref);
@@
-292,7
+291,7
@@
glk_fileref_delete_file(frefid_t fref)
{
if( glk_fileref_does_file_exist(fref) )
if(g_unlink(fref->filename) == -1)
{
if( glk_fileref_does_file_exist(fref) )
if(g_unlink(fref->filename) == -1)
-
error_dialog(NULL, NULL,
"Error deleting file %s", fref->filename);
+
g_warning(
"Error deleting file %s", fref->filename);
}
/**
}
/**