diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-12-01 07:35:15 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-12-01 07:35:15 +0800 |
| commit | cde1dbc2942cf146c01774b76ba0466e775ab761 (patch) | |
| tree | 0712acb55b93089fa975528e635fc2c52d574bfe /lib/eel-gconf-extensions.c | |
| parent | 65e5b595792b3ba941db3a1f77707946fe8810ed (diff) | |
| download | gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.gz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.bz2 gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.lz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.xz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.zst gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.zip | |
Add deprecated defines to AM_CPPFLAGS in maintainer-mode.
2004-12-01 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
Add deprecated defines to AM_CPPFLAGS in maintainer-mode.
* doc/reference/Makefile.am:
* embed/Makefile.am:
* embed/mozilla/Makefile.am:
* lib/Makefile.am:
* lib/egg/Makefile.am:
* lib/egg/eggintl.h:
* lib/widgets/Makefile.am:
* src/Makefile.am:
* src/bookmarks/Makefile.am:
INCLUDES is deprecated, use AM_CPPFLAGS and AM_CFLAGS instead.
* lib/eel-gconf-extensions.c: (eel_gconf_client_get_global):
Removed usage of deprecated gconf API.
* src/ephy-main.c: (main):
Removed usage of deprecated glade API.
Diffstat (limited to 'lib/eel-gconf-extensions.c')
| -rw-r--r-- | lib/eel-gconf-extensions.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c index c3c489702..7f616084d 100644 --- a/lib/eel-gconf-extensions.c +++ b/lib/eel-gconf-extensions.c @@ -29,6 +29,7 @@ #include "eel-gconf-extensions.h" #include <glib/gi18n.h> + #include <gconf/gconf-client.h> #include <gconf/gconf.h> #include <string.h> @@ -50,18 +51,6 @@ global_client_free (void) GConfClient * eel_gconf_client_get_global (void) { - /* Initialize gconf if needed */ - if (!gconf_is_initialized ()) { - char *argv[] = { "eel-preferences", NULL }; - GError *error = NULL; - - if (!gconf_init (1, argv, &error)) { - if (eel_gconf_handle_error (&error)) { - return NULL; - } - } - } - if (global_gconf_client == NULL) { global_gconf_client = gconf_client_get_default (); g_atexit (global_client_free); |