callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inspector: remove gtk_text_buffer_get_iter_at_line_index() workaround

Browse Source 
The function is now safe to use.

https://bugzilla.gnome.org/show_bug.cgi?id=735341
This commit is contained in:
Sébastien Wilmet
2015-10-15 14:10:00 +02:00
parent a9a1c00cc9
commit 9d3e9c9375
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/inspector/css-editor.c
View File

@ -249,27 +249,6 @@ text_changed (GtkTextBuffer *buffer,
ce->priv->timeout = g_timeout_add (100, update_timeout, ce); ce->priv->timeout = g_timeout_add (100, update_timeout, ce);
} }
/* Safe version of gtk_text_buffer_get_iter_at_line_index(). */
static void
safe_get_iter_at_line_index (GtkTextBuffer *buffer,
GtkTextIter *iter,
gint line_number,
gint byte_index)
{
if (line_number >= gtk_text_buffer_get_line_count (buffer))
{
gtk_text_buffer_get_end_iter (buffer, iter);
return;
}
gtk_text_buffer_get_iter_at_line (buffer, iter, line_number);
if (byte_index < gtk_text_iter_get_bytes_in_line (iter))
gtk_text_iter_set_line_index (iter, byte_index);
else
gtk_text_iter_forward_to_line_end (iter);
}
static void static void
show_parsing_error (GtkCssProvider *provider, show_parsing_error (GtkCssProvider *provider,
GtkCssSection *section, GtkCssSection *section,
@ -280,11 +259,11 @@ show_parsing_error (GtkCssProvider *provider,
const char *tag_name; const char *tag_name;
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (ce->priv->text); GtkTextBuffer *buffer = GTK_TEXT_BUFFER (ce->priv->text);
safe_get_iter_at_line_index (buffer, gtk_text_buffer_get_iter_at_line_index (buffer,
&start, &start,
gtk_css_section_get_start_line (section), gtk_css_section_get_start_line (section),
gtk_css_section_get_start_position (section)); gtk_css_section_get_start_position (section));
safe_get_iter_at_line_index (buffer, gtk_text_buffer_get_iter_at_line_index (buffer,
&end, &end,
gtk_css_section_get_end_line (section), gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section)); gtk_css_section_get_end_position (section));