diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2021-02-12 14:17:09 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2021-02-12 14:17:09 +0300 |
| commit | 0ab8dd852e71adb74e82e815c33181ecca06b343 (patch) | |
| tree | 6a6b4fbdbd234a16366cdd5cc22e5326f0e4b3de /src | |
| parent | 6b7b269300e51418be6b346f9043475e9f5b6a1b (diff) | |
CMake refactoring
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/remmina_main.c | 1 | ||||
| -rw-r--r-- | src/remmina_public.c | 15 | ||||
| -rw-r--r-- | src/remmina_public.h | 3 |
4 files changed, 20 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0cdba7659..294a8edbe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,7 +161,7 @@ endif() message(DEBUG "Source list set to: " ${REMMINA_SRCS}) add_executable(remmina ${REMMINA_SRCS}) -include_directories(${GTK_INCLUDE_DIRS} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS}) +#include_directories(${GTK_INCLUDE_DIRS} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS}) target_link_libraries(remmina ${GTK_LIBRARIES}) if(WITH_PYTHONLIBS) diff --git a/src/remmina_main.c b/src/remmina_main.c index 05155611a..aa833d78a 100644 --- a/src/remmina_main.c +++ b/src/remmina_main.c @@ -1385,6 +1385,7 @@ GtkWidget *remmina_main_new(void) remminamain->priv = g_new0(RemminaMainPriv, 1); /* Assign UI widgets to the private members */ remminamain->builder = remmina_public_gtk_builder_new_from_file("remmina_main.glade"); + //remminamain->builder = remmina_public_gtk_builder_new_from_resource ("/org.remmina.Remmina/data/ui/remmina_main.glade"); remminamain->window = GTK_WINDOW(RM_GET_OBJECT("RemminaMain")); if (kioskmode && kioskmode == TRUE) { gtk_window_set_position(remminamain->window, GTK_WIN_POS_CENTER_ALWAYS); diff --git a/src/remmina_public.c b/src/remmina_public.c index 25a058ad6..bb29f9837 100644 --- a/src/remmina_public.c +++ b/src/remmina_public.c @@ -573,6 +573,21 @@ GtkBuilder* remmina_public_gtk_builder_new_from_file(gchar *filename) return builder; } +/* Load a GtkBuilder object from a resource */ +GtkBuilder* remmina_public_gtk_builder_new_from_resource(gchar *resource) +{ + TRACE_CALL(__func__); + GError *err = NULL; + GtkBuilder *builder = gtk_builder_new(); + gtk_builder_add_from_resource (builder, resource, &err); + if (err != NULL) { + g_print("Error adding build from resource. Error: %s", err->message); + g_error_free(err); + } + return builder; +} + + /* Change parent container for a widget * If possible use this function instead of the deprecated gtk_widget_reparent */ void remmina_public_gtk_widget_reparent(GtkWidget *widget, GtkContainer *container) diff --git a/src/remmina_public.h b/src/remmina_public.h index de58e2e1e..445dacdcd 100644 --- a/src/remmina_public.h +++ b/src/remmina_public.h @@ -37,6 +37,7 @@ #pragma once #include "config.h" +#include <gtk/gtk.h> #define IDLE_ADD gdk_threads_add_idle #define TIMEOUT_ADD gdk_threads_add_timeout @@ -102,6 +103,8 @@ guint16 remmina_public_get_keycode_for_keyval(GdkKeymap *keymap, guint keyval); gboolean remmina_public_get_modifier_for_keycode(GdkKeymap *keymap, guint16 keycode); /* Load a GtkBuilder object from a filename */ GtkBuilder *remmina_public_gtk_builder_new_from_file(gchar *filename); +/* Load a GtkBuilder object from a resource */ +GtkBuilder *remmina_public_gtk_builder_new_from_resource(gchar *resource); /* Change parent container for a widget */ void remmina_public_gtk_widget_reparent(GtkWidget *widget, GtkContainer *container); /* Used to send desktop notifications */ |