Removed HAVE_BONOBO from acconfig.h
Fixed capplet Makefile.am's. Some porting for control-center/main.c
This commit is contained in:
parent
430bb66299
commit
86192c772e
10 changed files with 8 additions and 15 deletions
|
@ -27,12 +27,8 @@
|
|||
|
||||
#include <gnome.h>
|
||||
#include <glade/glade.h>
|
||||
|
||||
#include <bonobo.h>
|
||||
|
||||
#ifdef GTKHTML_HAVE_GCONF
|
||||
#include <gconf/gconf.h>
|
||||
#endif
|
||||
|
||||
#include "capplet-dir.h"
|
||||
#include "capplet-dir-view.h"
|
||||
|
@ -79,9 +75,7 @@ main (int argc, char **argv)
|
|||
if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
|
||||
g_error ("Cannot initialize bonobo");
|
||||
|
||||
#ifdef GTKHTML_HAVE_GCONF
|
||||
gconf_init (argc, argv, NULL);
|
||||
#endif
|
||||
|
||||
if (capplet == NULL) {
|
||||
gnomecc_init ();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue