X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fsyntax-editor-source.c;h=f7617a893155faf03b786680c6e0c14114603b04;hb=e51aad5ecebae7e6cdd4acc38be1a738e5c0e6c4;hp=8605414741d561019bca6c6779ce4ce10ed1e3f1;hpb=4517b68e7248f22e7b7ed81f0d73179351a53047;p=pspp
diff --git a/src/ui/gui/syntax-editor-source.c b/src/ui/gui/syntax-editor-source.c
index 8605414741..f7617a8931 100644
--- a/src/ui/gui/syntax-editor-source.c
+++ b/src/ui/gui/syntax-editor-source.c
@@ -1,25 +1,23 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2006 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2006 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+#include
+
#include
-#include
#include
#include
@@ -30,6 +28,8 @@
#include "syntax-editor-source.h"
#include "syntax-editor.h"
+#include "xalloc.h"
+
struct syntax_editor_source
{
struct getl_interface parent;
@@ -68,8 +68,7 @@ location (const struct getl_interface *i)
static bool
read_line_from_buffer (struct getl_interface *i,
- struct string *line,
- enum getl_syntax *syntax_rules)
+ struct string *line)
{
gchar *text;
GtkTextIter next_line;
@@ -79,10 +78,8 @@ read_line_from_buffer (struct getl_interface *i,
if ( gtk_text_iter_compare (&ses->i, &ses->end) >= 0)
return false;
- gtk_text_buffer_get_iter_at_line ( ses->se->buffer,
- &next_line,
- 1 + gtk_text_iter_get_line (&ses->i)
- );
+ next_line = ses->i;
+ gtk_text_iter_forward_line (&next_line);
text = gtk_text_buffer_get_text (ses->se->buffer,
&ses->i, &next_line,
@@ -100,7 +97,7 @@ read_line_from_buffer (struct getl_interface *i,
static void
-close (struct getl_interface *i )
+do_close (struct getl_interface *i )
{
free (i);
}
@@ -120,7 +117,7 @@ create_syntax_editor_source (const struct syntax_editor *se,
ses->parent.interactive = always_false;
ses->parent.read = read_line_from_buffer;
- ses->parent.close = close;
+ ses->parent.close = do_close;
ses->parent.name = name;
ses->parent.location = location;