From 85c9f3b2eb28ec765005868fdb73845f6a761cc9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 10:31:24 +0600 Subject: [PATCH] Fixed crash in settings manager, Fixed version and --help argument --- Makefile | 2 +- source/main.cc | 6 +++--- source/ubl-settings-datetime.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 935a97e..f2cc6a5 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) -FILE_VER = source/${PKGNAME}.h +FILE_VER = source/${PKGNAME}.cc PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) default_target: all diff --git a/source/main.cc b/source/main.cc index 74d2ff0..b1d135b 100644 --- a/source/main.cc +++ b/source/main.cc @@ -10,8 +10,8 @@ int main(int argc, char* argv[]) { } if (geteuid() != 0){ string cmd = ""; - cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv; - return system(cmd.c_str()); + // cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv; + // return system(cmd.c_str()); } setlocale(LC_ALL, ""); bindtextdomain("ubl-settings-datetime", "/usr/share/locale/"); @@ -25,7 +25,7 @@ int main(int argc, char* argv[]) { pars_flag(3, argc, argv); auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); - auto builder = Gtk::Builder::create_from_file(path_glade); + auto builder = Gtk::Builder::create_from_resource(path_glade); Glib::init(); setlocale(LC_ALL, ""); Glib::OptionContext context; diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index edb22d4..4b9dfc1 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -13,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = ""; +string version_application; MainWindow* obj_main; void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) { if (self && user_data) {}