[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Apply cpplint fixes for */*.h
noreply at xfce.org
noreply at xfce.org
Sun Nov 11 18:04:10 CET 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 78a013e7f68f98cd6206ee668a0ec9254f98ad70
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Nov 11 12:04:04 2018 -0500
Apply cpplint fixes for */*.h
---
savers/gs-theme-engine.h | 6 +++---
savers/gs-theme-window.h | 6 +++---
savers/gste-popsquares.h | 9 +++++----
savers/gste-slideshow.h | 9 +++++----
savers/xdg-user-dir-lookup.h | 5 +++++
src/copy-theme-dialog.h | 6 +++---
src/gs-auth.h | 6 +++---
src/gs-debug.h | 6 +++---
src/gs-fade.h | 6 +++---
src/gs-grab.h | 7 +++----
src/gs-job.h | 6 +++---
src/gs-listener-dbus.h | 15 +++++++--------
src/gs-listener-x11.h | 7 +++----
src/gs-lock-plug.h | 7 +++----
src/gs-manager.h | 9 ++++-----
src/gs-monitor.h | 6 +++---
src/gs-prefs.h | 6 +++---
src/gs-theme-manager.h | 6 +++---
src/gs-visual-gl.h | 6 +++---
src/gs-window.h | 6 +++---
src/setuid.h | 6 +++---
src/subprocs.h | 6 +++---
src/xfce-bg.h | 6 +++---
src/xfce-desktop-utils.h | 6 +++---
src/xfce-rr-private.h | 29 ++++++++++++++++++++++++++---
src/xfce-rr.h | 6 +++---
src/xfce4-screensaver.h | 6 +++---
src/xfcekbd-config-private.h | 10 +++++-----
src/xfcekbd-desktop-config.h | 6 +++---
src/xfcekbd-indicator-config.h | 8 ++++----
src/xfcekbd-indicator.h | 15 +++++++++------
src/xfcekbd-keyboard-config.h | 6 +++---
32 files changed, 139 insertions(+), 111 deletions(-)
diff --git a/savers/gs-theme-engine.h b/savers/gs-theme-engine.h
index b49286a..b742f89 100644
--- a/savers/gs-theme-engine.h
+++ b/savers/gs-theme-engine.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_THEME_ENGINE_H
-#define __GS_THEME_ENGINE_H
+#ifndef SAVERS_GS_THEME_ENGINE_H_
+#define SAVERS_GS_THEME_ENGINE_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -85,4 +85,4 @@ void _gs_theme_engine_profile_log (const char *func,
G_END_DECLS
-#endif /* __GS_THEME_ENGINE_H */
+#endif /* SAVERS_GS_THEME_ENGINE_H_ */
diff --git a/savers/gs-theme-window.h b/savers/gs-theme-window.h
index 1cc00a0..2dfb3bd 100644
--- a/savers/gs-theme-window.h
+++ b/savers/gs-theme-window.h
@@ -23,8 +23,8 @@
* Originally written by: Ray Strode <rstrode at redhat.com>
*/
-#ifndef GS_THEME_WINDOW_H
-#define GS_THEME_WINDOW_H
+#ifndef SAVERS_GS_THEME_WINDOW_H_
+#define SAVERS_GS_THEME_WINDOW_H_
#include <glib.h>
#include <glib-object.h>
@@ -69,4 +69,4 @@ GtkWidget *gs_theme_window_new (void);
#endif
G_END_DECLS
-#endif /* GS_THEME_WINDOW_H */
+#endif /* SAVERS_GS_THEME_WINDOW_H_ */
diff --git a/savers/gste-popsquares.h b/savers/gste-popsquares.h
index a0ddc81..ec2fdeb 100644
--- a/savers/gste-popsquares.h
+++ b/savers/gste-popsquares.h
@@ -20,12 +20,13 @@
*
*/
-#ifndef __GSTE_POPSQUARES_H
-#define __GSTE_POPSQUARES_H
+#ifndef SAVERS_GSTE_POPSQUARES_H_
+#define SAVERS_GSTE_POPSQUARES_H_
#include <glib.h>
#include <gdk/gdk.h>
-#include "gs-theme-engine.h"
+
+#include "savers/gs-theme-engine.h"
G_BEGIN_DECLS
@@ -54,4 +55,4 @@ GSThemeEngine *gste_popsquares_new (void);
G_END_DECLS
-#endif /* __GSTE_POPSQUARES_H */
+#endif /* SAVERS_GSTE_POPSQUARES_H_ */
diff --git a/savers/gste-slideshow.h b/savers/gste-slideshow.h
index 5b330b0..2bdb867 100644
--- a/savers/gste-slideshow.h
+++ b/savers/gste-slideshow.h
@@ -20,12 +20,13 @@
*
*/
-#ifndef __GSTE_SLIDESHOW_H
-#define __GSTE_SLIDESHOW_H
+#ifndef SAVERS_GSTE_SLIDESHOW_H_
+#define SAVERS_GSTE_SLIDESHOW_H_
#include <glib.h>
#include <gdk/gdk.h>
-#include "gs-theme-engine.h"
+
+#include "savers/gs-theme-engine.h"
G_BEGIN_DECLS
@@ -66,4 +67,4 @@ void gste_slideshow_set_no_stretch_hint (GSTESlideshow *show,
G_END_DECLS
-#endif /* __GSTE_SLIDESHOW_H */
+#endif /* SAVERS_GSTE_SLIDESHOW_H_ */
diff --git a/savers/xdg-user-dir-lookup.h b/savers/xdg-user-dir-lookup.h
index 2803be3..0b814cd 100644
--- a/savers/xdg-user-dir-lookup.h
+++ b/savers/xdg-user-dir-lookup.h
@@ -25,4 +25,9 @@
SOFTWARE.
*/
+#ifndef SAVERS_XDG_USER_DIR_LOOKUP_H_
+#define SAVERS_XDG_USER_DIR_LOOKUP_H_
+
char * xdg_user_dir_lookup (const char *type);
+
+#endif /* SAVERS_XDG_USER_DIR_LOOKUP_H_ */
diff --git a/src/copy-theme-dialog.h b/src/copy-theme-dialog.h
index b76751f..f867e62 100644
--- a/src/copy-theme-dialog.h
+++ b/src/copy-theme-dialog.h
@@ -17,8 +17,8 @@
* 02110-1301, USA.
**/
-#ifndef __COPY_THEME_DIALOG_H__
-#define __COPY_THEME_DIALOG_H__
+#ifndef SRC_COPY_THEME_DIALOG_H_
+#define SRC_COPY_THEME_DIALOG_H_
#include <gtk/gtk.h>
@@ -53,4 +53,4 @@ void copy_theme_dialog_begin (CopyThemeDialog *dialog);
G_END_DECLS
-#endif /* __COPY_THEME_DIALOG_H__ */
+#endif /* SRC_COPY_THEME_DIALOG_H_ */
diff --git a/src/gs-auth.h b/src/gs-auth.h
index 954b377..113ef88 100644
--- a/src/gs-auth.h
+++ b/src/gs-auth.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef __GS_AUTH_H
-#define __GS_AUTH_H
+#ifndef SRC_GS_AUTH_H_
+#define SRC_GS_AUTH_H_
#include <glib.h>
@@ -64,4 +64,4 @@ gboolean gs_auth_verify_user (const char *username,
G_END_DECLS
-#endif /* __GS_AUTH_H */
+#endif /* SRC_GS_AUTH_H_ */
diff --git a/src/gs-debug.h b/src/gs-debug.h
index d0b12b7..7541a64 100644
--- a/src/gs-debug.h
+++ b/src/gs-debug.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_DEBUG_H
-#define __GS_DEBUG_H
+#ifndef SRC_GS_DEBUG_H_
+#define SRC_GS_DEBUG_H_
#include <stdarg.h>
#include <glib.h>
@@ -68,4 +68,4 @@ void _gs_profile_log (const char *func,
G_END_DECLS
-#endif /* __GS_DEBUG_H */
+#endif /* SRC_GS_DEBUG_H_ */
diff --git a/src/gs-fade.h b/src/gs-fade.h
index f8157bd..73b7c7a 100644
--- a/src/gs-fade.h
+++ b/src/gs-fade.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_FADE_H
-#define __GS_FADE_H
+#ifndef SRC_GS_FADE_H_
+#define SRC_GS_FADE_H_
#include <glib.h>
@@ -76,4 +76,4 @@ void gs_fade_set_enabled (GSFade *fade,
G_END_DECLS
-#endif /* __GS_FADE_H */
+#endif /* SRC_GS_FADE_H_ */
diff --git a/src/gs-grab.h b/src/gs-grab.h
index a339069..14c4ac3 100644
--- a/src/gs-grab.h
+++ b/src/gs-grab.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_GRAB_H
-#define __GS_GRAB_H
+#ifndef SRC_GS_GRAB_H_
+#define SRC_GS_GRAB_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -46,7 +46,6 @@ typedef struct
typedef struct
{
GObjectClass parent_class;
-
} GSGrabClass;
GType gs_grab_get_type (void);
@@ -79,4 +78,4 @@ void gs_grab_reset (GSGrab *grab);
G_END_DECLS
-#endif /* __GS_GRAB_H */
+#endif /* SRC_GS_GRAB_H_ */
diff --git a/src/gs-job.h b/src/gs-job.h
index fd23b43..1778c85 100644
--- a/src/gs-job.h
+++ b/src/gs-job.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_JOB_H
-#define __GS_JOB_H
+#ifndef SRC_GS_JOB_H_
+#define SRC_GS_JOB_H_
#include <gtk/gtk.h>
@@ -66,4 +66,4 @@ gboolean gs_job_set_command (GSJob *job,
G_END_DECLS
-#endif /* __GS_JOB_H */
+#endif /* SRC_GS_JOB_H_ */
diff --git a/src/gs-listener-dbus.h b/src/gs-listener-dbus.h
index acbf18c..1cf5dbb 100644
--- a/src/gs-listener-dbus.h
+++ b/src/gs-listener-dbus.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_LISTENER_H
-#define __GS_LISTENER_H
+#ifndef SRC_GS_LISTENER_DBUS_H_
+#define SRC_GS_LISTENER_DBUS_H_
#include <glib.h>
@@ -58,7 +58,6 @@ typedef struct
const char *summary,
const char *body,
const char *icon);
-
} GSListenerClass;
typedef enum
@@ -76,16 +75,16 @@ GType gs_listener_get_type (void);
GSListener *gs_listener_new (void);
gboolean gs_listener_acquire (GSListener *listener,
- GError **error);
+ GError **error);
gboolean gs_listener_set_active (GSListener *listener,
- gboolean active);
+ gboolean active);
gboolean gs_listener_set_session_idle (GSListener *listener,
- gboolean idle);
+ gboolean idle);
void gs_listener_set_activation_enabled (GSListener *listener,
- gboolean enabled);
+ gboolean enabled);
gboolean gs_listener_get_activation_enabled (GSListener *listener);
gboolean gs_listener_is_inhibited (GSListener *listener);
G_END_DECLS
-#endif /* __GS_LISTENER_H */
+#endif /* SRC_GS_LISTENER_DBUS_H_ */
diff --git a/src/gs-listener-x11.h b/src/gs-listener-x11.h
index 09600bc..7ca1430 100644
--- a/src/gs-listener-x11.h
+++ b/src/gs-listener-x11.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_LISTENER_X11_H
-#define __GS_LISTENER_X11_H
+#ifndef SRC_GS_LISTENER_X11_H_
+#define SRC_GS_LISTENER_X11_H_
G_BEGIN_DECLS
@@ -45,7 +45,6 @@ typedef struct
GObjectClass parent_class;
void (* lock) (GSListenerX11 *listener);
-
} GSListenerX11Class;
GType gs_listener_x11_get_type (void);
@@ -57,4 +56,4 @@ void gs_listener_x11_set_lock_after (GSListenerX11 *list
G_END_DECLS
-#endif /* __GS_LISTENER_X11_H */
+#endif /* SRC_GS_LISTENER_X11_H_ */
diff --git a/src/gs-lock-plug.h b/src/gs-lock-plug.h
index bf64a18..f0c47d6 100644
--- a/src/gs-lock-plug.h
+++ b/src/gs-lock-plug.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_LOCK_PLUG_H
-#define __GS_LOCK_PLUG_H
+#ifndef SRC_GS_LOCK_PLUG_H_
+#define SRC_GS_LOCK_PLUG_H_
#include <glib.h>
@@ -58,7 +58,6 @@ typedef struct
/* Keybinding signals */
void (* close) (GSLockPlug *plug);
-
} GSLockPlugClass;
GType gs_lock_plug_get_type (void);
@@ -81,4 +80,4 @@ void gs_lock_plug_show_message (GSLockPlug *plug,
G_END_DECLS
-#endif /* __GS_LOCK_PLUG_H */
+#endif /* SRC_GS_LOCK_PLUG_H_ */
diff --git a/src/gs-manager.h b/src/gs-manager.h
index 26d7e2b..cf1d9d3 100644
--- a/src/gs-manager.h
+++ b/src/gs-manager.h
@@ -20,10 +20,10 @@
*
*/
-#ifndef __GS_MANAGER_H
-#define __GS_MANAGER_H
+#ifndef SRC_GS_MANAGER_H_
+#define SRC_GS_MANAGER_H_
-#include "gs-prefs.h"
+#include "src/gs-prefs.h"
G_BEGIN_DECLS
@@ -50,7 +50,6 @@ typedef struct
void (* deactivated) (GSManager *manager);
void (* auth_request_begin) (GSManager *manager);
void (* auth_request_end) (GSManager *manager);
-
} GSManagerClass;
GType gs_manager_get_type (void);
@@ -104,4 +103,4 @@ void gs_manager_cancel_unlock_request (GSManager *manager);
G_END_DECLS
-#endif /* __GS_MANAGER_H */
+#endif /* SRC_GS_MANAGER_H_ */
diff --git a/src/gs-monitor.h b/src/gs-monitor.h
index f73745c..7042423 100644
--- a/src/gs-monitor.h
+++ b/src/gs-monitor.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_MONITOR_H
-#define __GS_MONITOR_H
+#ifndef SRC_GS_MONITOR_H_
+#define SRC_GS_MONITOR_H_
#include <glib.h>
@@ -56,4 +56,4 @@ void gs_monitor_set_lock_enabled (GSMonitor *monitor,
gboolean lock_enabled);
G_END_DECLS
-#endif /* __GS_MONITOR_H */
+#endif /* SRC_GS_MONITOR_H_ */
diff --git a/src/gs-prefs.h b/src/gs-prefs.h
index b49030f..c5896c2 100644
--- a/src/gs-prefs.h
+++ b/src/gs-prefs.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __GS_PREFS_H
-#define __GS_PREFS_H
+#ifndef SRC_GS_PREFS_H_
+#define SRC_GS_PREFS_H_
#include <glib.h>
@@ -203,4 +203,4 @@ void gs_prefs_load (GSPrefs *prefs);
G_END_DECLS
-#endif /* __GS_PREFS_H */
+#endif /* SRC_GS_PREFS_H_ */
diff --git a/src/gs-theme-manager.h b/src/gs-theme-manager.h
index bfdff22..b0803b0 100644
--- a/src/gs-theme-manager.h
+++ b/src/gs-theme-manager.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_THEME_MANAGER_H
-#define __GS_THEME_MANAGER_H
+#ifndef SRC_GS_THEME_MANAGER_H_
+#define SRC_GS_THEME_MANAGER_H_
#include <glib.h>
@@ -64,4 +64,4 @@ const char *gs_theme_info_get_exec (GSThemeInfo *info);
G_END_DECLS
-#endif /* __GS_THEME_MANAGER_H */
+#endif /* SRC_GS_THEME_MANAGER_H_ */
diff --git a/src/gs-visual-gl.h b/src/gs-visual-gl.h
index 1b4fe56..70b86da 100644
--- a/src/gs-visual-gl.h
+++ b/src/gs-visual-gl.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef __GS_VISUAL_GL_H
-#define __GS_VISUAL_GL_H
+#ifndef SRC_GS_VISUAL_GL_H_
+#define SRC_GS_VISUAL_GL_H_
#include <gdk/gdk.h>
@@ -29,4 +29,4 @@ GdkVisual *gs_visual_gl_get_best_for_display (GdkDisplay *display);
G_END_DECLS
-#endif /* __GS_VISUAL_GL_H */
+#endif /* SRC_GS_VISUAL_GL_H_ */
diff --git a/src/gs-window.h b/src/gs-window.h
index 97c2f56..644640b 100644
--- a/src/gs-window.h
+++ b/src/gs-window.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __GS_WINDOW_H
-#define __GS_WINDOW_H
+#ifndef SRC_GS_WINDOW_H_
+#define SRC_GS_WINDOW_H_
#include <gdk/gdk.h>
#include <gtk/gtk.h>
@@ -101,4 +101,4 @@ void gs_window_clear (GSWindow *window);
G_END_DECLS
-#endif /* __GS_WINDOW_H */
+#endif /* SRC_GS_WINDOW_H_ */
diff --git a/src/setuid.h b/src/setuid.h
index 00d9fab..5d11309 100644
--- a/src/setuid.h
+++ b/src/setuid.h
@@ -11,8 +11,8 @@
* implied warranty.
*/
-#ifndef __GS_SETUID_H
-#define __GS_SETUID_H
+#ifndef SRC_SETUID_H_
+#define SRC_SETUID_H_
#include <glib.h>
@@ -24,4 +24,4 @@ gboolean hack_uid (char **nolock_reason,
G_END_DECLS
-#endif /* __GS_SETUID_H */
+#endif /* SRC_SETUID_H_ */
diff --git a/src/subprocs.h b/src/subprocs.h
index 4aed9b1..9648859 100644
--- a/src/subprocs.h
+++ b/src/subprocs.h
@@ -13,8 +13,8 @@
* implied warranty.
*/
-#ifndef __GS_SUBPROCS_H
-#define __GS_SUBPROCS_H
+#ifndef SRC_SUBPROCS_H_
+#define SRC_SUBPROCS_H_
#include <signal.h>
#include <glib.h>
@@ -37,4 +37,4 @@ void await_dying_children (int pid,
G_END_DECLS
-#endif /* __GS_SUBPROCS_H */
+#endif /* SRC_SUBPROCS_H_ */
diff --git a/src/xfce-bg.h b/src/xfce-bg.h
index 86c9d43..19b28bb 100644
--- a/src/xfce-bg.h
+++ b/src/xfce-bg.h
@@ -23,8 +23,8 @@
Jasmine Hassan <jasmine.aura at gmail.com>
*/
-#ifndef __XFCE_BG_H__
-#define __XFCE_BG_H__
+#ifndef SRC_XFCE_BG_H_
+#define SRC_XFCE_BG_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -96,4 +96,4 @@ GdkPixbuf * xfce_bg_get_pixbuf (XfceBG *bg,
G_END_DECLS
-#endif
+#endif /* SRC_XFCE_BG_H_ */
diff --git a/src/xfce-desktop-utils.h b/src/xfce-desktop-utils.h
index aa54736..d4f9632 100644
--- a/src/xfce-desktop-utils.h
+++ b/src/xfce-desktop-utils.h
@@ -23,8 +23,8 @@
@NOTATION@
*/
-#ifndef XFCE_DESKTOP_UTILS_H
-#define XFCE_DESKTOP_UTILS_H
+#ifndef SRC_XFCE_DESKTOP_UTILS_H_
+#define SRC_XFCE_DESKTOP_UTILS_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -39,4 +39,4 @@ gboolean xfce_gdk_spawn_command_line_on_screen (GdkScreen *screen,
G_END_DECLS
-#endif /* XFCE_DESKTOP_UTILS_H */
+#endif /* SRC_XFCE_DESKTOP_UTILS_H_ */
diff --git a/src/xfce-rr-private.h b/src/xfce-rr-private.h
index 697a385..ca431cf 100644
--- a/src/xfce-rr-private.h
+++ b/src/xfce-rr-private.h
@@ -1,5 +1,28 @@
-#ifndef XFCE_RR_PRIVATE_H
-#define XFCE_RR_PRIVATE_H
+/* xfce-rr-private.h
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * Copyright 2018 Sean Davis <bluesabre at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Soren Sandmann <sandmann at redhat.com>
+ */
+
+#ifndef SRC_XFCE_RR_PRIVATE_H_
+#define SRC_XFCE_RR_PRIVATE_H_
#include <X11/Xlib.h>
@@ -43,4 +66,4 @@ struct XfceRRScreenPrivate
Atom connector_type_atom;
};
-#endif
+#endif /* SRC_XFCE_RR_PRIVATE_H_ */
diff --git a/src/xfce-rr.h b/src/xfce-rr.h
index c011355..b3395e3 100644
--- a/src/xfce-rr.h
+++ b/src/xfce-rr.h
@@ -20,8 +20,8 @@
*
* Author: Soren Sandmann <sandmann at redhat.com>
*/
-#ifndef XFCE_RR_H
-#define XFCE_RR_H
+#ifndef SRC_XFCE_RR_H_
+#define SRC_XFCE_RR_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -106,4 +106,4 @@ void xfce_rr_crtc_set_gamma (XfceRRCrtc *crtc,
unsigned short *red,
unsigned short *green,
unsigned short *blue);
-#endif /* XFCE_RR_H */
+#endif /* SRC_XFCE_RR_H_ */
diff --git a/src/xfce4-screensaver.h b/src/xfce4-screensaver.h
index e6aa077..03b50c3 100644
--- a/src/xfce4-screensaver.h
+++ b/src/xfce4-screensaver.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __XFCE_SCREENSAVER_H
-#define __XFCE_SCREENSAVER_H
+#ifndef SRC_XFCE4_SCREENSAVER_H_
+#define SRC_XFCE4_SCREENSAVER_H_
#include <glib.h>
@@ -31,4 +31,4 @@ void xfce4_screensaver_quit(void);
G_END_DECLS
-#endif
+#endif /* SRC_XFCE4_SCREENSAVER_H_ */
diff --git a/src/xfcekbd-config-private.h b/src/xfcekbd-config-private.h
index 48c2bd8..30b61ee 100644
--- a/src/xfcekbd-config-private.h
+++ b/src/xfcekbd-config-private.h
@@ -18,11 +18,11 @@
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XFCEKBD_CONFIG_PRIVATE_H__
-#define __XFCEKBD_CONFIG_PRIVATE_H__
+#ifndef SRC_XFCEKBD_CONFIG_PRIVATE_H_
+#define SRC_XFCEKBD_CONFIG_PRIVATE_H_
-#include "xfcekbd-desktop-config.h"
-#include "xfcekbd-keyboard-config.h"
+#include "src/xfcekbd-desktop-config.h"
+#include "src/xfcekbd-keyboard-config.h"
#define SETTINGS_XFCONF_CHANNEL "xfce4-screensaver"
@@ -105,4 +105,4 @@ extern void xfcekbd_keyboard_config_options_set (XfcekbdKeyboardConfig *kbd_con
const gchar *group_name,
const gchar *option_name);
-#endif
+#endif /* SRC_XFCEKBD_CONFIG_PRIVATE_H_ */
diff --git a/src/xfcekbd-desktop-config.h b/src/xfcekbd-desktop-config.h
index 378e6a5..dc3a6c7 100644
--- a/src/xfcekbd-desktop-config.h
+++ b/src/xfcekbd-desktop-config.h
@@ -18,8 +18,8 @@
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XFCEKBD_DESKTOP_CONFIG_H__
-#define __XFCEKBD_DESKTOP_CONFIG_H__
+#ifndef SRC_XFCEKBD_DESKTOP_CONFIG_H_
+#define SRC_XFCEKBD_DESKTOP_CONFIG_H_
#include <X11/Xlib.h>
#include <glib.h>
@@ -71,4 +71,4 @@ extern void xfcekbd_desktop_config_start_listen (XfcekbdDesk
extern void xfcekbd_desktop_config_stop_listen (XfcekbdDesktopConfig *config);
-#endif
+#endif /* SRC_XFCEKBD_DESKTOP_CONFIG_H_ */
diff --git a/src/xfcekbd-indicator-config.h b/src/xfcekbd-indicator-config.h
index af94a7c..07ff38f 100644
--- a/src/xfcekbd-indicator-config.h
+++ b/src/xfcekbd-indicator-config.h
@@ -18,13 +18,13 @@
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XFCEKBD_INDICATOR_CONFIG_H__
-#define __XFCEKBD_INDICATOR_CONFIG_H__
+#ifndef SRC_XFCEKBD_INDICATOR_CONFIG_H_
+#define SRC_XFCEKBD_INDICATOR_CONFIG_H_
#include <gtk/gtk.h>
#include <xfconf/xfconf.h>
-#include "xfcekbd-keyboard-config.h"
+#include "src/xfcekbd-keyboard-config.h"
/*
* Indicator configuration
@@ -70,4 +70,4 @@ void xfcekbd_indicator_config_start_listen (XfcekbdIndicatorConfig
void xfcekbd_indicator_config_stop_listen (XfcekbdIndicatorConfig *applet_config);
-#endif
+#endif /* SRC_XFCEKBD_INDICATOR_CONFIG_H_ */
diff --git a/src/xfcekbd-indicator.h b/src/xfcekbd-indicator.h
index 0afc6a4..fe532ed 100644
--- a/src/xfcekbd-indicator.h
+++ b/src/xfcekbd-indicator.h
@@ -18,8 +18,8 @@
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XFCEKBD_INDICATOR_H__
-#define __XFCEKBD_INDICATOR_H__
+#ifndef SRC_XFCEKBD_INDICATOR_H_
+#define SRC_XFCEKBD_INDICATOR_H_
#include <gtk/gtk.h>
@@ -34,11 +34,14 @@ typedef struct _XfcekbdIndicatorPrivate XfcekbdIndicatorPrivate;
typedef struct _XfcekbdIndicatorClass XfcekbdIndicatorClass;
#define XFCEKBD_TYPE_INDICATOR (xfcekbd_indicator_get_type ())
-#define XFCEKBD_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCEKBD_TYPE_INDICATOR, XfcekbdIndicator))
-#define XFCEKBD_INDICATOR_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), XFCEKBD_TYPE_INDICATOR, XfcekbdIndicatorClass))
+#define XFCEKBD_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCEKBD_TYPE_INDICATOR, \
+ XfcekbdIndicator))
+#define XFCEKBD_INDICATOR_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), XFCEKBD_TYPE_INDICATOR, \
+ XfcekbdIndicatorClass))
#define XFCEKBD_IS_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCEKBD_TYPE_INDICATOR))
#define XFCEKBD_IS_INDICATOR_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), XFCEKBD_TYPE_INDICATOR))
-#define XFCEKBD_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCEKBD_TYPE_INDICATOR, XfcekbdIndicatorClass))
+#define XFCEKBD_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCEKBD_TYPE_INDICATOR, \
+ XfcekbdIndicatorClass))
struct _XfcekbdIndicator {
GtkNotebook parent;
@@ -61,4 +64,4 @@ extern void xfcekbd_indicator_set_parent_tooltips (XfcekbdIndicator *g
#ifdef __cplusplus
}
#endif
-#endif
+#endif /* SRC_XFCEKBD_INDICATOR_H_ */
diff --git a/src/xfcekbd-keyboard-config.h b/src/xfcekbd-keyboard-config.h
index 5f628ea..fe38779 100644
--- a/src/xfcekbd-keyboard-config.h
+++ b/src/xfcekbd-keyboard-config.h
@@ -18,8 +18,8 @@
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XFCEKBD_KEYBOARD_CONFIG_H__
-#define __XFCEKBD_KEYBOARD_CONFIG_H__
+#ifndef SRC_XFCEKBD_KEYBOARD_CONFIG_H_
+#define SRC_XFCEKBD_KEYBOARD_CONFIG_H_
#include <X11/Xlib.h>
#include <glib.h>
@@ -61,4 +61,4 @@ extern gboolean xfcekbd_keyboard_config_split_items (const g
extern const gchar * xfcekbd_keyboard_config_format_full_layout (const gchar *layout_descr,
const gchar *variant_descr);
-#endif
+#endif /* SRC_XFCEKBD_KEYBOARD_CONFIG_H_ */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list