[Xfce4-commits] [apps/xfce4-screensaver] 372/425: Try to make prefs a XfceTitledDialog

[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 e96a25a39296f21624442ef0284a4f3a40fae540
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Oct 8 00:49:55 2018 +0200

    Try to make prefs a XfceTitledDialog
    
    Somehow this isn't enough.
---
 configure.ac                          | 12 +++++++-----
 data/xfce4-screensaver-preferences.ui |  7 +++++--
 src/xfce4-screensaver-preferences.c   |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index a321123..431d76a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ X11_REQUIRED_VERSION=1.0
 LIBXKLAVIER_REQUIRED=5.2
 XRANDR_REQUIRED=1.3
 LIBXFCONF_REQUIRED=4.13.0
+LIBXFCE4UI_REQUIRED=4.13.0
 
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(crypt.h sys/select.h)
@@ -98,7 +99,8 @@ AC_SUBST(XFCE_SCREENSAVER_DIALOG_LIBS)
 PKG_CHECK_MODULES(XFCE_SCREENSAVER_CAPPLET,
         gio-2.0 >= $GLIB_REQUIRED_VERSION
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        libxklavier >= $LIBXKLAVIER_REQUIRED)
+        libxklavier >= $LIBXKLAVIER_REQUIRED
+        libxfce4ui-2 >= $LIBXFCE4UI_REQUIRED)
 AC_SUBST(XFCE_SCREENSAVER_CAPPLET_CFLAGS)
 AC_SUBST(XFCE_SCREENSAVER_CAPPLET_LIBS)
 
@@ -207,7 +209,7 @@ dnl ---------------------------------------------------------------------------
 #
 AC_DEFUN([AC_CHECK_X_HEADER], [
   ac_save_CPPFLAGS="$CPPFLAGS"
-  if test \! -z "$includedir" ; then 
+  if test \! -z "$includedir" ; then
     CPPFLAGS="$CPPFLAGS -I$includedir"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -218,7 +220,7 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
 #
 AC_DEFUN([AC_TRY_X_COMPILE], [
   ac_save_CPPFLAGS="$CPPFLAGS"
-  if test \! -z "$includedir" ; then 
+  if test \! -z "$includedir" ; then
     CPPFLAGS="$CPPFLAGS -I$includedir"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -234,7 +236,7 @@ AC_DEFUN([AC_CHECK_X_LIB], [
   ac_save_LDFLAGS="$LDFLAGS"
 #  ac_save_LIBS="$LIBS"
 
-  if test \! -z "$includedir" ; then 
+  if test \! -z "$includedir" ; then
     CPPFLAGS="$CPPFLAGS -I$includedir"
   fi
   # note: $X_CFLAGS includes $x_includes
@@ -349,7 +351,7 @@ if test "$with_mit" = yes; then
 
     if test "$have_mit" = no; then
       # Looks like some versions of XFree86 (whichever version
-      # it is that comes with RedHat Linux 2.0 -- I can't find a version 
+      # it is that comes with RedHat Linux 2.0 -- I can't find a version
       # number) put this in Xss instead of Xext.
       AC_CHECK_X_LIB(Xss, XScreenSaverRegister,
                      [have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXss"],
diff --git a/data/xfce4-screensaver-preferences.ui b/data/xfce4-screensaver-preferences.ui
index 0ee2423..21cb886 100644
--- a/data/xfce4-screensaver-preferences.ui
+++ b/data/xfce4-screensaver-preferences.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.14"/>
+  <requires lib="libxfce4ui-2" version="4.13"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name xfce4-screensaver -->
   <!-- interface-description screensaver preferences -->
@@ -157,14 +158,16 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-fullscreen</property>
   </object>
-  <object class="GtkDialog" id="prefs_dialog">
+  <object class="XfceTitledDialog" id="prefs_dialog">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Screensaver Preferences</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
+    <property name="icon_name">preferences-desktop-screensaver</property>
     <property name="type_hint">dialog</property>
+    <property name="subtitle" translatable="yes">Configure your screensaver and locker</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 2844ea0..9a47f7a 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -36,6 +36,8 @@
 
 #include <gio/gio.h>
 
+#include <libxfce4ui/libxfce4ui.h>
+
 #include "xfce-desktop-utils.h"
 
 #include "gs-debug.h"

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