#include "chimara-glk-private.h"
#include "gi_dispa.h"
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
/* Internal function: create a fileref using the given parameters. If @basename
is NULL, compute a basename from @filename. */
{
g_return_val_if_fail(filename != NULL, NULL);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
frefid_t f = g_new0(struct glk_fileref_struct, 1);
f->magic = MAGIC_FILEREF;
f->rock = rock;
static void
fileref_close_common(frefid_t fref)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
glk_data->fileref_list = g_list_delete_link(glk_data->fileref_list, fref->fileref_list);
if(glk_data->unregister_obj)
{
VALID_FILEREF_OR_NULL(fref, return NULL);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
GList *retnode;
if(fref == NULL)
for each usage */
GtkWidget *chooser;
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
gdk_threads_enter();
switch(fmode)
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(chooser), GTK_FILE_CHOOSER_ACTION_SAVE);
-
- /* COMPAT: */
-#if GTK_CHECK_VERSION(2,8,0)
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
-#endif
break;
case filemode_ReadWrite:
case filemode_WriteAppend:
{
g_return_val_if_fail(name != NULL && strlen(name) > 0, NULL);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
/* Do any string-munging here to remove illegal Latin-1 characters from
filename. On ext3, the only illegal characters are '/' and '\0', but the Glk
spec calls for removing any other tricky characters. */