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

Don't define directories in configure. Remove some obsolete defines, and

Browse source 
2007-02-02  Christian Persch  <chpe@svn.gnome.org>

	* Makefile.am:
	* capplets/about-me/Makefile.am:
	* capplets/about-me/gnome-about-me-password.c: (passdlg_init):
	* capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
	* capplets/accessibility/at-properties/Makefile.am:
	* capplets/accessibility/keyboard/Makefile.am:
	* capplets/accessibility/keyboard/accessibility-keyboard.c:
	(setup_accessX_dialog):
	* capplets/background/Makefile.am:
	* capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
	* capplets/common/Makefile.am:
	* capplets/common/capplet-util.c: (capplet_set_icon):
	* capplets/default-applications/Makefile.am:
	* capplets/display/Makefile.am:
	* capplets/file-types/Makefile.am:
	* capplets/file-types/file-types-capplet.c: (create_dialog):
	* capplets/file-types/mime-category-edit-dialog.c:
	(mime_category_edit_dialog_init):
	* capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
	* capplets/file-types/service-edit-dialog.c:
	(service_edit_dialog_init):
	* capplets/font/Makefile.am:
	* capplets/keybindings/Makefile.am:
	* capplets/keybindings/gnome-keybinding-properties.c:
	(create_dialog):
	* capplets/keyboard/Makefile.am:
	* capplets/keyboard/gnome-keyboard-properties-xkblt.c:
	(xkb_layout_choose):
	* capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
	(choose_model):
	* capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
	* capplets/localization/Makefile.am:
	* capplets/localization/gnome-localization-properties.c:
	(create_dialog):
	* capplets/mime-type/Makefile.am:
	* capplets/mouse/Makefile.am:
	* capplets/mouse/gnome-mouse-properties.c: (create_dialog):
	* capplets/network/Makefile.am:
	* capplets/network/gnome-network-preferences.c:
	(cb_http_details_button_clicked), (main):
	* capplets/rollback/Makefile.am:
	* capplets/sound/Makefile.am:
	* capplets/sound/sound-properties-capplet.c: (create_dialog),
	(device_test_button_clicked):
	* capplets/theme-switcher/Makefile.am:
	* capplets/ui-properties/Makefile.am:
	* capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
	* capplets/url-properties/Makefile.am:
	* capplets/windows/Makefile.am:
	* capplets/wm-properties/wm-desktops/Makefile.am:
	* configure.in:
	* gnome-settings-daemon/Makefile.am:
	* gnome-settings-daemon/actions/Makefile.am:
	* gnome-settings-daemon/gnome-settings-xmodmap.c:
	(gnome_settings_modmap_dialog_call):
	* gnome-settings-daemon/gnome-settings-xrdb.c:
	* gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
	(gsd_media_keys_window_init):
	* gnome-settings-daemon/xrdb/Makefile.am:
	* typing-break/Makefile.am:
	* vfs-methods/themus/Makefile.am: Don't define directories in
	configure. Remove some obsolete defines, and use the standard
	installation paths. Bug #395383.

svn path=/trunk/; revision=7226
This commit is contained in:
Christian Persch 2007-02-02 18:12:40 +00:00 • committed by Christian Persch
parent 76cbf39631
commit 43d40d7a0a
51 changed files with 202 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

66
ChangeLog
View file

@ -1,3 +1,69 @@
2007-02-02 Christian Persch <chpe@svn.gnome.org>
* Makefile.am:
* capplets/about-me/Makefile.am:
* capplets/about-me/gnome-about-me-password.c: (passdlg_init):
* capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
* capplets/accessibility/at-properties/Makefile.am:
* capplets/accessibility/keyboard/Makefile.am:
* capplets/accessibility/keyboard/accessibility-keyboard.c:
(setup_accessX_dialog):
* capplets/background/Makefile.am:
* capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
* capplets/common/Makefile.am:
* capplets/common/capplet-util.c: (capplet_set_icon):
* capplets/default-applications/Makefile.am:
* capplets/display/Makefile.am:
* capplets/file-types/Makefile.am:
* capplets/file-types/file-types-capplet.c: (create_dialog):
* capplets/file-types/mime-category-edit-dialog.c:
(mime_category_edit_dialog_init):
* capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
* capplets/file-types/service-edit-dialog.c:
(service_edit_dialog_init):
* capplets/font/Makefile.am:
* capplets/keybindings/Makefile.am:
* capplets/keybindings/gnome-keybinding-properties.c:
(create_dialog):
* capplets/keyboard/Makefile.am:
* capplets/keyboard/gnome-keyboard-properties-xkblt.c:
(xkb_layout_choose):
* capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
(choose_model):
* capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
* capplets/localization/Makefile.am:
* capplets/localization/gnome-localization-properties.c:
(create_dialog):
* capplets/mime-type/Makefile.am:
* capplets/mouse/Makefile.am:
* capplets/mouse/gnome-mouse-properties.c: (create_dialog):
* capplets/network/Makefile.am:
* capplets/network/gnome-network-preferences.c:
(cb_http_details_button_clicked), (main):
* capplets/rollback/Makefile.am:
* capplets/sound/Makefile.am:
* capplets/sound/sound-properties-capplet.c: (create_dialog),
(device_test_button_clicked):
* capplets/theme-switcher/Makefile.am:
* capplets/ui-properties/Makefile.am:
* capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
* capplets/url-properties/Makefile.am:
* capplets/windows/Makefile.am:
* capplets/wm-properties/wm-desktops/Makefile.am:
* configure.in:
* gnome-settings-daemon/Makefile.am:
* gnome-settings-daemon/actions/Makefile.am:
* gnome-settings-daemon/gnome-settings-xmodmap.c:
(gnome_settings_modmap_dialog_call):
* gnome-settings-daemon/gnome-settings-xrdb.c:
* gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
(gsd_media_keys_window_init):
* gnome-settings-daemon/xrdb/Makefile.am:
* typing-break/Makefile.am:
* vfs-methods/themus/Makefile.am: Don't define directories in
configure. Remove some obsolete defines, and use the standard
installation paths. Bug #395383.
2007-01-31 Christian Persch <chpe@svn.gnome.org> 2007-01-31 Christian Persch <chpe@svn.gnome.org>
* configure.in: * configure.in:

2
Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK) SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods schemas $(TYPING_BREAK)
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

4
capplets/about-me/Makefile.am
View file

@ -1,6 +1,6 @@
bin_PROGRAMS = gnome-about-me bin_PROGRAMS = gnome-about-me
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
gnome-about-me-lock.png \ gnome-about-me-lock.png \
gnome-about-me-lock-open.png gnome-about-me-lock-open.png
@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-about-me.desktop.in Desktop_in_files = gnome-about-me.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-about-me.glade Glade_DATA = gnome-about-me.glade
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)

2
capplets/about-me/gnome-about-me-password.c
View file

@ -984,7 +984,7 @@ passdlg_init (PasswordDialog *pdialog, GtkWindow *parent)
GtkAccelGroup *group; GtkAccelGroup *group;
/* Initialize dialog */ /* Initialize dialog */
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade", "change-password", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade", "change-password", NULL);
pdialog->xml = dialog; pdialog->xml = dialog;
wpassdlg = WID ("change-password"); wpassdlg = WID ("change-password");

2
capplets/about-me/gnome-about-me.c
View file

@ -730,7 +730,7 @@ about_me_setup_dialog (void)
me = g_new0 (GnomeAboutMe, 1); me = g_new0 (GnomeAboutMe, 1);
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade", dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade",
"about-me-dialog", NULL); "about-me-dialog", NULL);
if (dialog == NULL) { if (dialog == NULL) {

5
capplets/accessibility/at-properties/Makefile.am
View file

@ -13,18 +13,19 @@ desktopdir = $(datadir)/applications
Desktop_in_files = at-properties.desktop.in Desktop_in_files = at-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
at-startup.png \ at-startup.png \
at-support.png at-support.png
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = at-enable-dialog.glade glade_DATA = at-enable-dialog.glade
INCLUDES = $(AT_CAPPLET_CFLAGS) \ INCLUDES = $(AT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)

12
capplets/accessibility/keyboard/Makefile.am
View file

@ -15,7 +15,7 @@ gnome_accessibility_keyboard_properties_LDADD = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
accessibility-keyboard-togglekey.png \ accessibility-keyboard-togglekey.png \
accessibility-keyboard-mousekey.png \ accessibility-keyboard-mousekey.png \
@ -23,14 +23,20 @@ pixmap_DATA = \
accessibility-keyboard-stickykey.png \ accessibility-keyboard-stickykey.png \
accessibility-keyboard-bouncekey.png accessibility-keyboard-bouncekey.png
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-accessibility-keyboard-properties.glade Glade_DATA = gnome-accessibility-keyboard-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
Desktop_in_files = accessibility-keyboard.desktop.in Desktop_in_files = accessibility-keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)

3
capplets/accessibility/keyboard/accessibility-keyboard.c
View file

@ -456,8 +456,7 @@ setup_accessX_dialog (GConfChangeSet *changeset)
{ {
GConfClient *client; GConfClient *client;
char const *toplevel_name = "accessX_dialog"; char const *toplevel_name = "accessX_dialog";
GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR GladeXML *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-accessibility-keyboard-properties.glade",
"/interfaces/gnome-accessibility-keyboard-properties.glade",
toplevel_name, NULL); toplevel_name, NULL);
GtkWidget *toplevel = WID (toplevel_name); GtkWidget *toplevel = WID (toplevel_name);

3
capplets/background/Makefile.am
View file

@ -3,6 +3,7 @@ WALLPAPER_DATADIR = $(datadir)/gnome-background-properties
INCLUDES = \ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\" -DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
bin_PROGRAMS = gnome-background-properties bin_PROGRAMS = gnome-background-properties
@ -31,7 +32,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-background-properties.glade glade_DATA = gnome-background-properties.glade
install-data-local: install-data-local:

3
capplets/background/gnome-wp-capplet.c
View file

@ -797,8 +797,7 @@ static GladeXML * gnome_wp_create_dialog (void) {
GladeXML * new; GladeXML * new;
gchar * gladefile; gchar * gladefile;
gladefile = g_build_filename (GNOMECC_DATA_DIR, gladefile = g_build_filename (GNOMECC_GLADE_DIR,
"interfaces",
"gnome-background-properties.glade", "gnome-background-properties.glade",
NULL); NULL);

4
capplets/common/Makefile.am
View file

@ -1,8 +1,10 @@
EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
INCLUDES = \ INCLUDES = \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_ICONS_DIR="\"$(pkgdatadir)/icons\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \ -DG_LOG_DOMAIN=\"capplet-common\" \
-DINSTALL_PREFIX=\"$(prefix)\" \ -DINSTALL_PREFIX=\"$(prefix)\" \
-I$(top_srcdir) \ -I$(top_srcdir) \

2
capplets/common/capplet-util.c
View file

@ -382,7 +382,7 @@ capplet_set_icon (GtkWidget *window, char const *icon_file_name)
if (icon_pixbuf == NULL) { if (icon_pixbuf == NULL) {
/* Then we fallback to the control center icon location */ /* Then we fallback to the control center icon location */
path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL); path = g_build_filename (GNOMECC_ICONS_DIR, icon_file_name, NULL);
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path); g_free (path);

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

@ -8,7 +8,7 @@ gnome_default_applications_properties_SOURCES = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-default-applications-properties.glade glade_DATA = gnome-default-applications-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
@ -16,7 +16,7 @@ Desktop_in_files = default-applications.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
xmldata_in_files = gnome-default-applications.xml.in xmldata_in_files = gnome-default-applications.xml.in
xmldatadir = $(datadir)/gnome-default-applications xmldatadir = $(pkgdatadir)/gnome-default-applications
xmldata_DATA = $(xmldata_in_files:.xml.in=.xml) xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@ @INTLTOOL_XML_RULE@

4
capplets/display/Makefile.am
View file

@ -7,7 +7,7 @@ gnome_display_properties_LDFLAGS = -export-dynamic
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
iconsdir = $(GNOMECC_ICONS_DIR) iconsdir = $(pkgdatadir)/icons
icons_DATA = display-capplet.png icons_DATA = display-capplet.png
desktop_iconsdir = $(datadir)/pixmaps desktop_iconsdir = $(datadir)/pixmaps
@ -21,7 +21,7 @@ INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(icons_DATA) EXTRA_DIST = $(icons_DATA)

2
capplets/file-types/Makefile.am
View file

@ -16,7 +16,7 @@ gnome_file_types_properties_SOURCES = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = file-types-properties.glade Glade_DATA = file-types-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications

2
capplets/file-types/file-types-capplet.c
View file

@ -197,7 +197,7 @@ create_dialog (void)
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkTreeSelection *selection; GtkTreeSelection *selection;
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "main_dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/file-types-properties.glade", "main_dialog", NULL);
model = GTK_TREE_MODEL (mime_types_model_new (FALSE)); model = GTK_TREE_MODEL (mime_types_model_new (FALSE));
treeview = WID ("mime_types_tree"); treeview = WID ("mime_types_tree");

2
capplets/file-types/mime-category-edit-dialog.c
View file

@ -123,7 +123,7 @@ mime_category_edit_dialog_init (MimeCategoryEditDialog *dialog, MimeCategoryEdit
dialog->p = g_new0 (MimeCategoryEditDialogPrivate, 1); dialog->p = g_new0 (MimeCategoryEditDialogPrivate, 1);
dialog->p->dialog_xml = glade_xml_new dialog->p->dialog_xml = glade_xml_new
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "mime_category_edit_widget", NULL); (GNOMECC_GLADE_DIR "/file-types-properties.glade", "mime_category_edit_widget", NULL);
dialog->p->model = NULL; dialog->p->model = NULL;
dialog->p->info = NULL; dialog->p->info = NULL;

2
capplets/file-types/mime-edit-dialog.c
View file

@ -184,7 +184,7 @@ mime_edit_dialog_init (MimeEditDialog *dialog, MimeEditDialogClass *class)
dialog->p = g_new0 (MimeEditDialogPrivate, 1); dialog->p = g_new0 (MimeEditDialogPrivate, 1);
dialog->p->dialog_xml = glade_xml_new dialog->p->dialog_xml = glade_xml_new
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "edit_widget", NULL); (GNOMECC_GLADE_DIR "/file-types-properties.glade", "edit_widget", NULL);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (size_group, WID ("description_label")); gtk_size_group_add_widget (size_group, WID ("description_label"));

2
capplets/file-types/service-edit-dialog.c
View file

@ -125,7 +125,7 @@ service_edit_dialog_init (ServiceEditDialog *dialog, ServiceEditDialogClass *cla
dialog->p = g_new0 (ServiceEditDialogPrivate, 1); dialog->p = g_new0 (ServiceEditDialogPrivate, 1);
dialog->p->dialog_xml = glade_xml_new dialog->p->dialog_xml = glade_xml_new
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "service_edit_widget", NULL); (GNOMECC_GLADE_DIR "/file-types-properties.glade", "service_edit_widget", NULL);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (size_group, WID ("description_label")); gtk_size_group_add_widget (size_group, WID ("description_label"));

7
capplets/font/Makefile.am
View file

@ -11,7 +11,7 @@ gnome_font_properties_LDFLAGS = -export-dynamic
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
subpixel-rgb.png \ subpixel-rgb.png \
subpixel-bgr.png \ subpixel-bgr.png \
@ -22,13 +22,14 @@ desktopdir = $(datadir)/applications
Desktop_in_files = font-properties.desktop.in Desktop_in_files = font-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = font-properties.glade glade_DATA = font-properties.glade
INCLUDES = $(FONT_CAPPLET_CFLAGS) \ INCLUDES = $(FONT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DPIXMAPDIR=\""$(pixmapdir)"\" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)

8
capplets/keybindings/Makefile.am
View file

@ -10,14 +10,18 @@ gnome_keybinding_properties_SOURCES = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-keybinding-properties.glade Glade_DATA = gnome-keybinding-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
Desktop_in_files = keybinding.desktop.in Desktop_in_files = keybinding.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) EXTRA_DIST = $(Glade_DATA)

2
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -169,7 +169,7 @@ create_dialog (void)
{ {
GladeXML *dialog; GladeXML *dialog;
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
return dialog; return dialog;
} }

11
capplets/keyboard/Makefile.am
View file

@ -13,10 +13,10 @@ gnome_keyboard_properties_LDADD = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-keyboard-properties.glade Glade_DATA = gnome-keyboard-properties.glade
pixmapsdir = $(GNOMECC_PIXMAPS_DIR) pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = \ pixmaps_DATA = \
keyboard-repeat.png \ keyboard-repeat.png \
keyboard-cursor.png \ keyboard-cursor.png \
@ -27,6 +27,11 @@ desktopdir = $(datadir)/applications
Desktop_in_files = keyboard.desktop.in Desktop_in_files = keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
$(LIBGNOMEKBDUI_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)

4
capplets/keyboard/gnome-keyboard-properties-xkblt.c
View file

@ -657,8 +657,8 @@ void
xkb_layout_choose (GladeXML * dialog) xkb_layout_choose (GladeXML * dialog)
{ {
GladeXML *chooser_dialog = GladeXML *chooser_dialog =
glade_xml_new (GNOMECC_DATA_DIR glade_xml_new (GNOMECC_GLADE_DIR
"/interfaces/gnome-keyboard-properties.glade", "/gnome-keyboard-properties.glade",
"xkb_layout_chooser", NULL); "xkb_layout_chooser", NULL);
GtkWidget *chooser = CWID ("xkb_layout_chooser"); GtkWidget *chooser = CWID ("xkb_layout_chooser");
GtkWidget *kbdraw = NULL; GtkWidget *kbdraw = NULL;

4
capplets/keyboard/gnome-keyboard-properties-xkbmc.c
View file

@ -161,8 +161,8 @@ void
choose_model (GladeXML * dialog) choose_model (GladeXML * dialog)
{ {
GladeXML *chooser_dialog = GladeXML *chooser_dialog =
glade_xml_new (GNOMECC_DATA_DIR glade_xml_new (GNOMECC_GLADE_DIR
"/interfaces/gnome-keyboard-properties.glade", "/gnome-keyboard-properties.glade",
"xkb_model_chooser", NULL); "xkb_model_chooser", NULL);
GtkWidget *chooser = CWID ("xkb_model_chooser"); GtkWidget *chooser = CWID ("xkb_model_chooser");
gtk_window_set_transient_for (GTK_WINDOW (chooser), gtk_window_set_transient_for (GTK_WINDOW (chooser),

2
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -52,7 +52,7 @@ create_dialog (void)
GladeXML *dialog; GladeXML *dialog;
GtkSizeGroup *size_group; GtkSizeGroup *size_group;
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "keyboard_dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (size_group, WID ("repeat_slow_label")); gtk_size_group_add_widget (size_group, WID ("repeat_slow_label"));

4
capplets/localization/Makefile.am
View file

@ -9,10 +9,10 @@ gnome_localization_properties_LDADD = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-localization-properties.glade glade_DATA = gnome-localization-properties.glade
pixmapsdir = $(GNOMECC_PIXMAPS_DIR) pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = \ pixmaps_DATA = \
localization-capplet.png localization-capplet.png

2
capplets/localization/gnome-localization-properties.c
View file

@ -63,7 +63,7 @@ create_dialog (void)
GladeXML *dialog; GladeXML *dialog;
dialog = glade_xml_new dialog = glade_xml_new
(GNOMECC_DATA_DIR "/interfaces/gnome-localization-properties.glade", (GNOMECC_GLADE_DIR "/gnome-localization-properties.glade",
NULL, NULL); NULL, NULL);
return dialog; return dialog;

6
capplets/mime-type/Makefile.am
View file

@ -21,9 +21,9 @@ pixmap_DATA =
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
iconsdir = $(GNOMECC_ICONS_DIR) iconsdir = $(pkgdatadir)/icons
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
Glade_DATA = $(cappletname)-properties.glade Glade_DATA = $(cappletname)-properties.glade
icons_DATA = $(cappletname)-capplet.png icons_DATA = $(cappletname)-capplet.png
desktop = $(cappletname).desktop desktop = $(cappletname).desktop

10
capplets/mouse/Makefile.am
View file

@ -5,7 +5,7 @@ gnome_mouse_properties_SOURCES = gnome-mouse-properties.c
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
double-click-on.png \ double-click-on.png \
double-click-off.png \ double-click-off.png \
@ -24,13 +24,17 @@ cursorfont_DATA = \
cursor-white.pcf \ cursor-white.pcf \
cursor-large-white.pcf cursor-large-white.pcf
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-mouse-properties.glade Glade_DATA = gnome-mouse-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
Desktop_in_files = gnome-settings-mouse.desktop.in Desktop_in_files = gnome-settings-mouse.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA)

2
capplets/mouse/gnome-mouse-properties.c
View file

@ -982,7 +982,7 @@ create_dialog (void)
/* register the custom type */ /* register the custom type */
(void) mouse_capplet_check_button_get_type (); (void) mouse_capplet_check_button_get_type ();
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
text = g_strdup_printf ("<b>%s</b>", _("Pointer Theme")); text = g_strdup_printf ("<b>%s</b>", _("Pointer Theme"));
gtk_label_set_markup (GTK_LABEL (WID ("cursor_category_label")), text); gtk_label_set_markup (GTK_LABEL (WID ("cursor_category_label")), text);

8
capplets/network/Makefile.am
View file

@ -6,13 +6,17 @@ gnome_network_preferences_LDADD = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-network-preferences.glade glade_DATA = gnome-network-preferences.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_in_files = gnome-network-preferences.desktop.in desktop_in_files = gnome-network-preferences.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) EXTRA_DIST = $(glade_DATA)

4
capplets/network/gnome-network-preferences.c
View file

@ -225,7 +225,7 @@ cb_http_details_button_clicked (GtkWidget *button,
return; return;
} }
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade", dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
"details_dialog", NULL); "details_dialog", NULL);
details_dialog = widget = WID ("details_dialog"); details_dialog = widget = WID ("details_dialog");
@ -545,7 +545,7 @@ main (int argc, char **argv)
gconf_client_add_dir (client, "/system/proxy", gconf_client_add_dir (client, "/system/proxy",
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade", dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
"network_dialog", NULL); "network_dialog", NULL);
setup_dialog (dialog); setup_dialog (dialog);

8
capplets/rollback/Makefile.am
View file

@ -13,7 +13,7 @@ rollback_capplet_SOURCES = \
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in $(desktop).in: %.desktop.in: %.desktop.in.in
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(pkgdatadir)/icons/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
@ -25,9 +25,9 @@ install-data-am: install-data-local
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
iconsdir = $(GNOMECC_ICONS_DIR) iconsdir = $(pkgdatadir)/icons
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
Glade_DATA = $(cappletname).glade Glade_DATA = $(cappletname).glade
icons_DATA = $(cappletname)-capplet.png icons_DATA = $(cappletname)-capplet.png
desktop = $(cappletname).desktop desktop = $(cappletname).desktop

12
capplets/sound/Makefile.am
View file

@ -9,16 +9,22 @@ gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pip
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = sound-properties.glade Glade_DATA = sound-properties.glade
desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR) desktop_iconsdir = $(pkgdatadir)/pixmaps
desktop_icons_DATA = visual-bell.png desktop_icons_DATA = visual-bell.png
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
Desktop_in_files = gnome-settings-sound.desktop.in Desktop_in_files = gnome-settings-sound.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
$(SOUND_CAPPLET_CFLAGS) \
$(HAL_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA) EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA)

4
capplets/sound/sound-properties-capplet.c
View file

@ -162,7 +162,7 @@ create_dialog (void)
GladeXML *dialog; GladeXML *dialog;
GtkWidget *widget, *box, *view; GtkWidget *widget, *box, *view;
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", "sound_prefs_dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", "sound_prefs_dialog", NULL);
widget = glade_xml_get_widget (dialog, "sound_prefs_dialog"); widget = glade_xml_get_widget (dialog, "sound_prefs_dialog");
props = sound_properties_new (); props = sound_properties_new ();
@ -502,7 +502,7 @@ device_test_button_clicked (GtkWidget *button, gpointer user_data)
{ {
DeviceChooser *device_chooser = (DeviceChooser *) user_data; DeviceChooser *device_chooser = (DeviceChooser *) user_data;
GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", NULL, NULL); GladeXML *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", NULL, NULL);
user_test_pipeline (dialog, GTK_WINDOW (dialog_win), device_chooser->test_pipeline); user_test_pipeline (dialog, GTK_WINDOW (dialog_win), device_chooser->test_pipeline);

7
capplets/theme-switcher/Makefile.am
View file

@ -1,6 +1,6 @@
bin_PROGRAMS = gnome-theme-manager bin_PROGRAMS = gnome-theme-manager
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \ pixmap_DATA = \
theme-thumbnailing.png theme-thumbnailing.png
@ -40,7 +40,7 @@ Desktop_in_files = gtk-theme-selector.desktop.in \
gnome-theme-installer.desktop.in gnome-theme-installer.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = theme-properties.glade glade_DATA = theme-properties.glade
INCLUDES = \ INCLUDES = \
@ -48,7 +48,8 @@ INCLUDES = \
$(METACITY_CFLAGS) \ $(METACITY_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files)
EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files) EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)

8
capplets/ui-properties/Makefile.am
View file

@ -10,9 +10,13 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-ui-properties.desktop.in Desktop_in_files = gnome-ui-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-ui-properties.glade Glade_DATA = gnome-ui-properties.glade
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\"" INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) EXTRA_DIST = $(Glade_DATA)

2
capplets/ui-properties/gnome-ui-properties.c
View file

@ -89,7 +89,7 @@ create_dialog (void)
{ {
GladeXML *dialog; GladeXML *dialog;
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL); dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
return dialog; return dialog;
} }

6
capplets/url-properties/Makefile.am
View file

@ -16,9 +16,9 @@ pixmap_DATA =
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
iconsdir = $(GNOMECC_ICONS_DIR) iconsdir = $(pkgdatadir)/icons
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(pkgdatadir)/pixmaps
Glade_DATA = $(cappletname)-properties.glade Glade_DATA = $(cappletname)-properties.glade
icons_DATA = $(cappletname)-capplet.png icons_DATA = $(cappletname)-capplet.png
desktop = $(cappletname).desktop desktop = $(cappletname).desktop

2
capplets/windows/Makefile.am
View file

@ -8,7 +8,7 @@ gnome_window_properties_SOURCES = \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-window-properties.glade glade_DATA = gnome-window-properties.glade
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications

2
capplets/wm-properties/wm-desktops/Makefile.am
View file

@ -15,7 +15,7 @@ wmdata_DATA = $(desktop_files)
EXTRA_DIST = $(desktop_in_in_files) EXTRA_DIST = $(desktop_in_in_files)
$(desktop_in_files): %.desktop.in: %.desktop.in.in $(desktop_in_files): %.desktop.in: %.desktop.in.in
sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@ sed s#Icon=#Icon=$(pkgdatadir)/icons/# < $< > $@
$(desktop_files): %.desktop: %.desktop.in $(desktop_files): %.desktop: %.desktop.in
$(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@ $(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@

45
configure.in
View file

@ -364,20 +364,6 @@ dnl ==============================================
dnl End: Check that we meet the dependencies dnl End: Check that we meet the dependencies
dnl ============================================== dnl ==============================================
dnl ==============================================
dnl IDL settings
dnl ==============================================
# orbit-idl
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
# idl directories
LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
AC_SUBST(LIBBONOBO_IDL_DIR)
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test x"$GDK_PIXBUF_CSOURCE" = xno; then if test x"$GDK_PIXBUF_CSOURCE" = xno; then
@ -544,37 +530,6 @@ dnl ==============================================
dnl End: Define the main variables dnl End: Define the main variables
dnl ============================================== dnl ==============================================
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
AC_SUBST(LIBBONOBO_IDL_DIR)
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
dnl ==============================================
dnl Define the directories
dnl ==============================================
if test "x${prefix}" = "xNONE"; then
real_prefix=${ac_default_prefix}
else
real_prefix=${prefix}
fi
AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${GETTEXT_PACKAGE}",[Path to gnomecc data files])
AC_DEFINE_UNQUOTED(PREFIX, "$prefix", [install prefix])
GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
AC_SUBST(GNOMECC_ICONS_DIR)
GNOMECC_GLADE_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/interfaces'
AC_SUBST(GNOMECC_GLADE_DIR)
GNOMECC_PIXMAPS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/pixmaps'
AC_SUBST(GNOMECC_PIXMAPS_DIR)
dnl ==============================================
dnl End: Define the directories
dnl ==============================================
dnl ======================================= dnl =======================================
dnl Variables for config_archiverConf.sh.in dnl Variables for config_archiverConf.sh.in
dnl ======================================= dnl =======================================

19
gnome-settings-daemon/Makefile.am
View file

@ -1,10 +1,17 @@
SUBDIRS = xrdb actions SUBDIRS = xrdb actions
INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \ INCLUDES= \
-DDATADIR="\"$(datadir)\"" \ $(DBUS_CFLAGS) \
-DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \ $(LIBGNOMEKBD_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ $(GNOME_SETTINGS_DAEMON_CFLAGS) \
$(FB_CFLAGS) $(FB_CFLAGS) \
-I$(top_srcdir)/libbackground \
-I$(top_srcdir) \
-DDATADIR="\"$(datadir)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
libexec_PROGRAMS=gnome-settings-daemon libexec_PROGRAMS=gnome-settings-daemon
@ -92,7 +99,7 @@ BUILT_SOURCES=gnome-settings-server.h \
gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES) gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES)
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = modmap-dialog.glade Glade_DATA = modmap-dialog.glade
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon

4
gnome-settings-daemon/actions/Makefile.am
View file

@ -25,10 +25,10 @@ endif # HAVE_OSS
endif # HAVE_ALSA endif # HAVE_ALSA
endif # HAVE_GSTREAMER endif # HAVE_GSTREAMER
Datadir = $(datadir)/control-center-2.0/interfaces/ Datadir = $(pkgdatadir)/glade
Data_DATA = acme.glade Data_DATA = acme.glade
pixmapsdir = $(GNOMECC_PIXMAPS_DIR) pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = acme-eject.png pixmaps_DATA = acme-eject.png
EXTRA_DIST = \ EXTRA_DIST = \

2
gnome-settings-daemon/gnome-settings-xmodmap.c
View file

@ -263,7 +263,7 @@ gnome_settings_modmap_dialog_call (void)
homeDir = g_dir_open (g_get_home_dir (), 0, NULL); homeDir = g_dir_open (g_get_home_dir (), 0, NULL);
if (homeDir == NULL) if (homeDir == NULL)
return; return;
xml = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/modmap-dialog.glade", "dialog1", NULL); xml = glade_xml_new (GNOMECC_GLADE_DIR "/modmap-dialog.glade", "dialog1", NULL);
if (! xml) { if (! xml) {
g_warning ("Could not find GLADE_FILE \n"); g_warning ("Could not find GLADE_FILE \n");

4
gnome-settings-daemon/gnome-settings-xrdb.c
View file

@ -2,7 +2,7 @@
/* gnome-settings-xrdb.c /* gnome-settings-xrdb.c
* *
* Copyright © 2003 Ross Burton * Copyright © 2003 Ross Burton
* *
* Written by Ross Burton <ross@burtonini.com> * Written by Ross Burton <ross@burtonini.com>
* *
@ -32,7 +32,7 @@
#include "gnome-settings-daemon.h" #include "gnome-settings-daemon.h"
#include "gnome-settings-xrdb.h" #include "gnome-settings-xrdb.h"
#define SYSTEM_AD_DIR DATADIR "/control-center-2.0/xrdb" #define SYSTEM_AD_DIR GNOMECC_DATA_DIR "/xrdb"
#define GENERAL_AD SYSTEM_AD_DIR "/General.ad" #define GENERAL_AD SYSTEM_AD_DIR "/General.ad"
#define USER_AD_DIR ".gnome2/xrdb" #define USER_AD_DIR ".gnome2/xrdb"
#define USER_X_RESOURCES ".Xresources" #define USER_X_RESOURCES ".Xresources"

4
gnome-settings-daemon/gsd-media-keys-window.c
View file

@ -164,7 +164,7 @@ action_changed (GsdMediaKeysWindow *window)
break; break;
case GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT: case GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT:
volume_controls_set_visible (window, FALSE); volume_controls_set_visible (window, FALSE);
window_set_icon_file (window, PIXMAPSDIR "/acme-eject.png"); window_set_icon_file (window, GNOMECC_PIXMAPS_DIR "/acme-eject.png");
break; break;
default: default:
break; break;
@ -611,7 +611,7 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
} else { } else {
GtkWidget *vbox; GtkWidget *vbox;
window->priv->xml = glade_xml_new (DATADIR "/control-center-2.0/interfaces/acme.glade", "acme_vbox", NULL); window->priv->xml = glade_xml_new (GNOMECC_GLADE_DIR "/acme.glade", "acme_vbox", NULL);
vbox = glade_xml_get_widget (window->priv->xml, "acme_vbox"); vbox = glade_xml_get_widget (window->priv->xml, "acme_vbox");
if (vbox != NULL) { if (vbox != NULL) {

2
gnome-settings-daemon/xrdb/Makefile.am
View file

@ -1,4 +1,4 @@
xrdbdir = $(datadir)/control-center-2.0/xrdb xrdbdir = $(pkgdatadir)/xrdb
xrdb_DATA = \ xrdb_DATA = \
General.ad \ General.ad \
Editres.ad \ Editres.ad \

4
typing-break/Makefile.am
View file

@ -15,7 +15,7 @@ gnome_typing_monitor_SOURCES = \
gnome_typing_monitor_CPPFLAGS = \ gnome_typing_monitor_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\" \ -DIMAGEDIR=\"$(pkgdatadir)/pixmaps\" \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
gnome_typing_monitor_CFLAGS = \ gnome_typing_monitor_CFLAGS = \
@GNOME_CFLAGS@ \ @GNOME_CFLAGS@ \
@ -24,7 +24,7 @@ gnome_typing_monitor_CFLAGS = \
gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@ gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
gnome_typing_monitor_LDFLAGS = -export-dynamic gnome_typing_monitor_LDFLAGS = -export-dynamic
imagedir = $(GNOMECC_PIXMAPS_DIR) imagedir = $(pkgdatadir)/pixmaps
image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
# Themeable application icon # Themeable application icon

4
vfs-methods/themus/Makefile.am
View file

@ -3,7 +3,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
$(THEMUS_COMPONENT_CFLAGS) \ $(THEMUS_COMPONENT_CFLAGS) \
$(THEMUS_APPLIER_CFLAGS) \ $(THEMUS_APPLIER_CFLAGS) \
-I$(top_srcdir)/capplets/common \ -I$(top_srcdir)/capplets/common \
-DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \ -DGNOMECC_GLADE_DIR=\"$(pkgdatadir)/glade\" \
-DDIRECTORY_DIR=\"$(directorydir)\" \ -DDIRECTORY_DIR=\"$(directorydir)\" \
-DDATA_DIR=\"$(datadir)/themus\" \ -DDATA_DIR=\"$(datadir)/themus\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" -DGNOMELOCALEDIR=\"$(datadir)/locale\"
@ -41,7 +41,7 @@ libnautilus_themus_la_SOURCES = \
themus-properties-view.h \ themus-properties-view.h \
themus-properties-main.c themus-properties-main.c
Gladedir = $(GNOMECC_GLADE_DIR) Gladedir = $(pkgdatadir)/glade
Glade_DATA = apply-font.glade Glade_DATA = apply-font.glade
@INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_DIRECTORY_RULE@