Добавлена проверка .so библиотеки

pull/107/head
Igor Belitskiy 3 years ago
parent 624ca395d7
commit a231791f3d

@ -9,7 +9,6 @@
#define str_about_1 _("About")
#define str_about _("About ubl-settings-datetime")
#define str_help _("Help")
#define str_about_1 _("About")
#define str_save _("Save")
#define str_load _("Load")
#define save_all _("Save to global and local configuration")

@ -93,9 +93,13 @@ void MainWindow::settings() {
this->lacalization();
btnBoxAboutDialog->set_visible(false);
#ifdef WEBKIT_FOUND
void *handle=NULL;
handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY);
if (handle) {
one = WEBKIT_WEB_VIEW( webkit_web_view_new() );
three = Glib::wrap(GTK_WIDGET(one));
wndWeb->add(*three);
}
#endif
if (geteuid() == 0) {
numTimeHrs->set_range(0, 23);
@ -325,7 +329,11 @@ void MainWindow::get_builder() {
builder->get_widget("overHead", overHead);
builder->get_widget("imgHeadBackground", imgHeadBackground);
#ifdef WEBKIT_FOUND
void *handle=NULL;
handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY);
if (handle) {
builder->get_widget("wndWeb", wndWeb);
}
#endif
builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb);
builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic);
@ -422,8 +430,12 @@ void MainWindow::synopsis_show() {
void MainWindow::open_browser() {
#ifdef WEBKIT_FOUND
void *handle=NULL;
handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY);
if (handle) {
webkit_web_view_load_uri(one, link_doc);
wndWeb->show_all();
}
#else
string cmd = cmd_xdg + string(_(link_doc)) + " &";
string buf = "";

@ -22,6 +22,7 @@
#include "ubl-settings-datetime-cm.h"
#include "my_localization.h"
#ifdef WEBKIT_FOUND
#include <dlfcn.h>
#include <webkit2/webkit2.h>
#endif

Loading…
Cancel
Save