applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed HAVE_BONOBO from acconfig.h

Browse source 
Fixed capplet Makefile.am's. Some porting for control-center/main.c
This commit is contained in:
Bradford Hovinen (Gdict maintainer) 2001-11-10 20:55:08 +00:00
parent 430bb66299
commit 86192c772e
10 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
acconfig.h
View file

@ -7,7 +7,6 @@
#undef HAVE_LIBSM #undef HAVE_LIBSM
#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
#undef HAVE_PROGRAM_INVOCATION_NAME #undef HAVE_PROGRAM_INVOCATION_NAME
#undef HAVE_BONOBO
#undef GNOMECC_ICONS_DIR #undef GNOMECC_ICONS_DIR
#undef GNOMECC_GLADE_DIR #undef GNOMECC_GLADE_DIR

2
capplets/default-applications/Makefile.am
View file

@ -15,7 +15,7 @@ pixmap_DATA =
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

2
capplets/desktop-links/Makefile.am
View file

@ -3,7 +3,7 @@ ccenterdir = $(datadir)/control-center/capplets
Desktopdir = $(ccenterdir) Desktopdir = $(ccenterdir)
Desktop_in_files = gnome-hint-properties.desktop.in Desktop_in_files = gnome-hint-properties.desktop.in
Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \ EXTRA_DIST = \
$(Desktop_in_files) $(Desktop_in_files)

2
capplets/keyboard/Makefile.am
View file

@ -21,7 +21,7 @@ oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@

2
capplets/mouse/Makefile.am
View file

@ -21,7 +21,7 @@ oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@

2
capplets/rollback/Makefile.am
View file

@ -9,7 +9,7 @@ rollback_capplet_SOURCES = \
rollback-capplet-dialog.c rollback-capplet-dialog.h \ rollback-capplet-dialog.c rollback-capplet-dialog.h \
main.c main.c
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

2
capplets/screensaver/Makefile.am
View file

@ -24,7 +24,7 @@ pixmaps_DATA = no-hack.png blank-screen.png
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in

2
capplets/sound/Makefile.am
View file

@ -25,7 +25,7 @@ oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
## ##
## You should not need to modify anything below this line ## You should not need to modify anything below this line
## ##
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@ sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@

2
control-center/Makefile.am
View file

@ -11,7 +11,7 @@ splash_DATA = \
sysdir = $(datadir)/gnome/apps/Settings sysdir = $(datadir)/gnome/apps/Settings
sys_in_files = gnomecc.desktop.in sys_in_files = gnomecc.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop) sys_DATA = $(sys_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(datadir)/control-center/interfaces gladedir = $(datadir)/control-center/interfaces
glade_DATA = \ glade_DATA = \

6
control-center/main.c
View file

@ -27,12 +27,8 @@
#include <gnome.h> #include <gnome.h>
#include <glade/glade.h> #include <glade/glade.h>
#include <bonobo.h> #include <bonobo.h>
#ifdef GTKHTML_HAVE_GCONF
#include <gconf/gconf.h> #include <gconf/gconf.h>
#endif
#include "capplet-dir.h" #include "capplet-dir.h"
#include "capplet-dir-view.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) if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
g_error ("Cannot initialize bonobo"); g_error ("Cannot initialize bonobo");
#ifdef GTKHTML_HAVE_GCONF
gconf_init (argc, argv, NULL); gconf_init (argc, argv, NULL);
#endif
if (capplet == NULL) { if (capplet == NULL) {
gnomecc_init (); gnomecc_init ();