[gedit/wip/loader-saver: 16/19] GeditDocument: remove some file loading stuff
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/loader-saver: 16/19] GeditDocument: remove some file loading stuff
- Date: Tue, 24 Jun 2014 22:25:13 +0000 (UTC)
commit eb702420888b327d72b41429f758f6270ef6bcc6
Author: Sébastien Wilmet <swilmet gnome org>
Date: Mon Jun 23 16:43:10 2014 +0200
GeditDocument: remove some file loading stuff
It has been replaced by GtkSourceFileLoader in GeditTab.
gedit/gedit-document.c | 84 ------------------------------------------------
gedit/gedit-document.h | 12 -------
2 files changed, 0 insertions(+), 96 deletions(-)
---
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 000172a..c7f9f0d 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -135,7 +135,6 @@ enum
{
CURSOR_MOVED,
LOAD,
- LOADING,
LOADED,
SAVE,
SAVING,
@@ -590,19 +589,6 @@ gedit_document_class_init (GeditDocumentClass *klass)
G_TYPE_INT,
G_TYPE_BOOLEAN);
-
- document_signals[LOADING] =
- g_signal_new ("loading",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditDocumentClass, loading),
- NULL, NULL,
- gedit_marshal_VOID__UINT64_UINT64,
- G_TYPE_NONE,
- 2,
- G_TYPE_UINT64,
- G_TYPE_UINT64);
-
document_signals[LOADED] =
g_signal_new ("loaded",
G_OBJECT_CLASS_TYPE (object_class),
@@ -1407,28 +1393,6 @@ document_loader_loading (GeditDocumentLoader *loader,
{
document_loader_loaded (loader, error, doc);
}
- else
- {
- goffset size = 0;
- goffset read;
- GFileInfo *info;
-
- info = gedit_document_loader_get_info (loader);
-
- if (info && g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE))
- {
- size = g_file_info_get_attribute_uint64 (info,
- G_FILE_ATTRIBUTE_STANDARD_SIZE);
- }
-
- read = gedit_document_loader_get_bytes_read (loader);
-
- g_signal_emit (doc,
- document_signals[LOADING],
- 0,
- read,
- size);
- }
}
static void
@@ -1465,37 +1429,6 @@ gedit_document_load_real (GeditDocument *doc,
gedit_document_loader_load (doc->priv->loader);
}
-void
-_gedit_document_load_stream (GeditDocument *doc,
- GInputStream *stream,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos)
-{
- g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
- g_return_if_fail (G_IS_INPUT_STREAM (stream));
- g_return_if_fail (doc->priv->loader == NULL);
-
- gedit_debug_message (DEBUG_DOCUMENT, "load stream");
-
- /* create a loader. It will be destroyed when loading is completed */
- doc->priv->loader = gedit_document_loader_new_from_stream (doc, stream, encoding);
-
- g_signal_connect (doc->priv->loader,
- "loading",
- G_CALLBACK (document_loader_loading),
- doc);
-
- doc->priv->create = FALSE;
- doc->priv->requested_encoding = encoding;
- doc->priv->requested_line_pos = line_pos;
- doc->priv->requested_column_pos = column_pos;
-
- gedit_document_set_location (doc, NULL);
-
- gedit_document_loader_load (doc->priv->loader);
-}
-
/*
* _gedit_document_load:
* @doc: the #GeditDocument.
@@ -1523,23 +1456,6 @@ _gedit_document_load (GeditDocument *doc,
line_pos, column_pos, create);
}
-/*
- * _gedit_document_load_cancel:
- * @doc: the #GeditDocument.
- *
- * Cancel load of a document.
- */
-gboolean
-_gedit_document_load_cancel (GeditDocument *doc)
-{
- g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), FALSE);
-
- if (doc->priv->loader == NULL)
- return FALSE;
-
- return gedit_document_loader_cancel (doc->priv->loader);
-}
-
static gboolean
has_invalid_chars (GeditDocument *doc)
{
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index 6db609c..1e2e035 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -118,10 +118,6 @@ struct _GeditDocumentClass
gint column_pos,
gboolean create);
- void (* loading) (GeditDocument *document,
- goffset size,
- goffset total_size);
-
void (* loaded) (GeditDocument *document,
const GError *error);
@@ -231,14 +227,6 @@ void _gedit_document_load (GeditDocument *doc,
gint column_pos,
gboolean create);
-void _gedit_document_load_stream (GeditDocument *doc,
- GInputStream *stream,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos);
-
-gboolean _gedit_document_load_cancel (GeditDocument *doc);
-
void _gedit_document_save (GeditDocument *doc,
GeditDocumentSaveFlags flags);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]