From cde1dbc2942cf146c01774b76ba0466e775ab761 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 30 Nov 2004 23:35:15 +0000 Subject: Add deprecated defines to AM_CPPFLAGS in maintainer-mode. 2004-12-01 Christian Persch * 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. --- lib/eel-gconf-extensions.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'lib/eel-gconf-extensions.c') 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 + #include #include #include @@ -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); -- cgit