[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Compile and include the preferences ui file

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 983258d556477ca5e9abf76dbd711998aaa7a32a
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Oct 27 07:43:14 2018 -0400

    Compile and include the preferences ui file
---
 .gitignore                                     |  1 +
 data/Makefile.am                               |  6 ------
 po/POTFILES.in                                 |  2 +-
 src/Makefile.am                                | 15 +++++++++++++--
 src/xfce4-screensaver-preferences.c            | 12 +++++-------
 {data => src}/xfce4-screensaver-preferences.ui |  0
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82d5a8f..9f9b4c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,5 @@ src/xfce4-screensaver-dialog-css.h
 src/xfce4-screensaver-dialog-ui.h
 src/xfce4-screensaver-gl-helper
 src/xfce4-screensaver-preferences
+src/xfce4-screensaver-preferences-ui.h
 src/xfce4-screensaver.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 1bd668a..869a0cf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,11 +28,6 @@ menu_DATA =					\
 	xfce4-screensavers.menu			\
 	$(NULL)
 
-gtkbuilderdir = $(pkgdatadir)
-gtkbuilder_DATA = 					\
-	xfce4-screensaver-preferences.ui	\
-	$(NULL)
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfce4-screensaver.pc
 
@@ -44,7 +39,6 @@ dbussessionservice_DATA = org.xfce.ScreenSaver.service
 EXTRA_DIST = 				\
 	$(desktop_in_files)		\
 	$(directory_in_files)		\
-	$(gtkbuilder_DATA)		\
 	$(man_MANS)			\
 	xfce4-screensaver.common-auth		\
 	xfce4-screensaver.system-auth		\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 323c1a4..56570da 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/xfce4-screensaver-preferences.desktop.in
-[type: gettext/glade]data/xfce4-screensaver-preferences.ui
 data/xfce4-screensaver.directory.in
 savers/floaters.c
 savers/xfce-floaters.desktop.in.in
@@ -18,6 +17,7 @@ src/xfce4-screensaver-command.c
 src/xfce4-screensaver-dialog.c
 [type: gettext/glade]src/xfce4-screensaver-dialog.ui
 src/xfce4-screensaver-preferences.c
+[type: gettext/glade]src/xfce4-screensaver-preferences.ui
 src/xfce4-screensaver.c
 src/xfce4-screensaver.desktop.in.in
 src/xfcekbd-indicator.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c3fa3f..208d0f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -269,7 +269,11 @@ xfce4_screensaver_LDADD =		\
 
 xfce4_screensaver_LDFLAGS = -export-dynamic
 
+xfce4_screensaver_preferences_built_sources = \
+	xfce4-screensaver-preferences-ui.h
+
 xfce4_screensaver_preferences_SOURCES =	\
+	$(xfce4_screensaver_preferences_built_sources)	\
 	xfce4-screensaver-preferences.c	\
 	copy-theme-dialog.c		\
 	copy-theme-dialog.h		\
@@ -306,11 +310,16 @@ xfce4-screensaver-dialog-css.h: $(srcdir)/xfce4-screensaver-dialog.css Makefile
 xfce4-screensaver-dialog-ui.h: $(srcdir)/xfce4-screensaver-dialog.ui Makefile
 	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfce4_screensaver_dialog_ui $< >$@
 
+xfce4-screensaver-preferences-ui.h: $(srcdir)/xfce4-screensaver-preferences.ui Makefile
+	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfce4_screensaver_preferences_ui $< >$@
+
 DISTCLEANFILES = \
-	$(xfce4_screensaver_dialog_built_sources)
+	$(xfce4_screensaver_dialog_built_sources)	\
+	$(xfce4_screensaver_preferences_built_sources)
 
 BUILT_SOURCES += \
-	$(xfce4_screensaver_dialog_built_sources)
+	$(xfce4_screensaver_dialog_built_sources)	\
+	$(xfce4_screensaver_preferences_built_sources)
 
 endif
 
@@ -320,6 +329,8 @@ EXTRA_DIST =				\
 	xfcekbd-indicator-marshal.list	\
 	xfce4-screensaver.desktop.in	\
 	xfce4-screensaver-dialog.css	\
+	xfce4-screensaver-dialog.ui	\
+	xfce4-screensaver-preferences.ui	\
 	$(NULL)
 
 GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index ff9cc81..76d8f73 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -48,9 +48,9 @@
 #include "gs-job.h"
 #include "gs-prefs.h" /* for GS_MODE enum */
 
-#include <xfconf/xfconf.h>
+#include "xfce4-screensaver-preferences-ui.h"
 
-#define GTK_BUILDER_FILE "xfce4-screensaver-preferences.ui"
+#include <xfconf/xfconf.h>
 
 #define GPM_COMMAND "xfce4-power-manager-settings"
 
@@ -1486,21 +1486,19 @@ init_capplet (void)
     GtkWidget *fullscreen_preview_previous;
     GtkWidget *fullscreen_preview_next;
     GtkWidget *fullscreen_preview_close;
-    char      *gtk_builder_file;
     gdouble    activate_delay;
     gboolean   enabled;
     gboolean   is_writable;
     GError    *error=NULL;
     gint       mode;
 
-    gtk_builder_file = g_build_filename (GTKBUILDERDIR, GTK_BUILDER_FILE, NULL);
     builder = gtk_builder_new();
-    if (!gtk_builder_add_from_file(builder, gtk_builder_file, &error))
+    if (!gtk_builder_add_from_string (builder, xfce4_screensaver_preferences_ui,
+                                      xfce4_screensaver_preferences_ui_length, &error))
     {
-        g_warning("Couldn't load builder file: %s", error->message);
+        g_warning ("Error loading UI: %s", error->message);
         g_error_free(error);
     }
-    g_free (gtk_builder_file);
 
     if (builder == NULL)
     {
diff --git a/data/xfce4-screensaver-preferences.ui b/src/xfce4-screensaver-preferences.ui
similarity index 100%
rename from data/xfce4-screensaver-preferences.ui
rename to src/xfce4-screensaver-preferences.ui

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.