glimmer patch

[Jean Schurger <gnome schurger org>]

a glimmer patch to the new-gtksourceview branch.

- Fix includes (after the release of gtksourceview)
- Corrections in the POTFILES.in
- Add the includes in the libglimmerfile/Makefile.am and
tests/Makefile.am
- temporarly comment libglimmerfile/dialogs/Makefile in configure.in


Index: configure.in
===================================================================
RCS file: /cvs/gnome/glimmer/configure.in,v
retrieving revision 1.30.2.3
diff -u -b -B -u -r1.30.2.3 configure.in
--- configure.in	21 Apr 2003 11:22:27 -0000	1.30.2.3
+++ configure.in	9 May 2003 07:22:14 -0000
@@ -81,11 +81,11 @@
 
 CFLAGS="$CFLAGS -Wall -Werror"
 
+#libglimmerfile/dialogs/Makefile
 AC_OUTPUT([
 Makefile
 idl/Makefile
 libglimmerfile/Makefile
-libglimmerfile/dialogs/Makefile
 data/Makefile
 tests/Makefile
 po/Makefile.in
Index: libglimmerfile/Makefile.am
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Makefile.am,v
retrieving revision 1.8.2.4
diff -u -b -B -u -r1.8.2.4 Makefile.am
--- libglimmerfile/Makefile.am	21 Apr 2003 11:22:28 -0000	1.8.2.4
+++ libglimmerfile/Makefile.am	9 May 2003 07:22:15 -0000
@@ -56,7 +56,21 @@
 	glimmer-factory.c \
 	glimmer-gutter.c \
 	glimmer-persist-file.c \
-	glimmer-persist-stream.c
+	glimmer-persist-stream.c \
+	glimmer-buffer.h \
+	glimmer-commands.h \
+	glimmer-control.h \
+	glimmer-convert.h \
+	glimmer-encodings.h \
+	glimmer-gutter.h \
+	glimmer-persist-file.h \
+	glimmer-persist-stream.h \
+	glimmer-print.h \
+	glimmer-search.h \
+	glimmer-settings.h \
+	glimmer-themes.h \
+	glimmer-utils.h \
+	glimmer-view.h
 
 libglimmer_control_la_LIBADD = \
 	libglimmer.la \
Index: libglimmerfile/glimmer-gutter.c
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Attic/glimmer-gutter.c,v
retrieving revision 1.1.2.2
diff -u -b -B -u -r1.1.2.2 glimmer-gutter.c
--- libglimmerfile/glimmer-gutter.c	20 Apr 2003 17:50:04 -0000	1.1.2.2
+++ libglimmerfile/glimmer-gutter.c	9 May 2003 07:22:15 -0000
@@ -24,7 +24,7 @@
 #endif
 
 #include "glimmer-gutter.h"
-#include <gtksourcebuffer.h>
+#include <gtksourceview/gtksourcebuffer.h>
 
 static BonoboObjectClass *parent_class;
 
Index: libglimmerfile/glimmer-persist-file.c
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Attic/glimmer-persist-file.c,v
retrieving revision 1.1.2.2
diff -u -b -B -u -r1.1.2.2 glimmer-persist-file.c
--- libglimmerfile/glimmer-persist-file.c	8 Apr 2003 08:51:50 -0000	1.1.2.2
+++ libglimmerfile/glimmer-persist-file.c	9 May 2003 07:22:15 -0000
@@ -36,8 +36,8 @@
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <gtksourcebuffer.h>
-#include <gtksourceview.h>
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourceview.h>
 
 #include "glimmer-persist-file.h"
 
Index: libglimmerfile/glimmer-persist-stream.c
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Attic/glimmer-persist-stream.c,v
retrieving revision 1.1.2.4
diff -u -b -B -u -r1.1.2.4 glimmer-persist-stream.c
--- libglimmerfile/glimmer-persist-stream.c	21 Apr 2003 11:29:00 -0000	1.1.2.4
+++ libglimmerfile/glimmer-persist-stream.c	9 May 2003 07:22:15 -0000
@@ -25,8 +25,8 @@
 
 #include <string.h>
 #include <libbonobo.h>
-#include <gtksourcebuffer.h>
-#include <gtksourceview.h>
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourceview.h>
 #include "glimmer-persist-stream.h"
 #include "glimmer-view.h"
 #include "glimmer-convert.h"
Index: libglimmerfile/glimmer-view.c
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Attic/glimmer-view.c,v
retrieving revision 1.1.2.6
diff -u -b -B -u -r1.1.2.6 glimmer-view.c
--- libglimmerfile/glimmer-view.c	21 Apr 2003 11:08:44 -0000	1.1.2.6
+++ libglimmerfile/glimmer-view.c	9 May 2003 07:22:15 -0000
@@ -35,7 +35,7 @@
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libxml/tree.h>
 
-#include <gtksourcelanguagesmanager.h>
+#include <gtksourceview/gtksourcelanguagesmanager.h>
 
 #include "glimmer-view.h"
 #include "glimmer-settings.h"
Index: libglimmerfile/glimmer-view.h
===================================================================
RCS file: /cvs/gnome/glimmer/libglimmerfile/Attic/glimmer-view.h,v
retrieving revision 1.1.2.4
diff -u -b -B -u -r1.1.2.4 glimmer-view.h
--- libglimmerfile/glimmer-view.h	8 Apr 2003 09:48:33 -0000	1.1.2.4
+++ libglimmerfile/glimmer-view.h	9 May 2003 07:22:16 -0000
@@ -21,7 +21,7 @@
 #ifndef __GLIMMER_VIEW_H__
 #define __GLIMMER_VIEW_H__
 
-#include <gtksourceview.h>
+#include <gtksourceview/gtksourceview.h>
 
 G_BEGIN_DECLS
 
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/glimmer/po/POTFILES.in,v
retrieving revision 1.7
diff -u -b -B -u -r1.7 POTFILES.in
--- po/POTFILES.in	5 Nov 2002 17:04:07 -0000	1.7
+++ po/POTFILES.in	9 May 2003 07:22:16 -0000
@@ -1,22 +1,17 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-libglimmerfile/GNOME_Development_GlimmerFile.server.in
+data/GNOME_Development_Glimmer.server.in
 libglimmerfile/dialogs/glimmer-dialog-goto-line.c
 libglimmerfile/dialogs/glimmer-dialog-prefs.c
 libglimmerfile/dialogs/glimmer-dialog-replace.c
 libglimmerfile/dialogs/goto-line.glade2
 libglimmerfile/dialogs/preferences.glade2
 libglimmerfile/dialogs/replace.glade2
-libglimmerfile/glimmer-file-persist-file.c
-libglimmerfile/glimmer-file-persist-stream.c
-libglimmerfile/glimmer-file-print.c
-libglimmerfile/glimmer-file-search.c
-libglimmerfile/glimmer-file.c
-libglimmerfile/glimmer-file.schemas.in
-libglimmerfile/glimmer-language-menu/glimmer-language-menu.c
-libglimmerfile/glimmer-language-spec/glimmer-language-spec.c
+libglimmerfile/glimmer-persist-file.c
+libglimmerfile/glimmer-persist-stream.c
+libglimmerfile/glimmer-print.c
+libglimmerfile/glimmer-search.c
 libglimmerfile/glimmer-style-cache/glimmer-style-cache.c
-libglimmerfile/xml/glimmer-file-ui.xml
-src/test-glimmer-control.c
-src/test-glimmer-widget.c
-src/xml/glimmer-ui.xml
+tests/test-control.c
+tests/test-widget.c
+tests/test-ui.xml
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/glimmer/tests/Attic/Makefile.am,v
retrieving revision 1.1.2.2
diff -u -b -B -u -r1.1.2.2 Makefile.am
--- tests/Makefile.am	8 Apr 2003 08:52:01 -0000	1.1.2.2
+++ tests/Makefile.am	9 May 2003 07:22:16 -0000
@@ -21,6 +21,7 @@
 
 test_control_SOURCES = \
 	bonobo-stream-vfs.c \
+	bonobo-stream-vfs.h \
 	test-control.c
 
 test_control_LDADD = \