summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Wilmet <swilmet@informatique-libre.be>2023-03-21 16:00:00 +0100
committerSébastien Wilmet <swilmet@informatique-libre.be>2023-03-21 16:00:00 +0100
commit68d8602806feba07f2a6d2b8f08def9378a48015 (patch)
treeaf241adb0556d37b91206704146e120b0ae4be52
parentfcceaa7ce6d87f954575b3a4d77155dc254f5fa9 (diff)
downloadgedit-68d8602806feba07f2a6d2b8f08def9378a48015.tar.gz
commands-file: use gedit_tab_load_file()
gedit_window_create_tab_from_location() is going away. Also, the created tab cannot be NULL, so simplify the code.
-rw-r--r--gedit/gedit-commands-file.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index ce9012329..b4920e837 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -220,24 +220,21 @@ load_file_list (GeditWindow *window,
{
g_return_val_if_fail (l->data != NULL, NULL);
- tab = gedit_window_create_tab_from_location (window,
- l->data,
- encoding,
- line_pos,
- column_pos,
- create,
- jump_to);
-
- if (tab != NULL)
- {
- jump_to = FALSE;
+ tab = gedit_window_create_tab (window, jump_to);
+ gedit_tab_load_file (tab,
+ l->data,
+ encoding,
+ line_pos,
+ column_pos,
+ create);
- ++num_loaded_files;
- loaded_files = g_slist_prepend (loaded_files,
- gedit_tab_get_document (tab));
- }
+ jump_to = FALSE;
+
+ num_loaded_files++;
+ loaded_files = g_slist_prepend (loaded_files,
+ gedit_tab_get_document (tab));
- l = g_slist_next (l);
+ l = l->next;
}
loaded_files = g_slist_reverse (loaded_files);