From 8e81604f27ab1314b3a2ecc73b489ceee0d10fdb Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 24 Jul 2013 12:38:43 +0200 Subject: Add utilities for dconf --- configure.ac | 16 ++++ libmate-desktop/Makefile.am | 6 +- libmate-desktop/mate-dconf.c | 161 +++++++++++++++++++++++++++++++++ libmate-desktop/mate-dconf.h | 48 ++++++++++ libmate-desktop/mate-desktop-2.0.pc.in | 2 +- 5 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 libmate-desktop/mate-dconf.c create mode 100644 libmate-desktop/mate-dconf.h diff --git a/configure.ac b/configure.ac index e430d41..130eeec 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,22 @@ AC_SUBST(GDK_PIXBUF_REQUIRED) AC_SUBST(GIO_REQUIRED) AC_SUBST(XRANDR_REQUIRED) +dnl ---------------------------------------------------------------------------- +dnl DCONF +dnl ---------------------------------------------------------------------------- + +DCONF_NEW_REQUIRED=0.13.4 +DCONF_OLD_REQUIRED=0.10.0 + +PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED], + [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= $DCONF_NEW_REQUIRED])], + [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED], + [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF $DCONF_OLD_REQUIRED]) + ]) +]) +AC_SUBST(DCONF_CFLAGS) +AC_SUBST(DCONF_LIBS) + dnl ---------------------------------------------------------------------------- dnl startup notification dnl ---------------------------------------------------------------------------- diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am index 0c0b3e2..8c27b12 100644 --- a/libmate-desktop/Makefile.am +++ b/libmate-desktop/Makefile.am @@ -2,6 +2,7 @@ libmate_desktopdir = $(includedir)/mate-desktop-2.0/ libmate_desktop_HEADERS = \ mate-desktop-utils.h \ mate-desktop-item.h \ + mate-dconf.h \ mate-bg.h \ mate-bg-crossfade.h \ mate-desktop-thumbnail.h \ @@ -14,6 +15,7 @@ lib_LTLIBRARIES = libmate-desktop-2.la AM_CPPFLAGS = \ $(MATE_DESKTOP_CFLAGS) \ $(XLIB_CFLAGS) \ + $(DCONF_CFLAGS) \ -DG_LOG_DOMAIN=\"MateDesktop\" \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \ -DPNP_IDS=\""$(PNP_IDS)"\" \ @@ -28,6 +30,7 @@ libmate_desktop_2_la_SOURCES = \ mate-desktop-utils.c \ mate-desktop-thumbnail.c \ mate-thumbnail-pixbuf-utils.c \ + mate-dconf.h \ mate-bg.c \ mate-bg-crossfade.c \ display-name.c \ @@ -41,7 +44,8 @@ libmate_desktop_2_la_SOURCES = \ libmate_desktop_2_la_LIBADD = \ $(XLIB_LIBS) \ - $(MATE_DESKTOP_LIBS) + $(MATE_DESKTOP_LIBS) \ + $(DCONF_LIBS) libmate_desktop_2_la_LDFLAGS = \ -version-info $(LT_VERSION) \ diff --git a/libmate-desktop/mate-dconf.c b/libmate-desktop/mate-dconf.c new file mode 100644 index 0000000..a412df7 --- /dev/null +++ b/libmate-desktop/mate-dconf.c @@ -0,0 +1,161 @@ +/* + * mate-dconf.c: helper API for dconf + * + * Copyright (C) 2011 Novell, Inc. + * Copyright (C) 2013 Stefano Karapetsas + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301, USA. + * + * Authors: + * Vincent Untz + * Stefano Karapetsas + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include + +#include "mate-dconf.h" + +static DConfClient * +mate_dconf_client_get (void) +{ +#ifdef HAVE_DCONF_0_13 + return dconf_client_new (); +#else + return dconf_client_new (NULL, NULL, NULL, NULL); +#endif +} + +/** + * mate_dconf_write_sync: + * @key: the key to write. + * @value: the value to write. + * @error: a variable to store the error, or NULL. + * + * Allow to write a value to dconf. + * + * Since: 1.7.1 + */ +gboolean +mate_dconf_write_sync (const gchar *key, + GVariant *value, + GError **error) +{ + gboolean ret; + DConfClient *client = mate_dconf_client_get (); + +#ifdef HAVE_DCONF_0_13 + ret = dconf_client_write_sync (client, key, value, NULL, NULL, error); +#else + ret = dconf_client_write (client, key, value, NULL, NULL, error); +#endif + + g_object_unref (client); + + return ret; +} + +/** + * mate_dconf_recursive_reset: + * @dir: the dconf directory to reset. + * @error: a variable to store the error, or NULL. + * + * Allow to reset a dconf path. + * + * Since: 1.7.1 + */ +gboolean +mate_dconf_recursive_reset (const gchar *dir, + GError **error) +{ + gboolean ret; + DConfClient *client = mate_dconf_client_get (); + +#ifdef HAVE_DCONF_0_13 + ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error); +#else + ret = dconf_client_write (client, dir, NULL, NULL, NULL, error); +#endif + + g_object_unref (client); + + return ret; +} + +/** + * mate_dconf_list_subdirs: + * @dir: the dconf directory. + * @remove_trailing_slash: whether to remove the trailing slash from + * paths. + * + * Returns the list of subdirectories of the given dconf directory. + * + * Return value: the list of subdirectories. + * + * Since: 1.7.1 + */ +gchar ** +mate_dconf_list_subdirs (const gchar *dir, + gboolean remove_trailing_slash) +{ + GArray *array; + gchar **children; + int len; + int i; + DConfClient *client = mate_dconf_client_get (); + + array = g_array_new (TRUE, TRUE, sizeof (gchar *)); + + children = dconf_client_list (client, dir, &len); + + g_object_unref (client); + + for (i = 0; children[i] != NULL; i++) { + if (dconf_is_rel_dir (children[i], NULL)) { + char *val = g_strdup (children[i]); + + if (remove_trailing_slash) + val[strlen (val) - 1] = '\0'; + + array = g_array_append_val (array, val); + } + } + + g_strfreev (children); + + return (gchar **) g_array_free (array, FALSE); +} + +/** + * mate_dconf_sync: + * + * Ensure dconf daemon syncs the written values. + * + * Since: 1.7.1 + */ +void mate_dconf_sync () +{ +#ifdef HAVE_DCONF_0_13 + DConfClient *client = mate_dconf_client_get (); + dconf_client_sync (client); + g_object_unref (client); +#endif +} diff --git a/libmate-desktop/mate-dconf.h b/libmate-desktop/mate-dconf.h new file mode 100644 index 0000000..6bb7304 --- /dev/null +++ b/libmate-desktop/mate-dconf.h @@ -0,0 +1,48 @@ +/* + * mate-dconf.h: helper API for dconf + * + * Copyright (C) 2011 Novell, Inc. + * Copyright (C) 2013 Stefano Karapetsas + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301, USA. + * + * Authors: + * Vincent Untz + * Stefano Karapetsas + */ + +#ifndef __MATE_DCONF_H__ +#define __MATE_DCONF_H__ + +#include + +G_BEGIN_DECLS + +gboolean mate_dconf_write_sync (const gchar *key, + GVariant *value, + GError **error); + +gboolean mate_dconf_recursive_reset (const gchar *dir, + GError **error); + +gchar **mate_dconf_list_subdirs (const gchar *dir, + gboolean remove_trailing_slash); + +void mate_dconf_sync (); + +G_END_DECLS + +#endif /* __MATE_DCONF_H__ */ diff --git a/libmate-desktop/mate-desktop-2.0.pc.in b/libmate-desktop/mate-desktop-2.0.pc.in index 37681b6..7adb051 100644 --- a/libmate-desktop/mate-desktop-2.0.pc.in +++ b/libmate-desktop/mate-desktop-2.0.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: mate-desktop-2.0 Description: Utility library for loading .desktop files -Requires: gtk+-@GTK_API_VERSION@ @STARTUP_NOTIFICATION_PACKAGE@ +Requires: gtk+-@GTK_API_VERSION@ @STARTUP_NOTIFICATION_PACKAGE@ dconf Version: @VERSION@ Libs: -L${libdir} -lmate-desktop-2 Cflags: -I${includedir}/mate-desktop-2.0 -- cgit v1.2.1