[Xfce4-commits] [apps/xfce4-screensaver] 387/425: Switch to libxfce4util.h for i18n

noreply at xfce.org noreply at xfce.org
Mon Oct 15 01:53:54 CEST 2018 

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 4c19412a29f4e2066bc9bf9206b01ac734652edd
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Oct 10 05:23:47 2018 -0400

    Switch to libxfce4util.h for i18n
---
 configure.ac                        | 3 ++-
 savers/floaters.c                   | 3 ++-
 savers/gs-theme-window.c            | 1 -
 savers/popsquares.c                 | 2 +-
 savers/slideshow.c                  | 2 +-
 src/copy-theme-dialog.c             | 2 +-
 src/gs-auth-pam.c                   | 2 +-
 src/gs-auth-pwent.c                 | 2 +-
 src/gs-listener-dbus.c              | 2 +-
 src/gs-lock-plug.c                  | 2 +-
 src/test-fade.c                     | 2 +-
 src/test-passwd.c                   | 2 +-
 src/test-watcher.c                  | 2 +-
 src/test-window.c                   | 2 +-
 src/xfce-desktop-utils.c            | 2 +-
 src/xfce-rr.c                       | 2 +-
 src/xfce4-screensaver-command.c     | 2 +-
 src/xfce4-screensaver-dialog.c      | 2 +-
 src/xfce4-screensaver-gl-helper.c   | 2 +-
 src/xfce4-screensaver-preferences.c | 1 -
 src/xfce4-screensaver.c             | 2 +-
 src/xfcekbd-desktop-config.c        | 2 +-
 src/xfcekbd-indicator-config.c      | 2 +-
 src/xfcekbd-indicator.c             | 2 +-
 src/xfcekbd-keyboard-config.c       | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index da20e47..62a3500 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED=5.2
 XRANDR_REQUIRED=1.3
 LIBXFCONF_REQUIRED=4.12.1
 LIBXFCE4UI_REQUIRED=4.12.1
+LIBXFCE4UTIL_REQUIRED=4.12.1
 
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(crypt.h sys/select.h)
@@ -128,7 +129,7 @@ esac
 
 # Optional dependencies for the theme engines
 
-SAVER_MODULES="gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION"
+SAVER_MODULES="gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION libxfce4util-1.0 >= LIBXFCE4UTIL_REQUIRED"
 
 PKG_CHECK_MODULES(XFCE_SCREENSAVER_SAVER, $SAVER_MODULES)
 AC_SUBST(XFCE_SCREENSAVER_SAVER_CFLAGS)
diff --git a/savers/floaters.c b/savers/floaters.c
index 493d67a..3bfe667 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -32,11 +32,12 @@
 #include <time.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#include <libxfce4util/libxfce4util.h>
+
 #include "gs-theme-window.h"
 
 #ifndef trunc
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index 1000af2..af2b7a1 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gi18n.h>
 
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
diff --git a/savers/popsquares.c b/savers/popsquares.c
index 1289c48..0a5c2dc 100644
--- a/savers/popsquares.c
+++ b/savers/popsquares.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "gs-theme-window.h"
 #include "gs-theme-engine.h"
diff --git a/savers/slideshow.c b/savers/slideshow.c
index cbbbce0..c4ab745 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 
diff --git a/src/copy-theme-dialog.c b/src/copy-theme-dialog.c
index 40ea5f3..2df8ce2 100644
--- a/src/copy-theme-dialog.c
+++ b/src/copy-theme-dialog.c
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
diff --git a/src/gs-auth-pam.c b/src/gs-auth-pam.c
index 1ccd107..9484dd8 100644
--- a/src/gs-auth-pam.c
+++ b/src/gs-auth-pam.c
@@ -41,7 +41,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "gs-auth.h"
diff --git a/src/gs-auth-pwent.c b/src/gs-auth-pwent.c
index a0c1d80..7237412 100644
--- a/src/gs-auth-pwent.c
+++ b/src/gs-auth-pwent.c
@@ -45,7 +45,7 @@
 #endif /* __bsdi__ */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #if defined(HAVE_SHADOW_PASSWD)	      /* passwds live in /etc/shadow */
 
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 5898cab..a8c2a7c 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 9738acd..ffed50a 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -32,7 +32,7 @@
 
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
diff --git a/src/test-fade.c b/src/test-fade.c
index 7a417fd..a6773fd 100644
--- a/src/test-fade.c
+++ b/src/test-fade.c
@@ -31,7 +31,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
diff --git a/src/test-passwd.c b/src/test-passwd.c
index 80e0ab1..dfd1d72 100644
--- a/src/test-passwd.c
+++ b/src/test-passwd.c
@@ -30,7 +30,7 @@
 #include <sys/wait.h>
 #include <termios.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "gs-auth.h"
diff --git a/src/test-watcher.c b/src/test-watcher.c
index 35f5951..4f49886 100644
--- a/src/test-watcher.c
+++ b/src/test-watcher.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "gs-watcher.h"
diff --git a/src/test-window.c b/src/test-window.c
index 6fb4507..36a792e 100644
--- a/src/test-window.c
+++ b/src/test-window.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "gs-window.h"
diff --git a/src/xfce-desktop-utils.c b/src/xfce-desktop-utils.c
index 3b2cef4..c2aa5ac 100644
--- a/src/xfce-desktop-utils.c
+++ b/src/xfce-desktop-utils.c
@@ -27,7 +27,7 @@
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
diff --git a/src/xfce-rr.c b/src/xfce-rr.c
index 3d514b7..9f97e56 100644
--- a/src/xfce-rr.c
+++ b/src/xfce-rr.c
@@ -25,7 +25,7 @@
 
 
 #include <config.h>
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 #include <string.h>
 #include <X11/Xlib.h>
 
diff --git a/src/xfce4-screensaver-command.c b/src/xfce4-screensaver-command.c
index 5fa2790..66b217d 100644
--- a/src/xfce4-screensaver-command.c
+++ b/src/xfce4-screensaver-command.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <locale.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 90aa077..6517d87 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
diff --git a/src/xfce4-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
index c297d0d..5656ab1 100644
--- a/src/xfce4-screensaver-gl-helper.c
+++ b/src/xfce4-screensaver-gl-helper.c
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 9a2b978..b334d3f 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <sys/types.h>          /* For uid_t, gid_t */
 
-#include <glib/gi18n.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
diff --git a/src/xfce4-screensaver.c b/src/xfce4-screensaver.c
index 95342d5..3d0b7b9 100644
--- a/src/xfce4-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "xfce4-screensaver.h"
diff --git a/src/xfcekbd-desktop-config.c b/src/xfcekbd-desktop-config.c
index a6299bc..fd08179 100644
--- a/src/xfcekbd-desktop-config.c
+++ b/src/xfcekbd-desktop-config.c
@@ -26,7 +26,7 @@
 
 #include <xfconf/xfconf.h>
 
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gio/gio.h>
 #include "xfcekbd-desktop-config.h"
 #include "xfcekbd-config-private.h"
diff --git a/src/xfcekbd-indicator-config.c b/src/xfcekbd-indicator-config.c
index 57b2e90..acd6c0f 100644
--- a/src/xfcekbd-indicator-config.c
+++ b/src/xfcekbd-indicator-config.c
@@ -26,7 +26,7 @@
 
 #include <pango/pango.h>
 
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gdk/gdkx.h>
 
 #include <xfconf/xfconf.h>
diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c
index 90a333b..c9b3df6 100644
--- a/src/xfcekbd-indicator.c
+++ b/src/xfcekbd-indicator.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfcekbd-indicator.h"
 #include "xfcekbd-indicator-marshal.h"
diff --git a/src/xfcekbd-keyboard-config.c b/src/xfcekbd-keyboard-config.c
index 26cbd68..22bc03d 100644
--- a/src/xfcekbd-keyboard-config.c
+++ b/src/xfcekbd-keyboard-config.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <X11/keysym.h>
 
-#include <glib/gi18n-lib.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "xfcekbd-keyboard-config.h"
 #include "xfcekbd-config-private.h"

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

More information about the Xfce4-commits mailing list