diff options
| author | Stefano Karapetsas <[email protected]> | 2014-04-21 13:41:23 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-04-21 13:41:23 +0200 |
| commit | 0da16b7a0f2d43d50c3087ba904b224eb7e846b3 (patch) | |
| tree | 31e2f1bfaa31e3f6817b29965f73197abfac635a /mate-panel/libpanel-util | |
| parent | cee5574921774fe9ae6041e2aefc2e0c5129e1af (diff) | |
| download | mate-panel-0da16b7a0f2d43d50c3087ba904b224eb7e846b3.tar.bz2 mate-panel-0da16b7a0f2d43d50c3087ba904b224eb7e846b3.tar.xz | |
Use dconf functions from libmate-desktop
Diffstat (limited to 'mate-panel/libpanel-util')
| -rw-r--r-- | mate-panel/libpanel-util/Makefile.am | 2 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-dconf.c | 113 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-dconf.h | 44 |
3 files changed, 0 insertions, 159 deletions
diff --git a/mate-panel/libpanel-util/Makefile.am b/mate-panel/libpanel-util/Makefile.am index 96823bc1..e1058eb5 100644 --- a/mate-panel/libpanel-util/Makefile.am +++ b/mate-panel/libpanel-util/Makefile.am @@ -16,8 +16,6 @@ libpanel_util_la_SOURCES = \ panel-cleanup.h \ panel-dbus-service.c \ panel-dbus-service.h \ - panel-dconf.c \ - panel-dconf.h \ panel-error.c \ panel-error.h \ panel-glib.c \ diff --git a/mate-panel/libpanel-util/panel-dconf.c b/mate-panel/libpanel-util/panel-dconf.c deleted file mode 100644 index a103bcf3..00000000 --- a/mate-panel/libpanel-util/panel-dconf.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * panel-dconf.c: helper API for dconf - * - * Copyright (C) 2011 Novell, Inc. - * - * 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 <[email protected]> - * Stefano Karapetsas <[email protected]> - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string.h> - -#include <dconf.h> - -#include "panel-dconf.h" - -static DConfClient * -panel_dconf_client_get (void) -{ -#ifdef HAVE_DCONF_0_13 - return dconf_client_new (); -#else - return dconf_client_new (NULL, NULL, NULL, NULL); -#endif -} - -gboolean -panel_dconf_write_sync (const gchar *key, - GVariant *value, - GError **error) -{ - gboolean ret; - DConfClient *client = panel_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; -} - -gboolean -panel_dconf_recursive_reset (const gchar *dir, - GError **error) -{ - gboolean ret; - DConfClient *client = panel_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; -} - -gchar ** -panel_dconf_list_subdirs (const gchar *dir, - gboolean remove_trailing_slash) -{ - GArray *array; - gchar **children; - int len; - int i; - DConfClient *client = panel_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); -} diff --git a/mate-panel/libpanel-util/panel-dconf.h b/mate-panel/libpanel-util/panel-dconf.h deleted file mode 100644 index 1683ec05..00000000 --- a/mate-panel/libpanel-util/panel-dconf.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * panel-dconf.h: helper API for dconf - * - * Copyright (C) 2011 Novell, Inc. - * - * 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 <[email protected]> - */ - -#ifndef __PANEL_DCONF_H__ -#define __PANEL_DCONF_H__ - -#include <glib.h> - -G_BEGIN_DECLS - -gboolean panel_dconf_write_sync (const gchar *key, - GVariant *value, - GError **error); - -gboolean panel_dconf_recursive_reset (const gchar *dir, - GError **error); - -gchar **panel_dconf_list_subdirs (const gchar *dir, - gboolean remove_trailing_slash); - -G_END_DECLS - -#endif /* __PANEL_DCONF_H__ */ |