diff options
| author | Sébastien Wilmet <swilmet@gnome.org> | 2015-11-12 18:20:57 +0100 |
|---|---|---|
| committer | Sébastien Wilmet <swilmet@gnome.org> | 2015-11-12 18:27:04 +0100 |
| commit | b05c5e09fd3bc18e4d868f25f30dade29bbc380c (patch) | |
| tree | ba56f9a1ca5eaa87718536f113f704667076d177 | |
| parent | 026ea90af0fd624bb6df7b3da056f8f0f78cba6b (diff) | |
| download | gedit-b05c5e09fd3bc18e4d868f25f30dade29bbc380c.tar.gz | |
GeditDocument: adapt code for get_iter_at_line_*() changes in GTK+
See:
https://git.gnome.org/browse/gtk+/commit/?id=fde91c3bece9aaea17b51ce6db8f9cb6088dbf96
The gedit code still relies on the niceness of
gtk_text_buffer_get_iter_at_line_*() functions.
| -rw-r--r-- | gedit/gedit-document.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c index 27813dc7b..f2e7f07b7 100644 --- a/gedit/gedit-document.c +++ b/gedit/gedit-document.c @@ -1475,20 +1475,19 @@ gedit_document_goto_line (GeditDocument *doc, gint line) { GtkTextIter iter; - gboolean ret; gedit_debug (DEBUG_DOCUMENT); g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), FALSE); g_return_val_if_fail (line >= -1, FALSE); - ret = gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (doc), - &iter, - line); + gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (doc), + &iter, + line); gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc), &iter); - return ret; + return gtk_text_iter_get_line (&iter) == line; } gboolean @@ -1496,21 +1495,21 @@ gedit_document_goto_line_offset (GeditDocument *doc, gint line, gint line_offset) { - gboolean ret; GtkTextIter iter; g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), FALSE); g_return_val_if_fail (line >= -1, FALSE); g_return_val_if_fail (line_offset >= -1, FALSE); - ret = gtk_text_buffer_get_iter_at_line_offset (GTK_TEXT_BUFFER (doc), - &iter, - line, - line_offset); + gtk_text_buffer_get_iter_at_line_offset (GTK_TEXT_BUFFER (doc), + &iter, + line, + line_offset); gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc), &iter); - return ret; + return (gtk_text_iter_get_line (&iter) == line && + gtk_text_iter_get_line_offset (&iter) == line_offset); } /** |