[gtksourceview/wip/loader-saver] Make the FileLoader class public
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/loader-saver] Make the FileLoader class public
- Date: Wed, 26 Mar 2014 15:50:21 +0000 (UTC)
commit 730f586915956199889640c2761c21cd323b34f0
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Mar 26 16:48:40 2014 +0100
Make the FileLoader class public
gtksourceview/Makefile.am | 4 ++--
gtksourceview/gtksource.h | 2 ++
gtksourceview/gtksourcefile.c | 2 ++
gtksourceview/gtksourcefile.h | 12 ------------
gtksourceview/gtksourcefileloader.c | 28 ----------------------------
gtksourceview/gtksourcefileloader.h | 23 ++---------------------
gtksourceview/gtksourcetypes-private.h | 1 -
gtksourceview/gtksourcetypes.h | 1 +
tests/Makefile.am | 12 ++++++------
9 files changed, 15 insertions(+), 70 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 2f1406d..d0929d8 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -32,6 +32,7 @@ libgtksourceview_headers = \
gtksourcecompletionprovider.h \
gtksourceencoding.h \
gtksourcefile.h \
+ gtksourcefileloader.h \
gtksourcefilesaver.h \
gtksourcegutter.h \
gtksourcegutterrenderer.h \
@@ -61,7 +62,6 @@ libgtksourceview_private_headers = \
gtksourcecompletion-private.h \
gtksourcecontextengine.h \
gtksourceengine.h \
- gtksourcefileloader.h \
gtksourcegutter-private.h \
gtksourcegutterrendererlines.h \
gtksourcegutterrenderermarks.h \
@@ -84,7 +84,6 @@ libgtksourceview_private_c_files = \
gtksourcecompletionmodel.c \
gtksourcecontextengine.c \
gtksourceengine.c \
- gtksourcefileloader.c \
gtksourcegutterrendererlines.c \
gtksourcegutterrenderermarks.c \
gtksourcelanguage-parser-1.c \
@@ -108,6 +107,7 @@ libgtksourceview_c_files = \
gtksourcecompletionprovider.c \
gtksourceencoding.c \
gtksourcefile.c \
+ gtksourcefileloader.c \
gtksourcefilesaver.c \
gtksourcegutter.c \
gtksourcegutterrenderer.c \
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index 049cd12..0903003 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -30,6 +30,8 @@
#include <gtksourceview/gtksourcecompletionprovider.h>
#include <gtksourceview/gtksourceencoding.h>
#include <gtksourceview/gtksourcefile.h>
+#include <gtksourceview/gtksourcefileloader.h>
+#include <gtksourceview/gtksourcefilesaver.h>
#include <gtksourceview/gtksourcegutter.h>
#include <gtksourceview/gtksourcegutterrenderer.h>
#include <gtksourceview/gtksourcegutterrenderertext.h>
diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c
index 5809fc0..740f778 100644
--- a/gtksourceview/gtksourcefile.c
+++ b/gtksourceview/gtksourcefile.c
@@ -505,6 +505,7 @@ _gtk_source_file_create_mount_operation (GtkSourceFile *file)
}
/* FIXME add load flags parameter for future expansion? */
+#if 0
void
gtk_source_file_load_async (GtkSourceFile *file,
gint io_priority,
@@ -595,3 +596,4 @@ gtk_source_file_load_finish (GtkSourceFile *file,
return ok;
}
+#endif
diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h
index 3b1bcf2..f6b2c88 100644
--- a/gtksourceview/gtksourcefile.h
+++ b/gtksourceview/gtksourcefile.h
@@ -99,18 +99,6 @@ void gtk_source_file_set_mount_operation_factory
GtkSourceMountOperationFactory callback,
gpointer user_data);
-void gtk_source_file_load_async (GtkSourceFile *file,
- gint io_priority,
- GCancellable *cancellable,
- GFileProgressCallback progress_callback,
- gpointer
progress_callback_data,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean gtk_source_file_load_finish (GtkSourceFile *file,
- GAsyncResult *result,
- GError **error);
-
G_GNUC_INTERNAL
GMountOperation *_gtk_source_file_create_mount_operation (GtkSourceFile *file);
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c
index 36b24a3..c8c8360 100644
--- a/gtksourceview/gtksourcefileloader.c
+++ b/gtksourceview/gtksourcefileloader.c
@@ -736,34 +736,6 @@ gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader,
return g_task_propagate_boolean (G_TASK (result), error);
}
-gboolean
-gtk_source_file_loader_cancel (GtkSourceFileLoader *loader)
-{
- GCancellable *cancellable;
-
- DEBUG ({
- g_print ("%s\n", G_STRFUNC);
- });
-
- g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), FALSE);
-
- if (loader->priv->task == NULL)
- {
- return FALSE;
- }
-
- cancellable = g_task_get_cancellable (loader->priv->task);
-
- if (cancellable == NULL)
- {
- return FALSE;
- }
-
- g_cancellable_cancel (cancellable);
- g_task_return_error_if_cancelled (loader->priv->task);
- return TRUE;
-}
-
const GtkSourceEncoding *
gtk_source_file_loader_get_encoding (GtkSourceFileLoader *loader)
{
diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h
index 5c247e3..edd9b52 100644
--- a/gtksourceview/gtksourcefileloader.h
+++ b/gtksourceview/gtksourcefileloader.h
@@ -26,9 +26,8 @@
#define __GTK_SOURCE_FILE_LOADER_H__
#include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
-#include "gtksourcefile.h"
+#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtksourcefile.h>
G_BEGIN_DECLS
@@ -52,31 +51,21 @@ struct _GtkSourceFileLoader
struct _GtkSourceFileLoaderClass
{
GObjectClass parent_class;
-
- /* Signals */
- void (* loading) (GtkSourceFileLoader *loader,
- gboolean completed,
- const GError *error);
};
-G_GNUC_INTERNAL
GType gtk_source_file_loader_get_type (void) G_GNUC_CONST;
-G_GNUC_INTERNAL
GtkSourceFileLoader *gtk_source_file_loader_new (GtkSourceFile *file,
gboolean
remove_trailing_newline);
-G_GNUC_INTERNAL
GtkSourceFileLoader *gtk_source_file_loader_new_from_stream (GtkSourceFile *file,
GInputStream *stream,
gboolean
remove_trailing_newline);
-G_GNUC_INTERNAL
void gtk_source_file_loader_set_candidate_encodings
(GtkSourceFileLoader *loader,
GSList
*candidate_encodings);
-G_GNUC_INTERNAL
void gtk_source_file_loader_load_async (GtkSourceFileLoader *loader,
gint io_priority,
GCancellable *cancellable,
@@ -85,28 +74,20 @@ void gtk_source_file_loader_load_async (GtkSourceFileLoader
*loader,
GAsyncReadyCallback callback,
gpointer user_data);
-G_GNUC_INTERNAL
gboolean gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader,
GAsyncResult *result,
GError **error);
-G_GNUC_INTERNAL
-gboolean gtk_source_file_loader_cancel (GtkSourceFileLoader *loader);
-
-G_GNUC_INTERNAL
const GtkSourceEncoding *gtk_source_file_loader_get_encoding (GtkSourceFileLoader *loader);
-G_GNUC_INTERNAL
GtkSourceNewlineType gtk_source_file_loader_get_newline_type (GtkSourceFileLoader *loader);
-G_GNUC_INTERNAL
GtkSourceCompressionType gtk_source_file_loader_get_compression_type
(GtkSourceFileLoader *loader);
/* You can get from the info: content_type, time_modified, standard_size,
* access_can_write and also the metadata.
*/
-G_GNUC_INTERNAL
GFileInfo *gtk_source_file_loader_get_info (GtkSourceFileLoader *loader);
G_END_DECLS
diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h
index 36995ec..3c49432 100644
--- a/gtksourceview/gtksourcetypes-private.h
+++ b/gtksourceview/gtksourcetypes-private.h
@@ -32,7 +32,6 @@ typedef struct _GtkSourceCompletionContainer GtkSourceCompletionContainer;
typedef struct _GtkSourceCompletionModel GtkSourceCompletionModel;
typedef struct _GtkSourceContextEngine GtkSourceContextEngine;
typedef struct _GtkSourceEngine GtkSourceEngine;
-typedef struct _GtkSourceFileLoader GtkSourceFileLoader;
typedef struct _GtkSourceGutterRendererLines GtkSourceGutterRendererLines;
typedef struct _GtkSourceGutterRendererMarks GtkSourceGutterRendererMarks;
typedef struct _GtkSourceMarksSequence GtkSourceMarksSequence;
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h
index 569bb6e..9ad6605 100644
--- a/gtksourceview/gtksourcetypes.h
+++ b/gtksourceview/gtksourcetypes.h
@@ -35,6 +35,7 @@ typedef struct _GtkSourceCompletionProposal GtkSourceCompletionProposal;
typedef struct _GtkSourceCompletionProvider GtkSourceCompletionProvider;
typedef struct _GtkSourceEncoding GtkSourceEncoding;
typedef struct _GtkSourceFile GtkSourceFile;
+typedef struct _GtkSourceFileLoader GtkSourceFileLoader;
typedef struct _GtkSourceFileSaver GtkSourceFileSaver;
typedef struct _GtkSourceGutter GtkSourceGutter;
typedef struct _GtkSourceGutterRenderer GtkSourceGutterRenderer;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e4b13ba..8b246b9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,12 +100,12 @@ test_completion_words_LDADD = \
$(DEP_LIBS) \
$(TESTS_LIBS)
-UNIT_TEST_PROGS += test-file-loader
-test_file_loader_SOURCES = test-file-loader.c
-test_file_loader_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
- $(DEP_LIBS) \
- $(TESTS_LIBS)
+#UNIT_TEST_PROGS += test-file-loader
+#test_file_loader_SOURCES = test-file-loader.c
+#test_file_loader_LDADD = \
+# $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
+# $(DEP_LIBS) \
+# $(TESTS_LIBS)
UNIT_TEST_PROGS += test-file-saver
test_file_saver_SOURCES = test-file-saver.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
