[gedit/wip/reusable-code] Move GeditMountOperationFactory in the libgedit
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/reusable-code] Move GeditMountOperationFactory in the libgedit
- Date: Tue, 17 Sep 2013 21:32:16 +0000 (UTC)
commit 1a01021fa2616e455c2b9103400914b8051b788d
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Sep 17 23:30:06 2013 +0200
Move GeditMountOperationFactory in the libgedit
Aargh, still one depenpency of GeditDocument in the DocumentSaver:
GEDIT_DOCUMENT_ERROR.
gedit/Makefile.am | 2 +-
gedit/gedit-document-saver.c | 1 +
gedit/gedit-document-saver.h | 3 +--
gedit/gedit-document.h | 9 +--------
libgedit | 2 +-
5 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 08dd2f5..793ab32 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -146,9 +146,9 @@ INST_H_FILES = \
gedit-window-activatable.h
LIBGEDIT_INST_H_FILES = \
- $(top_srcdir)/libgedit/gedit/gedit-document-enums.h \
$(top_srcdir)/libgedit/gedit/gedit-encodings.h \
$(top_srcdir)/libgedit/gedit/gedit-utils.h \
+ $(top_srcdir)/libgedit/gedit/libgedit-document.h \
$(top_srcdir)/libgedit/gedit/libgedit-enum-types.h
if !ENABLE_GVFS_METADATA
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index 0d85b13..99e4c0c 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -32,6 +32,7 @@
#include "gedit/gedit-utils.h"
#include "gedit/libgedit-enum-types.h"
#include "gedit-marshal.h"
+#include "gedit-document.h"
#define WRITE_CHUNK_SIZE 8192
diff --git a/gedit/gedit-document-saver.h b/gedit/gedit-document-saver.h
index bcb4912..a008b3d 100644
--- a/gedit/gedit-document-saver.h
+++ b/gedit/gedit-document-saver.h
@@ -26,9 +26,8 @@
#define __GEDIT_DOCUMENT_SAVER_H__
#include <gtk/gtk.h>
-#include "gedit/gedit-document-enums.h"
+#include "gedit/libgedit-document.h"
#include "gedit/gedit-encodings.h"
-#include "gedit-document.h"
G_BEGIN_DECLS
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index 71415b1..7faf720 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <gtksourceview/gtksource.h>
#include <gedit/gedit-encodings.h>
-#include <gedit/gedit-document-enums.h>
+#include <gedit/libgedit-document.h>
G_BEGIN_DECLS
@@ -294,13 +294,6 @@ gboolean _gedit_document_check_externally_modified
#define GEDIT_SEARCH_SET_CASE_SENSITIVE(sflags,state) ((state == TRUE) ? \
(sflags |= GEDIT_SEARCH_CASE_SENSITIVE) : (sflags &= ~GEDIT_SEARCH_CASE_SENSITIVE))
-/**
- * GeditMountOperationFactory: (skip)
- * @doc:
- * @userdata:
- */
-typedef GMountOperation *(*GeditMountOperationFactory)(gpointer userdata);
-
void _gedit_document_set_mount_operation_factory (GeditDocument *doc,
GeditMountOperationFactory callback,
gpointer
userdata);
diff --git a/libgedit b/libgedit
index c01fb90..2861089 160000
--- a/libgedit
+++ b/libgedit
@@ -1 +1 @@
-Subproject commit c01fb908d418e246d2cd9071ce845db6f864071e
+Subproject commit 2861089df288ed3b297695dd964f3459527066d9
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]