Skip to content

GtkSourceView-4 compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SergioHdzReyes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GtkSourceView-4 compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ IT_PROG_INTLTOOL([0.40])
GLIB_GSETTINGS

PKG_CHECK_MODULES([GTK], [glib-2.0 gmodule-2.0 gtk+-3.0], , exit)
PKG_CHECK_MODULES([SOURCEVIEW], [gtksourceview-3.0], , exit)
PKG_CHECK_MODULES([SOURCEVIEW], [gtksourceview-4], , exit)

# Needed by intltool
GETTEXT_PACKAGE=${PACKAGE_TARNAME}
Expand Down
6 changes: 3 additions & 3 deletions src/simplEdit_search_dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void smpldt_searchdlg_clbk_search (GtkMenuItem *menuitem, gpointer user_data) {
gtk_source_search_settings_set_search_text(pDialog->pSearchSettings,
gtk_entry_get_text(GTK_ENTRY(pDialog->txtSearchText)));

if (gtk_source_search_context_forward2(pDialog->pSearchContext, pDialog->pStartIter, pDialog->pStartIter, pEndIter, NULL)) {
if (gtk_source_search_context_forward(pDialog->pSearchContext, pDialog->pStartIter, pDialog->pStartIter, pEndIter, NULL)) {
gtk_text_buffer_move_mark_by_name(GTK_TEXT_BUFFER(pSrcBuff), "selection_bound", pDialog->pStartIter);
gtk_text_buffer_move_mark_by_name(GTK_TEXT_BUFFER(pSrcBuff), "insert", pEndIter);
gtk_text_iter_assign(pDialog->pStartIter, pEndIter);
Expand Down Expand Up @@ -155,8 +155,8 @@ void smpldt_searchdlg_clbk_replace (GtkMenuItem *menuitem, gpointer user_data) {

pcReplace = gtk_entry_get_text(GTK_ENTRY(pDialog->txtReplaceText));

if (gtk_source_search_context_forward2(pDialog->pSearchContext, pDialog->pStartIter, pDialog->pStartIter, pEndIter, NULL)) {
if (gtk_source_search_context_replace2(pDialog->pSearchContext, pDialog->pStartIter, pEndIter, pcReplace, -1, &pErr)) {
if (gtk_source_search_context_forward(pDialog->pSearchContext, pDialog->pStartIter, pDialog->pStartIter, pEndIter, NULL)) {
if (gtk_source_search_context_replace(pDialog->pSearchContext, pDialog->pStartIter, pEndIter, pcReplace, -1, &pErr)) {
gtk_text_buffer_move_mark_by_name(GTK_TEXT_BUFFER(pSrcBuff), "selection_bound", pDialog->pStartIter);
gtk_text_buffer_move_mark_by_name(GTK_TEXT_BUFFER(pSrcBuff), "insert", pEndIter);
gtk_text_iter_assign(pDialog->pStartIter, pEndIter);
Expand Down