gedit r6676 - in branches/win32: . gedit

[icq svn gnome org]

Author: icq
Date: Sun Dec 21 21:18:23 2008
New Revision: 6676
URL: http://svn.gnome.org/viewvc/gedit?rev=6676&view=rev

Log:
2008-12-21  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-document-loader.c:
        * gedit/gedit-document-saver.c:
        * gedit/Makefile.am:
        Use always the gio loader and the gio saver in
        case we are in windows.



Modified:
   branches/win32/ChangeLog
   branches/win32/gedit/Makefile.am
   branches/win32/gedit/gedit-document-loader.c
   branches/win32/gedit/gedit-document-saver.c

Modified: branches/win32/gedit/Makefile.am
==============================================================================
--- branches/win32/gedit/Makefile.am	(original)
+++ branches/win32/gedit/Makefile.am	Sun Dec 21 21:18:23 2008
@@ -107,9 +107,19 @@
 header_DATA = 				\
 	$(INST_H_FILES)	
 
+if !PLATFORM_WIN32
+LOADER_SOURCES = 			\
+	gedit-mmap-document-loader.c	\
+	gedit-local-document-saver.c	
+else
+LOADER_SOURCES =
+endif
+
+
 libgedit_la_SOURCES = 			\
 	$(BUILT_SOURCES)		\
 	$(BACON_FILES)			\
+	$(LOADER_SOURCES)		\
 	gedit-app.c			\
 	gedit-commands-documents.c	\
 	gedit-commands-edit.c		\
@@ -122,10 +132,8 @@
 	gedit-debug.c			\
 	gedit-document.c 		\
 	gedit-document-loader.c		\
-	gedit-mmap-document-loader.c	\
 	gedit-gio-document-loader.c	\
 	gedit-document-saver.c		\
-	gedit-local-document-saver.c	\
 	gedit-gio-document-saver.c	\
 	gedit-documents-panel.c		\
 	gedit-encodings.c		\

Modified: branches/win32/gedit/gedit-document-loader.c
==============================================================================
--- branches/win32/gedit/gedit-document-loader.c	(original)
+++ branches/win32/gedit/gedit-document-loader.c	Sun Dec 21 21:18:23 2008
@@ -364,9 +364,11 @@
 
 	g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), NULL);
 
+#ifndef G_OS_WIN32
 	if (gedit_utils_uri_has_file_scheme (uri))
 		loader_type = GEDIT_TYPE_MMAP_DOCUMENT_LOADER;
 	else
+#endif
 		loader_type = GEDIT_TYPE_GIO_DOCUMENT_LOADER;
 
 	loader = GEDIT_DOCUMENT_LOADER (g_object_new (loader_type,

Modified: branches/win32/gedit/gedit-document-saver.c
==============================================================================
--- branches/win32/gedit/gedit-document-saver.c	(original)
+++ branches/win32/gedit/gedit-document-saver.c	Sun Dec 21 21:18:23 2008
@@ -218,9 +218,11 @@
 
 	g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), NULL);
 
+#ifndef G_OS_WIN32
 	if (gedit_utils_uri_has_file_scheme (uri))
 		saver_type = GEDIT_TYPE_LOCAL_DOCUMENT_SAVER;
 	else
+#endif
 		saver_type = GEDIT_TYPE_GIO_DOCUMENT_SAVER;
 
 	if (encoding == NULL)