Don't define directories in configure. Remove some obsolete defines, and
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:
parent
76cbf39631
commit
43d40d7a0a
51 changed files with 202 additions and 137 deletions
|
@ -16,7 +16,7 @@ gnome_file_types_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = file-types-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
|
|
|
@ -197,7 +197,7 @@ create_dialog (void)
|
|||
GtkTreeViewColumn *column;
|
||||
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));
|
||||
treeview = WID ("mime_types_tree");
|
||||
|
|
|
@ -123,7 +123,7 @@ mime_category_edit_dialog_init (MimeCategoryEditDialog *dialog, MimeCategoryEdit
|
|||
|
||||
dialog->p = g_new0 (MimeCategoryEditDialogPrivate, 1);
|
||||
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->info = NULL;
|
||||
|
|
|
@ -184,7 +184,7 @@ mime_edit_dialog_init (MimeEditDialog *dialog, MimeEditDialogClass *class)
|
|||
|
||||
dialog->p = g_new0 (MimeEditDialogPrivate, 1);
|
||||
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);
|
||||
gtk_size_group_add_widget (size_group, WID ("description_label"));
|
||||
|
|
|
@ -125,7 +125,7 @@ service_edit_dialog_init (ServiceEditDialog *dialog, ServiceEditDialogClass *cla
|
|||
|
||||
dialog->p = g_new0 (ServiceEditDialogPrivate, 1);
|
||||
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);
|
||||
gtk_size_group_add_widget (size_group, WID ("description_label"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue