Fixed crash in settings manager, Fixed version and --help argument

pull/133/head
parent 9a1e064ead
commit 85c9f3b2eb

@ -11,7 +11,7 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
DEPENDS = /bin/cmake DEPENDS = /bin/cmake
PREFIX ?= /usr/local PREFIX ?= /usr/local
PKGNAME = $(MAKEFILE_DIR) PKGNAME = $(MAKEFILE_DIR)
FILE_VER = source/${PKGNAME}.h FILE_VER = source/${PKGNAME}.cc
PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
default_target: all default_target: all

@ -10,8 +10,8 @@ int main(int argc, char* argv[]) {
} }
if (geteuid() != 0){ if (geteuid() != 0){
string cmd = ""; string cmd = "";
cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv; // cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
return system(cmd.c_str()); // return system(cmd.c_str());
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
bindtextdomain("ubl-settings-datetime", "/usr/share/locale/"); bindtextdomain("ubl-settings-datetime", "/usr/share/locale/");
@ -25,7 +25,7 @@ int main(int argc, char* argv[]) {
pars_flag(3, argc, argv); pars_flag(3, argc, argv);
auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); 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(); Glib::init();
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
Glib::OptionContext context; Glib::OptionContext context;

@ -13,7 +13,7 @@ bool flag_load_global = false;
bool flag_sync_hwclock = false; bool flag_sync_hwclock = false;
int socket_ext_id_I = 0; int socket_ext_id_I = 0;
int socket_trd_id_I = 0; int socket_trd_id_I = 0;
string version_application = ""; string version_application;
MainWindow* obj_main; MainWindow* obj_main;
void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) { void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {
if (self && user_data) {} if (self && user_data) {}

Loading…
Cancel
Save