From a231791f3d04628becda2461a520a4f205374e43 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 16:50:00 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20.so=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/my_localization.h | 1 - source/ubl-settings-datetime.cc | 24 ++++++++++++++++++------ source/ubl-settings-datetime.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/source/my_localization.h b/source/my_localization.h index 8448c4d..4d2c4bd 100644 --- a/source/my_localization.h +++ b/source/my_localization.h @@ -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") diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 06d9e32..04f89c1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -93,9 +93,13 @@ void MainWindow::settings() { this->lacalization(); btnBoxAboutDialog->set_visible(false); #ifdef WEBKIT_FOUND - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); - wndWeb->add(*three); + 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 - builder->get_widget("wndWeb", wndWeb); + 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 - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); + 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 = ""; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 3f61e1f..703b510 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -22,6 +22,7 @@ #include "ubl-settings-datetime-cm.h" #include "my_localization.h" #ifdef WEBKIT_FOUND +#include #include #endif