gtksourceview r1874 - in trunk: . docs/reference docs/reference/tmpl gtksourceview tests
- From: pborelli svn gnome org
- To: svn-commits-list gnome org
- Subject: gtksourceview r1874 - in trunk: . docs/reference docs/reference/tmpl gtksourceview tests
- Date: Fri, 1 Feb 2008 15:54:10 +0000 (GMT)
Author: pborelli
Date: Fri Feb 1 15:54:09 2008
New Revision: 1874
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1874&view=rev
Log:
2008-01-29 Paolo Borelli <pborelli katamail com>
* gtksourceview/gtksourcebuffer.c:
* gtksourceview/gtksourcebuffer.h:
* gtksourceview/gtksourceview.c:
* gtksourceview/gtksourcemark.c:
* tests/test-widget.c:
Rename some of the buffer mark methods to avoid potential conflicts
with GtkTextBuffer methods in the bindings. Bug #512481.
Modified:
trunk/ChangeLog
trunk/docs/reference/gtksourceview-2.0-sections.txt
trunk/docs/reference/tmpl/buffer.sgml
trunk/gtksourceview/gtksourcebuffer.c
trunk/gtksourceview/gtksourcebuffer.h
trunk/gtksourceview/gtksourcemark.c
trunk/gtksourceview/gtksourceview.c
trunk/tests/test-widget.c
Modified: trunk/docs/reference/gtksourceview-2.0-sections.txt
==============================================================================
--- trunk/docs/reference/gtksourceview-2.0-sections.txt (original)
+++ trunk/docs/reference/gtksourceview-2.0-sections.txt Fri Feb 1 15:54:09 2008
@@ -22,12 +22,12 @@
gtk_source_buffer_can_undo
gtk_source_buffer_begin_not_undoable_action
gtk_source_buffer_end_not_undoable_action
-gtk_source_buffer_create_mark
-gtk_source_buffer_get_marks_at_line
-gtk_source_buffer_get_marks_at_iter
-gtk_source_buffer_remove_marks
-gtk_source_buffer_forward_iter_to_mark
-gtk_source_buffer_backward_iter_to_mark
+gtk_source_buffer_create_source_mark
+gtk_source_buffer_get_source_marks_at_line
+gtk_source_buffer_get_source_marks_at_iter
+gtk_source_buffer_remove_source_marks
+gtk_source_buffer_forward_iter_to_source_mark
+gtk_source_buffer_backward_iter_to_source_mark
gtk_source_buffer_ensure_highlight
<SUBSECTION Standard>
GTK_IS_SOURCE_BUFFER
Modified: trunk/docs/reference/tmpl/buffer.sgml
==============================================================================
--- trunk/docs/reference/tmpl/buffer.sgml (original)
+++ trunk/docs/reference/tmpl/buffer.sgml Fri Feb 1 15:54:09 2008
@@ -268,7 +268,7 @@
@buffer:
-<!-- ##### FUNCTION gtk_source_buffer_create_mark ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_create_source_mark ##### -->
<para>
</para>
@@ -280,7 +280,7 @@
@Returns:
-<!-- ##### FUNCTION gtk_source_buffer_get_marks_at_line ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_get_source_marks_at_line ##### -->
<para>
</para>
@@ -291,7 +291,7 @@
@Returns:
-<!-- ##### FUNCTION gtk_source_buffer_get_marks_at_iter ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_get_source_marks_at_iter ##### -->
<para>
</para>
@@ -302,7 +302,7 @@
@Returns:
-<!-- ##### FUNCTION gtk_source_buffer_remove_marks ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_remove_source_marks ##### -->
<para>
</para>
@@ -313,7 +313,7 @@
@category:
-<!-- ##### FUNCTION gtk_source_buffer_forward_iter_to_mark ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_forward_iter_to_source_mark ##### -->
<para>
</para>
@@ -324,7 +324,7 @@
@Returns:
-<!-- ##### FUNCTION gtk_source_buffer_backward_iter_to_mark ##### -->
+<!-- ##### FUNCTION gtk_source_buffer_backward_iter_to_source_mark ##### -->
<para>
</para>
Modified: trunk/gtksourceview/gtksourcebuffer.c
==============================================================================
--- trunk/gtksourceview/gtksourcebuffer.c (original)
+++ trunk/gtksourceview/gtksourcebuffer.c Fri Feb 1 15:54:09 2008
@@ -1415,7 +1415,7 @@
}
/**
- * gtk_source_buffer_create_mark:
+ * gtk_source_buffer_create_source_mark:
* @buffer: a #GtkSourceBuffer.
* @name: the name of the mark, or %NULL.
* @category: a string defining the mark category.
@@ -1440,10 +1440,10 @@
* Since: 2.2
**/
GtkSourceMark *
-gtk_source_buffer_create_mark (GtkSourceBuffer *buffer,
- const gchar *name,
- const gchar *category,
- const GtkTextIter *where)
+gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer,
+ const gchar *name,
+ const gchar *category,
+ const GtkTextIter *where)
{
GtkSourceMark *mark;
@@ -1460,9 +1460,9 @@
}
GtkSourceMark *
-_gtk_source_buffer_mark_next (GtkSourceBuffer *buffer,
- GtkSourceMark *mark,
- const gchar *category)
+_gtk_source_buffer_source_mark_next (GtkSourceBuffer *buffer,
+ GtkSourceMark *mark,
+ const gchar *category)
{
GtkTextIter iter;
gint index, cmp;
@@ -1504,9 +1504,9 @@
}
GtkSourceMark *
-_gtk_source_buffer_mark_prev (GtkSourceBuffer *buffer,
- GtkSourceMark *mark,
- const gchar *category)
+_gtk_source_buffer_source_mark_prev (GtkSourceBuffer *buffer,
+ GtkSourceMark *mark,
+ const gchar *category)
{
GtkTextIter iter;
gint index, cmp;
@@ -1548,7 +1548,7 @@
}
/**
- * gtk_source_buffer_forward_iter_to_mark:
+ * gtk_source_buffer_forward_iter_to_source_mark:
* @buffer: a #GtkSourceBuffer.
* @iter: an iterator.
* @category: category to search for or %NULL
@@ -1562,9 +1562,9 @@
* Since: 2.2
**/
gboolean
-gtk_source_buffer_forward_iter_to_mark (GtkSourceBuffer *buffer,
- GtkTextIter *iter,
- const gchar *category)
+gtk_source_buffer_forward_iter_to_source_mark (GtkSourceBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *category)
{
GtkTextIter i;
gint index, cmp;
@@ -1607,7 +1607,7 @@
}
/**
- * gtk_source_buffer_backward_iter_to_mark:
+ * gtk_source_buffer_backward_iter_to_source_mark:
* @buffer: a #GtkSourceBuffer.
* @iter: an iterator.
* @category: category to search for or %NULL
@@ -1621,9 +1621,9 @@
* Since: 2.2
**/
gboolean
-gtk_source_buffer_backward_iter_to_mark (GtkSourceBuffer *buffer,
- GtkTextIter *iter,
- const gchar *category)
+gtk_source_buffer_backward_iter_to_source_mark (GtkSourceBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *category)
{
GtkTextIter i;
gint index, cmp;
@@ -1665,7 +1665,7 @@
}
/**
- * gtk_source_buffer_get_marks_at_iter:
+ * gtk_source_buffer_get_source_marks_at_iter:
* @buffer: a #GtkSourceBuffer.
* @iter: an iterator.
* @category: category to search for or %NULL
@@ -1678,9 +1678,9 @@
* Since: 2.2
**/
GSList *
-gtk_source_buffer_get_marks_at_iter (GtkSourceBuffer *buffer,
- GtkTextIter *iter,
- const gchar *category)
+gtk_source_buffer_get_source_marks_at_iter (GtkSourceBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *category)
{
GSList *marks, *l, *res;
@@ -1706,7 +1706,7 @@
}
/**
- * gtk_source_buffer_get_marks_at_line:
+ * gtk_source_buffer_get_source_marks_at_line:
* @buffer: a #GtkSourceBuffer.
* @line: a line number.
* @category: category to search for or %NULL
@@ -1719,9 +1719,9 @@
* Since: 2.2
**/
GSList *
-gtk_source_buffer_get_marks_at_line (GtkSourceBuffer *buffer,
- gint line,
- const gchar *category)
+gtk_source_buffer_get_source_marks_at_line (GtkSourceBuffer *buffer,
+ gint line,
+ const gchar *category)
{
GtkTextIter iter;
GSList *res;
@@ -1731,21 +1731,21 @@
gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (buffer),
&iter, line);
- res = gtk_source_buffer_get_marks_at_iter (buffer,
- &iter,
- category);
-
- while (gtk_source_buffer_forward_iter_to_mark (buffer,
- &iter,
- category))
+ res = gtk_source_buffer_get_source_marks_at_iter (buffer,
+ &iter,
+ category);
+
+ while (gtk_source_buffer_forward_iter_to_source_mark (buffer,
+ &iter,
+ category))
{
if (gtk_text_iter_get_line (&iter) == line)
{
GSList *l;
- l = gtk_source_buffer_get_marks_at_iter (buffer,
- &iter,
- category);
+ l = gtk_source_buffer_get_source_marks_at_iter (buffer,
+ &iter,
+ category);
res = g_slist_concat (res, l);
}
@@ -1759,7 +1759,7 @@
}
/**
- * gtk_source_buffer_remove_marks:
+ * gtk_source_buffer_remove_source_marks:
* @buffer: a #GtkSourceBuffer.
* @start: a #GtkTextIter
* @end: a #GtkTextIter
@@ -1771,10 +1771,10 @@
* Since: 2.2
**/
void
-gtk_source_buffer_remove_marks (GtkSourceBuffer *buffer,
- GtkTextIter *start,
- GtkTextIter *end,
- const gchar *category)
+gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer,
+ GtkTextIter *start,
+ GtkTextIter *end,
+ const gchar *category)
{
GtkTextIter iter;
GSList *list;
@@ -1786,19 +1786,19 @@
iter = *start;
- list = gtk_source_buffer_get_marks_at_iter (buffer,
- &iter,
- category);
-
- while (gtk_source_buffer_forward_iter_to_mark (buffer,
- &iter,
- category))
+ list = gtk_source_buffer_get_source_marks_at_iter (buffer,
+ &iter,
+ category);
+
+ while (gtk_source_buffer_forward_iter_to_source_mark (buffer,
+ &iter,
+ category))
{
if (gtk_text_iter_compare (&iter, end) <= 0)
{
- l = gtk_source_buffer_get_marks_at_iter (buffer,
- &iter,
- category);
+ l = gtk_source_buffer_get_source_marks_at_iter (buffer,
+ &iter,
+ category);
list = g_slist_concat (list, l);
}
Modified: trunk/gtksourceview/gtksourcebuffer.h
==============================================================================
--- trunk/gtksourceview/gtksourcebuffer.h (original)
+++ trunk/gtksourceview/gtksourcebuffer.h Fri Feb 1 15:54:09 2008
@@ -110,23 +110,27 @@
void gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer);
/* Mark methods */
-GtkSourceMark *gtk_source_buffer_create_mark (GtkSourceBuffer *buffer,
+GtkSourceMark *gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer,
const gchar *name,
const gchar *category,
const GtkTextIter *where);
-gboolean gtk_source_buffer_forward_iter_to_mark (GtkSourceBuffer *buffer,
+gboolean gtk_source_buffer_forward_iter_to_source_mark
+ (GtkSourceBuffer *buffer,
GtkTextIter *iter,
const gchar *category);
-gboolean gtk_source_buffer_backward_iter_to_mark(GtkSourceBuffer *buffer,
+gboolean gtk_source_buffer_backward_iter_to_source_mark
+ (GtkSourceBuffer *buffer,
GtkTextIter *iter,
const gchar *category);
-GSList *gtk_source_buffer_get_marks_at_iter (GtkSourceBuffer *buffer,
+GSList *gtk_source_buffer_get_source_marks_at_iter
+ (GtkSourceBuffer *buffer,
GtkTextIter *iter,
const gchar *category);
-GSList *gtk_source_buffer_get_marks_at_line (GtkSourceBuffer *buffer,
+GSList *gtk_source_buffer_get_source_marks_at_line
+ (GtkSourceBuffer *buffer,
gint line,
const gchar *category);
-void gtk_source_buffer_remove_marks (GtkSourceBuffer *buffer,
+void gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end,
const gchar *category);
@@ -136,10 +140,10 @@
const GtkTextIter *end,
gboolean synchronous);
-GtkSourceMark *_gtk_source_buffer_mark_next (GtkSourceBuffer *buffer,
+GtkSourceMark *_gtk_source_buffer_source_mark_next (GtkSourceBuffer *buffer,
GtkSourceMark *mark,
const gchar *category);
-GtkSourceMark *_gtk_source_buffer_mark_prev (GtkSourceBuffer *buffer,
+GtkSourceMark *_gtk_source_buffer_source_mark_prev (GtkSourceBuffer *buffer,
GtkSourceMark *mark,
const gchar *category);
G_END_DECLS
Modified: trunk/gtksourceview/gtksourcemark.c
==============================================================================
--- trunk/gtksourceview/gtksourcemark.c (original)
+++ trunk/gtksourceview/gtksourcemark.c Fri Feb 1 15:54:09 2008
@@ -183,7 +183,6 @@
*
* Since: 2.2
*/
-
GtkSourceMark *
gtk_source_mark_next (GtkSourceMark *mark,
const gchar *category)
@@ -194,8 +193,8 @@
buffer = gtk_text_mark_get_buffer (GTK_TEXT_MARK (mark));
if (buffer != NULL)
- return _gtk_source_buffer_mark_next (GTK_SOURCE_BUFFER (buffer),
- mark, category);
+ return _gtk_source_buffer_source_mark_next (GTK_SOURCE_BUFFER (buffer),
+ mark, category);
else
return NULL;
}
@@ -224,8 +223,8 @@
buffer = gtk_text_mark_get_buffer (GTK_TEXT_MARK (mark));
if (buffer != NULL)
- return _gtk_source_buffer_mark_prev (GTK_SOURCE_BUFFER (buffer),
- mark, category);
+ return _gtk_source_buffer_source_mark_prev (GTK_SOURCE_BUFFER (buffer),
+ mark, category);
else
return NULL;
}
Modified: trunk/gtksourceview/gtksourceview.c
==============================================================================
--- trunk/gtksourceview/gtksourceview.c (original)
+++ trunk/gtksourceview/gtksourceview.c Fri Feb 1 15:54:09 2008
@@ -1378,9 +1378,9 @@
{
GSList *marks;
- marks = gtk_source_buffer_get_marks_at_line (view->priv->source_buffer,
- line_to_paint,
- NULL);
+ marks = gtk_source_buffer_get_source_marks_at_line (view->priv->source_buffer,
+ line_to_paint,
+ NULL);
if (marks != NULL)
{
Modified: trunk/tests/test-widget.c
==============================================================================
--- trunk/tests/test-widget.c (original)
+++ trunk/tests/test-widget.c Fri Feb 1 15:54:09 2008
@@ -302,7 +302,7 @@
gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &s, &e);
- gtk_source_buffer_remove_marks (buffer, &s, &e, NULL);
+ gtk_source_buffer_remove_source_marks (buffer, &s, &e, NULL);
}
/* Note this is wrong for several reasons, e.g. g_pattern_match is broken
@@ -1143,9 +1143,9 @@
NULL);
/* get the marks already in the line */
- mark_list = gtk_source_buffer_get_marks_at_line (buffer,
- gtk_text_iter_get_line (&line_start),
- mark_type);
+ mark_list = gtk_source_buffer_get_source_marks_at_line (buffer,
+ gtk_text_iter_get_line (&line_start),
+ mark_type);
if (mark_list != NULL)
{
@@ -1156,8 +1156,10 @@
else
{
/* no mark found: create one */
- gtk_source_buffer_create_mark (buffer, NULL,
- mark_type, &line_start);
+ gtk_source_buffer_create_source_mark (buffer,
+ NULL,
+ mark_type,
+ &line_start);
}
g_slist_free (mark_list);
@@ -1195,7 +1197,7 @@
if (style_scheme)
gtk_source_buffer_set_style_scheme (buffer, style_scheme);
- g_signal_connect (buffer, "mark_set", G_CALLBACK (move_cursor_cb), view);
+ g_signal_connect (buffer, "mark-set", G_CALLBACK (move_cursor_cb), view);
g_signal_connect (buffer, "changed", G_CALLBACK (update_cursor_position), view);
g_signal_connect (view, "button-press-event", G_CALLBACK (button_press_cb), NULL);
g_signal_connect (window, "delete-event", (GCallback) window_deleted_cb, view);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
