summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/view.h2
-rw-r--r--src/controller.cpp10
-rw-r--r--src/feedlist_formaction.cpp4
-rw-r--r--src/itemlist_formaction.cpp7
-rw-r--r--src/itemview_formaction.cpp9
-rw-r--r--src/list_formaction.cpp9
-rw-r--r--src/urlview_formaction.cpp6
-rw-r--r--src/view.cpp14
8 files changed, 17 insertions, 44 deletions
diff --git a/include/view.h b/include/view.h
index 468d68ec..fdf0349d 100644
--- a/include/view.h
+++ b/include/view.h
@@ -68,7 +68,7 @@ class view {
std::string select_filter(const std::vector<filter_name_expr_pair>& filters);
bool open_in_browser(const std::string& url);
- bool open_in_pager(const std::string& filename);
+ void open_in_pager(const std::string& filename);
std::string get_filename_suggestion(const std::string& s);
diff --git a/src/controller.cpp b/src/controller.cpp
index a712a776..40db06c5 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1317,18 +1317,10 @@ void controller::edit_urls_file() {
v->push_empty_formaction();
stfl::reset();
- int editor_exit_code = utils::run_interactively(cmdline, "controller::edit_urls_file");
- if (editor_exit_code != 0) {
- LOG(level::DEBUG, "utils::run_interactively: "
- "The editor failed with error code %d - command was %s", editor_exit_code, cmdline);
- }
+ utils::run_interactively(cmdline, "controller::edit_urls_file");
v->pop_current_formaction();
- if (editor_exit_code != 0) {
- v->show_error(_("Editor failed to open url file!"));
- }
-
reload_urls_file();
}
diff --git a/src/feedlist_formaction.cpp b/src/feedlist_formaction.cpp
index eb484d9d..a74f405d 100644
--- a/src/feedlist_formaction.cpp
+++ b/src/feedlist_formaction.cpp
@@ -162,9 +162,7 @@ REDO:
if (feed) {
if (feed->rssurl().substr(0,6) != "query:") {
LOG(level::INFO, "feedlist_formaction: opening feed at position `%s': %s", feedpos, feed->link());
- if (!v->open_in_browser(feed->link()))
- v->show_error(_("Browser failed to open the link!"));
-
+ v->open_in_browser(feed->link());
} else {
v->show_error(_("Cannot open query feeds in the browser!"));
}
diff --git a/src/itemlist_formaction.cpp b/src/itemlist_formaction.cpp
index 06be6e85..8869f315 100644
--- a/src/itemlist_formaction.cpp
+++ b/src/itemlist_formaction.cpp
@@ -85,7 +85,8 @@ void itemlist_formaction::process_operation(operation op, bool automatic, std::v
if (itemposname.length() > 0 && visible_items.size() != 0) {
if (itempos < visible_items.size()) {
- if (!v->open_in_browser(visible_items[itempos].first->link())) {
+ bool browser_success = v->open_in_browser(visible_items[itempos].first->link());
+ if (!browser_success) {
v->show_error(_("Browser failed to open the link!"));
break;
}
@@ -111,9 +112,7 @@ void itemlist_formaction::process_operation(operation op, bool automatic, std::v
LOG(level::INFO, "itemlist_formaction: opening item at pos `%s'", itemposname);
if (itemposname.length() > 0 && visible_items.size() != 0) {
if (itempos < visible_items.size()) {
- if (!v->open_in_browser(visible_items[itempos].first->link()))
- v->show_error(_("Browser failed to open the link!"));
-
+ v->open_in_browser(visible_items[itempos].first->link());
invalidate(itempos);
}
} else {
diff --git a/src/itemview_formaction.cpp b/src/itemview_formaction.cpp
index b006dcc3..274e2b47 100644
--- a/src/itemview_formaction.cpp
+++ b/src/itemview_formaction.cpp
@@ -211,8 +211,7 @@ void itemview_formaction::process_operation(operation op, bool automatic, std::v
case OP_OPENINBROWSER:
LOG(level::INFO, "view::run_itemview: starting browser");
v->set_status(_("Starting browser..."));
- if (!v->open_in_browser(item->link()))
- v->show_error(_("Browser failed to open the link!"));
+ v->open_in_browser(item->link());
v->set_status("");
break;
case OP_BOOKMARK:
@@ -371,8 +370,7 @@ void itemview_formaction::process_operation(operation op, bool automatic, std::v
LOG(level::DEBUG, "itemview::run: OP_1 = %d op = %d idx = %u", OP_1, op, idx);
if (idx < links.size()) {
v->set_status(_("Starting browser..."));
- if (!v->open_in_browser(links[idx].first))
- v->show_error(_("Browser failed to open the link!"));
+ v->open_in_browser(links[idx].first);
v->set_status("");
}
}
@@ -520,8 +518,7 @@ void itemview_formaction::finished_qna(operation op) {
sscanf(qna_responses[0].c_str(),"%u",&idx);
if (idx && idx-1 < links.size()) {
v->set_status(_("Starting browser..."));
- if (!v->open_in_browser(links[idx-1].first))
- v->show_error(_("Browser failed to open the link!"));
+ v->open_in_browser(links[idx-1].first);
v->set_status("");
}
}
diff --git a/src/list_formaction.cpp b/src/list_formaction.cpp
index 85762664..6f156562 100644
--- a/src/list_formaction.cpp
+++ b/src/list_formaction.cpp
@@ -12,12 +12,9 @@ void list_formaction::open_unread_items_in_browser(std::shared_ptr<rss_feed> fee
for (auto item : feed->items()) {
if (tabcount < v->get_cfg()->get_configvalue_as_int("max-browser-tabs")) {
if (item->unread()) {
- if (v->open_in_browser(item->link())) {
- tabcount += 1;
- item->set_unread(!markread);
- } else {
- v->show_error(_("Browser failed to open the link!"));
- }
+ v->open_in_browser(item->link());
+ tabcount += 1;
+ item->set_unread(!markread);
}
} else {
break;
diff --git a/src/urlview_formaction.cpp b/src/urlview_formaction.cpp
index c3b85cda..4b34eb8f 100644
--- a/src/urlview_formaction.cpp
+++ b/src/urlview_formaction.cpp
@@ -30,8 +30,7 @@ void urlview_formaction::process_operation(operation op, bool /* automatic */, s
if (posstr.length() > 0) {
unsigned int idx = utils::to_u(posstr, 0);
v->set_status(_("Starting browser..."));
- if (!v->open_in_browser(links[idx].first))
- v->show_error(_("Browser failed to open the link!"));
+ v->open_in_browser(links[idx].first);
v->set_status("");
} else {
v->show_error(_("No link selected!"));
@@ -64,8 +63,7 @@ void urlview_formaction::process_operation(operation op, bool /* automatic */, s
if (idx < links.size()) {
v->set_status(_("Starting browser..."));
- if (!v->open_in_browser(links[idx].first))
- v->show_error(_("Browser failed to open the link!"));
+ v->open_in_browser(links[idx].first);
v->set_status("");
}
}
diff --git a/src/view.cpp b/src/view.cpp
index 64c6cec0..1ae5c0b9 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -311,7 +311,7 @@ void view::push_empty_formaction() {
current_formaction = formaction_stack_size() - 1;
}
-bool view::open_in_pager(const std::string& filename) {
+void view::open_in_pager(const std::string& filename) {
formaction_stack.push_back(std::shared_ptr<formaction>());
current_formaction = formaction_stack_size() - 1;
std::string cmdline;
@@ -332,13 +332,8 @@ bool view::open_in_pager(const std::string& filename) {
cmdline.append(filename);
}
stfl::reset();
- int pager_exit_code = utils::run_interactively(cmdline, "view::open_in_pager");
- if (pager_exit_code != 0) {
- LOG(level::DEBUG, "utils::run_interactively: "
- "Starting the pager failed with error code %d - command was %s", pager_exit_code, cmdline);
- }
+ utils::run_interactively(cmdline, "view::open_in_pager");
pop_current_formaction();
- return pager_exit_code == 0;
}
bool view::open_in_browser(const std::string& url) {
@@ -485,10 +480,7 @@ void view::push_itemview(std::shared_ptr<rss_feed> f, const std::string& guid, c
} else {
std::shared_ptr<rss_item> item = f->get_item_by_guid(guid);
std::string filename = get_ctrl()->write_temporary_item(item);
- if (!open_in_pager(filename)) {
- show_error(_("Pager failed to show the item!"));
- return;
- }
+ open_in_pager(filename);
try {
bool old_unread = item->unread();
item->set_unread(false);
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-29 00:07:47 +0000