[Xfce4-commits] <libxfce4util:master> Some more cleanups.
Nick Schermer
noreply at xfce.org
Mon Oct 19 16:34:01 CEST 2009
Updating branch refs/heads/master
to da1a58c522d82082250907f98f7eb8dcdeb48024 (commit)
from 56f2002c0c26333f7d4a14fa067c738552033de7 (commit)
commit da1a58c522d82082250907f98f7eb8dcdeb48024
Author: Nick Schermer <nick at xfce.org>
Date: Mon Oct 19 15:43:46 2009 +0200
Some more cleanups.
libxfce4util/Makefile.am | 9 ++-
libxfce4util/libxfce4util-private.h | 2 +-
libxfce4util/xfce-rc-private.h | 127 +++++++++++++++++------------------
3 files changed, 70 insertions(+), 68 deletions(-)
diff --git a/libxfce4util/Makefile.am b/libxfce4util/Makefile.am
index 7cf688a..052f764 100644
--- a/libxfce4util/Makefile.am
+++ b/libxfce4util/Makefile.am
@@ -13,7 +13,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"libxfce4util\" \
-DKIOSKDIR=\"$(sysconfdir)/xdg/xfce4/kiosk\" \
-DKIOSKDEF=\"ALL\" \
- -DLIBXFCE4UTIL_COMPILATION
+ -DLIBXFCE4UTIL_COMPILATION \
+ $(PLATFORM_CPPFLAGS)
lib_LTLIBRARIES = \
libxfce4util.la
@@ -71,13 +72,15 @@ libxfce4util_la_SOURCES = \
xfce-utf8.c
libxfce4util_la_CFLAGS = \
- $(GOBJECT_CFLAGS)
+ $(GOBJECT_CFLAGS) \
+ $(PLATFORM_CFLAGS)
libxfce4util_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBXFCE4UTIL_VERINFO) \
-export-symbols-regex "^[^_].*" \
- -no-undefined
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
libxfce4util_la_LIBADD = \
$(GOBJECT_LIBS)
diff --git a/libxfce4util/libxfce4util-private.h b/libxfce4util/libxfce4util-private.h
index afead80..15be6e9 100644
--- a/libxfce4util/libxfce4util-private.h
+++ b/libxfce4util/libxfce4util-private.h
@@ -30,7 +30,7 @@
G_BEGIN_DECLS;
-G_GNUC_INTERNAL void _xfce_i18n_init (void);
+void _xfce_i18n_init (void);
G_END_DECLS;
diff --git a/libxfce4util/xfce-rc-private.h b/libxfce4util/xfce-rc-private.h
index 6b3726d..ae3fab6 100644
--- a/libxfce4util/xfce-rc-private.h
+++ b/libxfce4util/xfce-rc-private.h
@@ -61,71 +61,70 @@ struct _XfceRc
#define XFCE_RC_SIMPLE_CONST(obj) ((const XfceRcSimple *) (obj))
-G_GNUC_INTERNAL void _xfce_rc_init (XfceRc *rc);
+void _xfce_rc_init (XfceRc *rc);
-G_GNUC_INTERNAL XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple *shared,
- const gchar *filename,
- gboolean readonly);
-G_GNUC_INTERNAL gboolean _xfce_rc_simple_parse (XfceRcSimple *simple);
-G_GNUC_INTERNAL void _xfce_rc_simple_close (XfceRc *rc);
-G_GNUC_INTERNAL void _xfce_rc_simple_flush (XfceRc *rc);
-G_GNUC_INTERNAL void _xfce_rc_simple_rollback (XfceRc *rc);
-G_GNUC_INTERNAL gboolean _xfce_rc_simple_is_dirty (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gboolean _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL const gchar* _xfce_rc_simple_get_filename(const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_groups (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_entries (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_simple_delete_group(XfceRc *rc,
- const gchar *name,
- gboolean global);
-const gchar* _xfce_rc_simple_get_group (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gboolean _xfce_rc_simple_has_group (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_simple_set_group (XfceRc *rc,
- const gchar *name);
-G_GNUC_INTERNAL void _xfce_rc_simple_delete_entry(XfceRc *rc,
- const gchar *key,
- gboolean global);
-G_GNUC_INTERNAL gboolean _xfce_rc_simple_has_entry (const XfceRc *rc,
- const gchar *key) G_GNUC_CONST;
-G_GNUC_INTERNAL const gchar* _xfce_rc_simple_read_entry (const XfceRc *rc,
- const gchar *key,
- gboolean translated) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_simple_write_entry (XfceRc *rc,
- const gchar *key,
- const gchar *value);
-
-G_GNUC_INTERNAL XfceRcConfig* _xfce_rc_config_new (XfceResourceType type,
- const gchar *resource,
- gboolean readonly);
-G_GNUC_INTERNAL void _xfce_rc_config_close (XfceRc *rc);
-G_GNUC_INTERNAL void _xfce_rc_config_flush (XfceRc *rc);
-G_GNUC_INTERNAL void _xfce_rc_config_rollback (XfceRc *rc);
-G_GNUC_INTERNAL gboolean _xfce_rc_config_is_dirty (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gboolean _xfce_rc_config_is_readonly (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gchar** _xfce_rc_config_get_groups (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gchar** _xfce_rc_config_get_entries (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_config_delete_group(XfceRc *rc,
- const gchar *name,
- gboolean global);
-G_GNUC_INTERNAL const gchar* _xfce_rc_config_get_group (const XfceRc *rc) G_GNUC_CONST;
-G_GNUC_INTERNAL gboolean _xfce_rc_config_has_group (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_config_set_group (XfceRc *rc,
- const gchar *name);
-G_GNUC_INTERNAL void _xfce_rc_config_delete_entry(XfceRc *rc,
- const gchar *key,
- gboolean global);
-G_GNUC_INTERNAL gboolean _xfce_rc_config_has_entry (const XfceRc *rc,
- const gchar *key) G_GNUC_CONST;
-G_GNUC_INTERNAL const gchar* _xfce_rc_config_read_entry (const XfceRc *rc,
- const gchar *key,
- gboolean translated) G_GNUC_CONST;
-G_GNUC_INTERNAL void _xfce_rc_config_write_entry (XfceRc *rc,
- const gchar *key,
- const gchar *value);
+XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple *shared,
+ const gchar *filename,
+ gboolean readonly);
+gboolean _xfce_rc_simple_parse (XfceRcSimple *simple);
+void _xfce_rc_simple_close (XfceRc *rc);
+void _xfce_rc_simple_flush (XfceRc *rc);
+void _xfce_rc_simple_rollback (XfceRc *rc);
+gboolean _xfce_rc_simple_is_dirty (const XfceRc *rc) G_GNUC_CONST;
+gboolean _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST;
+const gchar* _xfce_rc_simple_get_filename (const XfceRc *rc) G_GNUC_CONST;
+gchar** _xfce_rc_simple_get_groups (const XfceRc *rc) G_GNUC_CONST;
+gchar** _xfce_rc_simple_get_entries (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+void _xfce_rc_simple_delete_group (XfceRc *rc,
+ const gchar *name,
+ gboolean global);
+const gchar* _xfce_rc_simple_get_group (const XfceRc *rc) G_GNUC_CONST;
+gboolean _xfce_rc_simple_has_group (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+void _xfce_rc_simple_set_group (XfceRc *rc,
+ const gchar *name);
+void _xfce_rc_simple_delete_entry (XfceRc *rc,
+ const gchar *key,
+ gboolean global);
+gboolean _xfce_rc_simple_has_entry (const XfceRc *rc,
+ const gchar *key) G_GNUC_CONST;
+const gchar* _xfce_rc_simple_read_entry (const XfceRc *rc,
+ const gchar *key,
+ gboolean translated) G_GNUC_CONST;
+void _xfce_rc_simple_write_entry (XfceRc *rc,
+ const gchar *key,
+ const gchar *value);
+XfceRcConfig* _xfce_rc_config_new (XfceResourceType type,
+ const gchar *resource,
+ gboolean readonly);
+void _xfce_rc_config_close (XfceRc *rc);
+void _xfce_rc_config_flush (XfceRc *rc);
+void _xfce_rc_config_rollback (XfceRc *rc);
+gboolean _xfce_rc_config_is_dirty (const XfceRc *rc) G_GNUC_CONST;
+gboolean _xfce_rc_config_is_readonly (const XfceRc *rc) G_GNUC_CONST;
+gchar** _xfce_rc_config_get_groups (const XfceRc *rc) G_GNUC_CONST;
+gchar** _xfce_rc_config_get_entries (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+void _xfce_rc_config_delete_group (XfceRc *rc,
+ const gchar *name,
+ gboolean global);
+const gchar* _xfce_rc_config_get_group (const XfceRc *rc) G_GNUC_CONST;
+gboolean _xfce_rc_config_has_group (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+void _xfce_rc_config_set_group (XfceRc *rc,
+ const gchar *name);
+void _xfce_rc_config_delete_entry (XfceRc *rc,
+ const gchar *key,
+ gboolean global);
+gboolean _xfce_rc_config_has_entry (const XfceRc *rc,
+ const gchar *key) G_GNUC_CONST;
+const gchar* _xfce_rc_config_read_entry (const XfceRc *rc,
+ const gchar *key,
+ gboolean translated) G_GNUC_CONST;
+void _xfce_rc_config_write_entry (XfceRc *rc,
+ const gchar *key,
+ const gchar *value);
#endif /* !__LIBXFCE4UTIL_XFCE_RC_PRIVATE_H__ */
More information about the Xfce4-commits
mailing list