Remove GConf completely
Removes sugar-gconf from SugarExt Removes gconf-2 dependency
This commit is contained in:
parent
db2ba3e579
commit
d918e7afff
@ -20,7 +20,7 @@ AM_PATH_PYTHON
|
|||||||
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
|
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
|
||||||
|
|
||||||
PKG_CHECK_MODULES(EXT, gtk+-3.0 gdk-3.0 gdk-pixbuf-2.0 sm ice alsa
|
PKG_CHECK_MODULES(EXT, gtk+-3.0 gdk-3.0 gdk-pixbuf-2.0 sm ice alsa
|
||||||
librsvg-2.0 xfixes xi x11 gconf-2.0)
|
librsvg-2.0 xfixes xi x11)
|
||||||
|
|
||||||
GLIB_MKENUMS=`$PKG_CONFIG glib-2.0 --variable=glib_mkenums`
|
GLIB_MKENUMS=`$PKG_CONFIG glib-2.0 --variable=glib_mkenums`
|
||||||
AC_SUBST(GLIB_MKENUMS)
|
AC_SUBST(GLIB_MKENUMS)
|
||||||
|
@ -83,8 +83,6 @@ libsugarext_la_SOURCES = \
|
|||||||
sugar-key-grabber.h \
|
sugar-key-grabber.h \
|
||||||
sugar-wm.h \
|
sugar-wm.h \
|
||||||
sugar-wm.c \
|
sugar-wm.c \
|
||||||
sugar-gconf.h \
|
|
||||||
sugar-gconf.c \
|
|
||||||
$(XDG_MIME_SOURCES)
|
$(XDG_MIME_SOURCES)
|
||||||
|
|
||||||
BUILT_SOURCES = \
|
BUILT_SOURCES = \
|
||||||
@ -138,13 +136,11 @@ SugarExt_1_0_gir_FILES = \
|
|||||||
sugar-grid.h \
|
sugar-grid.h \
|
||||||
sugar-wm.c \
|
sugar-wm.c \
|
||||||
sugar-wm.h \
|
sugar-wm.h \
|
||||||
sugar-gconf.c \
|
|
||||||
sugar-gconf.h \
|
|
||||||
$(XDG_MIME_SOURCES)
|
$(XDG_MIME_SOURCES)
|
||||||
|
|
||||||
SugarExt_1_0_gir: libsugarext.la
|
SugarExt_1_0_gir: libsugarext.la
|
||||||
SugarExt_1_0_gir_INCLUDES = Gtk-3.0 Gdk-3.0 GConf-2.0
|
SugarExt_1_0_gir_INCLUDES = Gtk-3.0 Gdk-3.0
|
||||||
SugarExt_1_0_gir_PACKAGES = gtk+-3.0 gdk-3.0 gconf-2.0
|
SugarExt_1_0_gir_PACKAGES = gtk+-3.0 gdk-3.0
|
||||||
SugarExt_1_0_gir_EXPORT_PACKAGES = SugarExt-1.0
|
SugarExt_1_0_gir_EXPORT_PACKAGES = SugarExt-1.0
|
||||||
|
|
||||||
girdir = $(datadir)/gir-1.0
|
girdir = $(datadir)/gir-1.0
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
# Boston, MA 02111-1307, USA.
|
# Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
"""User settings/configuration loading.
|
"""User settings/configuration loading.
|
||||||
|
|
||||||
DEPRECATED. We are using GConf now to store preferences.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from gi.repository import Gio
|
from gi.repository import Gio
|
||||||
@ -36,10 +34,6 @@ _profile = None
|
|||||||
class Profile(object):
|
class Profile(object):
|
||||||
"""Local user's current options/profile information
|
"""Local user's current options/profile information
|
||||||
|
|
||||||
User settings were previously stored in an INI-style
|
|
||||||
configuration file. We moved to gconf now. The deprected
|
|
||||||
API is kept around to not break activities still using it.
|
|
||||||
|
|
||||||
The profile is also responsible for loading the user's
|
The profile is also responsible for loading the user's
|
||||||
public and private ssh keys from disk.
|
public and private ssh keys from disk.
|
||||||
|
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2013, Daniel Narvaez
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "sugar-gconf.h"
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* sugar_gconf_client_set_string_list:
|
|
||||||
* @list: (element-type utf8) (transfer container)
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
sugar_gconf_client_set_string_list(GConfClient *client,
|
|
||||||
const char *key,
|
|
||||||
GSList *list,
|
|
||||||
GError *err)
|
|
||||||
{
|
|
||||||
gconf_client_set_list(client, key, GCONF_VALUE_STRING, list, NULL);
|
|
||||||
}
|
|
@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2013, Daniel Narvaez
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SUGAR_GCONF_H__
|
|
||||||
#define __SUGAR_GCONF_H__
|
|
||||||
|
|
||||||
#include <gconf/gconf-client.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
void sugar_gconf_client_set_string_list (GConfClient *client,
|
|
||||||
const char *key,
|
|
||||||
GSList *list,
|
|
||||||
GError *err);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __SUGAR_GCONF_H__ */
|
|
Loading…
Reference in New Issue
Block a user