update all

2 files changed, 16 insertions, 24 deletions

diff --git a/litosaccels.c b/litosaccels.c
index f65dc9c..48e18d0 100644
--- a/litosaccels.c
+++ b/litosaccels.c
@@ -296,15 +296,15 @@ void setAccels (GApplication *app)
 	  { "app.insert_html('<a href=\"this.html\">%s</a>')", { "<Control>h", NULL} },
 	  { "app.insert_html(\"<p>%s</p>\")", { "<Control>p", NULL} },
 	  { "app.insert_html(\"<li>%s</li>\")", { "<Control>l", NULL} },
-	  { "app.insert_html(\"<sup>%s</sup>\")", { "<Control><Shift>p", NULL} },
+	  { "app.insert_html(\"<sup>%s</sup>\")", { "<Control>e", NULL} },
 	  { "app.insert_html(\"<sub>%s</sub>\")", { "<Control>u", NULL} },
 	  { "app.insert_char('<div class=\"eq\">\n<p>this</p>\n</div>\')", { "<Control>g", NULL} },
 	  { "app.insert_char(\"−\")", { "<Control>m", NULL} },
 	  { "app.insert_char(\"⋅\")", { "<Control>d", NULL} },
-	  { "app.insert_char(\"⟶⟼⇒\")", { "<Control>t", NULL} },
+	  { "app.insert_char(\"⟶⟼⇒\")", { "<Control><Shift>t", NULL} },
 	  { "app.insert_char(\"⇌⟵⇐\")", { "<Control>y", NULL} },
 	  { "app.insert_char(\"<br>\")", { "<Control>r", NULL} },
-	  { "app.insert_char(\"&emsp;■□\")", { "<Control>e", NULL} },
+	  { "app.insert_char(\"&emsp;■□\")", { "<Control>t", NULL} },
 	};
 
 	g_action_map_add_action_entries(G_ACTION_MAP(app), app_entries, G_N_ELEMENTS(app_entries), app);
diff --git a/litosappwin.c b/litosappwin.c
index d451e24..dfcef8f 100644
--- a/litosappwin.c
+++ b/litosappwin.c
@@ -103,22 +103,19 @@ next_match(GtkWidget *close_btn, gpointer user_data)
 
 	if (win->search_context != NULL)
 	{
-		GtkTextIter match_start, match_end;
+		GtkSourceBuffer *buffer;
+		GtkTextIter start, end;
+		g_autoptr(GError) error = NULL;
 
-		GtkSourceView *view = currentTabSourceView(win);
+		buffer = gtk_source_search_context_get_buffer (win->search_context);
 
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view));
-		gtk_text_buffer_select_range (buffer, &match_start, &match_end);
+		gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (buffer),
+					      NULL,
+					      &start);
 
-		GtkTextMark *insert;
-
-		gtk_text_buffer_select_range (buffer,
-				      &match_start,
-				      &match_end);
+		gtk_source_search_context_forward (win->search_context, &start, NULL, &end, FALSE);
 
-		insert = gtk_text_buffer_get_insert (buffer);
-
-		gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (view), insert);	
+		gtk_text_buffer_select_range (GTK_TEXT_BUFFER (buffer), &start, &end);
 	}	
 }
 
@@ -172,18 +169,13 @@ search_text_changed (GtkEntry *entry,
 	{
 		GtkTextMark *insert;
 
-		gtk_text_buffer_select_range (buffer,
-					      &match_start,
-					      &match_end);
-
 		insert = gtk_text_buffer_get_insert (buffer);
 
-		gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (view),
-						    insert);
-		gtk_text_buffer_select_range (buffer, &match_start, &match_end);
-		gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW(view), &match_start,
-				0.0, FALSE, 0.0, 0.0);
 		gtk_text_buffer_move_mark (buffer, mark, &match_end);
+
+		gtk_text_buffer_select_range (buffer,
+					      &match_start,
+					      &match_end);
 	}
 }