From 860e984b3ad894049f0cf827afdac48356f09678 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 9 Nov 2004 17:43:47 +0000 Subject: [PATCH] - install all capplet .desktop files in $(datadir)/applications instead of $(datadir)/control-center-2.0/capplets - add OnlyShowIn=GNOME; to them all - remove capplets/desktop-links/* --- ChangeLog | 12 + capplets/Makefile.am | 2 +- .../accessibility/at-properties/ChangeLog | 7 + .../accessibility/at-properties/Makefile.am | 2 +- .../at-properties/at-properties.desktop.in | 1 + capplets/accessibility/keyboard/ChangeLog | 6 + capplets/accessibility/keyboard/Makefile.am | 2 +- .../accessibility-keyboard.desktop.in | 1 + capplets/background/ChangeLog | 6 + capplets/background/Makefile.am | 2 +- capplets/background/background.desktop.in | 1 + capplets/default-applications/ChangeLog | 6 + capplets/default-applications/Makefile.am | 2 +- .../default-applications.desktop.in | 1 + capplets/desktop-links/.cvsignore | 12 - .../desktop-links/Accessibility.directory.in | 5 - capplets/desktop-links/Advanced.directory.in | 5 - capplets/desktop-links/ChangeLog | 207 ------------------ capplets/desktop-links/Makefile.am | 34 --- capplets/desktop-links/README | 5 - capplets/desktop-links/Sawfish/.cvsignore | 5 - capplets/desktop-links/Sawfish/Makefile.am | 68 ------ .../Sawfish/Sawfish.directory.in.in | 5 - .../Sawfish/appearance-properties.desktop.in | 11 - .../Sawfish/bindings-properties.desktop.in | 11 - .../Sawfish/focus-properties.desktop.in | 19 -- .../Sawfish/match-properties.desktop.in | 11 - .../Sawfish/maximize-properties.desktop.in | 11 - .../Sawfish/meta-properties.desktop.in | 11 - .../Sawfish/misc-properties.desktop.in | 12 - .../Sawfish/move-properties.desktop.in | 11 - .../Sawfish/placement-properties.desktop.in | 11 - .../desktop-links/Sawfish/sawfish-group.png | Bin 3047 -> 0 bytes .../Sawfish/sound-properties.desktop.in | 11 - .../Sawfish/workspace-properties.desktop.in | 11 - .../desktop-links/accessibility-directory.png | Bin 3688 -> 0 bytes .../legacy-applications-capplet.png | Bin 5528 -> 0 bytes .../legacy-applications.desktop.in.in | 8 - capplets/display/ChangeLog | 6 + capplets/display/Makefile.am | 2 +- .../display/display-properties.desktop.in | 1 + capplets/file-types/ChangeLog | 6 + capplets/file-types/Makefile.am | 2 +- capplets/file-types/file-types.desktop.in | 1 + capplets/font/ChangeLog | 6 + capplets/font/Makefile.am | 2 +- capplets/font/font-properties.desktop.in | 1 + capplets/keybindings/ChangeLog | 6 + capplets/keybindings/Makefile.am | 2 +- capplets/keybindings/keybinding.desktop.in | 1 + capplets/keyboard/ChangeLog | 6 + capplets/keyboard/Makefile.am | 2 +- capplets/keyboard/keyboard.desktop.in | 1 + capplets/localization/Makefile.am | 2 +- capplets/localization/localization.desktop.in | 1 + capplets/mouse/ChangeLog | 6 + capplets/mouse/Makefile.am | 2 +- .../mouse/gnome-settings-mouse.desktop.in | 1 + capplets/network/ChangeLog | 6 + capplets/network/Makefile.am | 2 +- .../gnome-network-preferences.desktop.in | 1 + capplets/sound/ChangeLog | 6 + capplets/sound/Makefile.am | 2 +- .../sound/gnome-settings-sound.desktop.in | 1 + capplets/theme-switcher/ChangeLog | 6 + capplets/theme-switcher/Makefile.am | 2 +- .../gtk-theme-selector.desktop.in | 1 + capplets/ui-properties/ChangeLog | 6 + capplets/ui-properties/Makefile.am | 2 +- .../gnome-ui-properties.desktop.in | 1 + capplets/windows/ChangeLog | 6 + capplets/windows/Makefile.am | 2 +- capplets/windows/window-properties.desktop.in | 1 + configure.in | 3 - control-center/ChangeLog | 5 + control-center/Makefile.am | 1 - 76 files changed, 141 insertions(+), 505 deletions(-) delete mode 100644 capplets/desktop-links/.cvsignore delete mode 100644 capplets/desktop-links/Accessibility.directory.in delete mode 100644 capplets/desktop-links/Advanced.directory.in delete mode 100644 capplets/desktop-links/ChangeLog delete mode 100644 capplets/desktop-links/Makefile.am delete mode 100644 capplets/desktop-links/README delete mode 100644 capplets/desktop-links/Sawfish/.cvsignore delete mode 100644 capplets/desktop-links/Sawfish/Makefile.am delete mode 100644 capplets/desktop-links/Sawfish/Sawfish.directory.in.in delete mode 100644 capplets/desktop-links/Sawfish/appearance-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/bindings-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/focus-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/match-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/maximize-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/meta-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/misc-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/move-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/placement-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/sawfish-group.png delete mode 100644 capplets/desktop-links/Sawfish/sound-properties.desktop.in delete mode 100644 capplets/desktop-links/Sawfish/workspace-properties.desktop.in delete mode 100644 capplets/desktop-links/accessibility-directory.png delete mode 100644 capplets/desktop-links/legacy-applications-capplet.png delete mode 100644 capplets/desktop-links/legacy-applications.desktop.in.in diff --git a/ChangeLog b/ChangeLog index a49b46837..29692c702 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-11-09 Mark McLoughlin + + * configure.in: remove $GNOMECC_DESKTOP_DIR + + * capplets/localization/Makefile.am: install the + .desktop file in $(datadir)/applications. + + * capplets/localization/localization.desktop.in: add + OnlyShowIn=GNOME; + + * capplets/desktop-links/*: remove. + 2004-11-01 Jeff Waugh * po/POTFILES.in, vfs-methods/fontilus/Makefile.am, diff --git a/capplets/Makefile.am b/capplets/Makefile.am index e8967f09e..ffb615db9 100644 --- a/capplets/Makefile.am +++ b/capplets/Makefile.am @@ -1,6 +1,6 @@ always_built_SUBDIRS = \ common accessibility \ - default-applications desktop-links font \ + default-applications font \ background keyboard mouse sound \ theme-switcher ui-properties \ keybindings network windows diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog index de432ff71..0d08f7cc3 100644 --- a/capplets/accessibility/at-properties/ChangeLog +++ b/capplets/accessibility/at-properties/ChangeLog @@ -1,3 +1,10 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install the .desktop file in + $(datadir)/applications. + + * at-properties.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index 6735f75a8..095771e8a 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -9,7 +9,7 @@ gnome_at_properties_LDFLAGS = -export-dynamic @INTLTOOL_DESKTOP_RULE@ -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = at-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in b/capplets/accessibility/at-properties/at-properties.desktop.in index 0e970104c..d2a6353a3 100644 --- a/capplets/accessibility/at-properties/at-properties.desktop.in +++ b/capplets/accessibility/at-properties/at-properties.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Settings;Accessibility; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=Assistive Technology Support diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog index 28ed8d232..a1abf5738 100644 --- a/capplets/accessibility/keyboard/ChangeLog +++ b/capplets/accessibility/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * accessibility-keyboard.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/accessibility/keyboard/Makefile.am b/capplets/accessibility/keyboard/Makefile.am index a03237389..34172947f 100644 --- a/capplets/accessibility/keyboard/Makefile.am +++ b/capplets/accessibility/keyboard/Makefile.am @@ -26,7 +26,7 @@ pixmap_DATA = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = gnome-accessibility-keyboard-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = accessibility-keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in index 69e437be2..252783025 100644 --- a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in +++ b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings;Accessibility; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=Keyboard Accessibility diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index ca3b356f0..4ef192994 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * background.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 2bb9c77e8..bac34ba08 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -24,7 +24,7 @@ libgnomewp_la_SOURCES = \ libgnomewp_la_LIBADD = \ $(GNOMECC_CAPPLETS_LIBS) -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications desktop_in_files = background.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/background/background.desktop.in b/capplets/background/background.desktop.in index 49be17aba..97e3ab6bf 100644 --- a/capplets/background/background.desktop.in +++ b/capplets/background/background.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Settings;Appearance; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=background diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 05f5c133e..047e2fb9e 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * default-applications.desktop.in: add OnlyShowIn=GNOME; + 2004-10-21 J.H.M. Dassen (Ray) * gnome-default-applications-properties-structs.c: Added Thunderbird to diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index f79b7c73f..b5906ecd4 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -9,7 +9,7 @@ gnome_default_applications_properties_SOURCES = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = gnome-default-applications-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = default-applications.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/default-applications/default-applications.desktop.in b/capplets/default-applications/default-applications.desktop.in index 490262b8a..faa74c0db 100644 --- a/capplets/default-applications/default-applications.desktop.in +++ b/capplets/default-applications/default-applications.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings;AdvancedSettings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=other capplets diff --git a/capplets/desktop-links/.cvsignore b/capplets/desktop-links/.cvsignore deleted file mode 100644 index 99b1ccb91..000000000 --- a/capplets/desktop-links/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -cd.desktop -cd.desktop.in -legacy-applications.desktop -legacy-applications.desktop.in -session.desktop -session.desktop.in -Advanced.directory -Advanced.directory.in -Accessibility.directory -Accessibility.directory.in diff --git a/capplets/desktop-links/Accessibility.directory.in b/capplets/desktop-links/Accessibility.directory.in deleted file mode 100644 index 33e2e06d7..000000000 --- a/capplets/desktop-links/Accessibility.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -_Name=Accessibility -_Comment=Accessibility Settings -Type=Directory -Icon=accessibility-directory diff --git a/capplets/desktop-links/Advanced.directory.in b/capplets/desktop-links/Advanced.directory.in deleted file mode 100644 index eec57f381..000000000 --- a/capplets/desktop-links/Advanced.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -_Name=Advanced -_Comment=Advanced Settings -Type=Directory -Icon=advanced-directory diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog deleted file mode 100644 index b86d1ac04..000000000 --- a/capplets/desktop-links/ChangeLog +++ /dev/null @@ -1,207 +0,0 @@ -2004-10-14 Jody Goldberg - - * Release 2.8.1 - -2004-04-15 Jody Goldberg - - * Release 2.6.1 - -2004-04-01 Jody Goldberg - - * Release 2.6.0.3 - -2004-03-30 Jody Goldberg - - * Release 2.6.0.1 - -2004-03-23 Jody Goldberg - - * Release 2.6.0 - -2004-03-11 Jody Goldberg - - * Release 2.5.4 - -2004-02-13 Jody Goldberg - - * Release 2.5.3 - -2004-01-14 Jody Goldberg - - * Release 2.5.2 - -2003-12-30 Jody Goldberg - - * Release 2.5.1.1 - -2003-12-30 Jody Goldberg - - * Release 2.5.1 - -2003-10-28 Jody Goldberg - - * Release 2.5.0 - -2003-07-07 Jody Goldberg - - * Release 2.3.4 - -2003-06-24 Jody Goldberg - - * Release 2.3.3 - -2003-05-07 Jody Goldberg - - * Release 2.3.1 - -Tue Feb 4 17:09:18 2003 Jonathan Blandford - - * Release 2.2.0.1 - -Tue Jan 21 01:15:14 2003 Jonathan Blandford - - * Release 2.2.0 - -Thu Jan 16 02:41:09 2003 Jonathan Blandford - - * Release 2.1.7 - -2003-01-10 Jody Goldberg - - * Release 2.1.6 - -2002-12-18 Jody Goldberg - - * Release 2.1.5 - -2002-12-06 Glynn Foster - - * Makefile.am: Remove icon. - * advanced-directory.png: Transferred to gnome-desktop. - -2002-11-23 Jody Goldberg - - * Release 2.1.3 - -2002-11-02 Jody Goldberg - - * Release 2.1.2 - -2002-10-21 Jody Goldberg - - * Release 2.1.1 - -2002-10-01 Jody Goldberg - - * Release 2.1.0.1 - -2002-08-21 Jody Goldberg - - * Release 2.1.0 - -2002-06-17 Jody Goldberg - - * Release 2.0.0 - -2002-06-05 Gediminas Paulauskas - - * cd-capplet.png, cd.desktop.in.in, - panel-capplet.png, panel.desktop.in.in, - session-capplet.png, session.desktop.in.in: - remove unused desktop files and their icons from CVS. - -2002-05-01 Kjartan Maraas - - * Makefile.am: Fix to use the intltool rules from Christophe Fergeau - - -2002-04-05 Tuomas Kuosmanen - - * accessibility-directory.png: unsuck it. - -2002-04-04 jacob berkman - - * Makefile.am (SUBDIRS): remove sawfish directory - -2002-03-08 Seth Nickell - - * Makefile.am: - - Don't install cd properties capplet .desktop file. It should - be picked up by the vfolder legacy support if installed on - the system, and otherwise we shouldn't display it anyway - since the person doesn't have the capplet. - -2002-03-06 Richard Hestilow - - * Makefile.am: Remove legacy-applications. Fixes bug #72997. - -2002-02-17 Seth Nickell - - * Makefile.am: - - Remove session stuff, it is now properly done up in gnome-session. - -2002-01-28 Seth Nickell - - * Makefile.am: - * panel-capplet.png: - * panel.desktop.in.in: - - Remove this. Its now properly done up in gnome-core. - -2002-01-27 Seth Nickell - - * cd.desktop.in.in: - * legacy-applications.desktop.in.in: - * panel.desktop.in.in: - * session.desktop.in.in: - - Add categories field. - -2001-12-19 Seth Nickell - - * Makefile.am: - * gnome-hint-properties.desktop.in: - - Remove because gnome-core is now installing for the - new GNOME CC. - -2001-07-27 Bradford Hovinen - - * RELEASE : 1.5.2 - -2001-07-27 Bradford Hovinen - - * Makefile.am: Removed empty SUBDIRS - -2001-07-25 Chema Celorio - - * Makefile.am (SUBDIRS): remove the sawfish dir - -2001-07-20 Chema Celorio - - * RELEASE : 1.5.0 - -2001-07-19 Chema Celorio - - * Makefile.am (Desktop_DATA): distcheck love - -2001-07-17 Carlos Perelló Marín - - * gnome-hint-properties.desktop: Now use xml-i18n-tools. - * Sawfish/*.desktop: ditto - -2001-07-16 Richard Hestilow - - * Sawfish/: Added. - * Makefile.am: Sawfish added to SUBDIRS. - * README: Mention Sawfish. - -2001-07-16 Richard Hestilow - - * ChangeLog started. - - * gnome-hint-properties.desktop: Added. - * README: Added. - * Makefile.am: Added. diff --git a/capplets/desktop-links/Makefile.am b/capplets/desktop-links/Makefile.am deleted file mode 100644 index dffbeee2e..000000000 --- a/capplets/desktop-links/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## removed legacy applications for now -- grdb is not part of GNOME2 -capplets = - -## Pixmaps - -pixmaps_pre = $(capplets:=-capplet.png) -pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png -pixmapsdir = $(datadir)/icons/gnome/48x48/apps - -## -## Desktop files -## - -desktop_files = $(capplets:=.desktop) -desktop_in_files = $(desktop_files:.desktop=.desktop.in) - -desktopfilesdir = $(GNOMECC_DESKTOP_DIR) -desktopfiles_DATA = $(desktop_files) - -CLEANFILES = $(desktop_files) $(desktop_in_files) -EXTRA_DIST = $(desktop_in_files) $(groups_in_files) $(pixmaps_DATA) - -@INTLTOOL_DESKTOP_RULE@ - -all-local: $(desktop_files) $(groups_files) - -groups = Advanced Accessibility -groups_files = $(groups:=.directory) -groups_in_files = $(groups_files:.directory=.directory.in) - -Gnomeccdir = $(datadir)/gnome/vfolders -Gnomecc_DATA = $(groups_files) - -@INTLTOOL_DIRECTORY_RULE@ diff --git a/capplets/desktop-links/README b/capplets/desktop-links/README deleted file mode 100644 index 110cb187d..000000000 --- a/capplets/desktop-links/README +++ /dev/null @@ -1,5 +0,0 @@ -The following files are here for compatibility reasons and should -be removed as their modules correct the capplet install directory: - -* gnome-hint-properties-capplet (package gnome-core) -* Sawfish/ (package sawfish) diff --git a/capplets/desktop-links/Sawfish/.cvsignore b/capplets/desktop-links/Sawfish/.cvsignore deleted file mode 100644 index f6b4c5d54..000000000 --- a/capplets/desktop-links/Sawfish/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -*.desktop -Sawfish.directory -Sawfish.directory.in diff --git a/capplets/desktop-links/Sawfish/Makefile.am b/capplets/desktop-links/Sawfish/Makefile.am deleted file mode 100644 index 47a3ad1c5..000000000 --- a/capplets/desktop-links/Sawfish/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -## .desktop files -## -## translate foo.desktop.in and create a foo.desktop file. -## - -capplets = \ - appearance-properties \ - misc-properties \ - bindings-properties \ - move-properties \ - focus-properties \ - placement-properties \ - match-properties \ - sound-properties \ - maximize-properties \ - workspace-properties \ - meta-properties - -## -## Pixmaps -## - -pixmaps_DATA = $(group_icon) -pixmapsdir = $(GNOMECC_DATA_DIR)/icons - - -## -## dekstop files -## -desktop_files = $(capplets:=.desktop) -desktop_in_files = $(desktop_files:.desktop=.desktop.in) - -cappletsdir = $(datadir)/control-center-2/capplets/Sawfish -capplets_DATA = $(desktop_files) - -EXTRA_DIST = $(desktop_in_files) Sawfish.directory.in.in $(pixmaps_DATA) - -$(desktop_files): %.desktop: %.desktop.in - $(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@ - - -## Create the .directory file -## -## foo.directory.in is created from foo.directory.in.in and substituting the Icon field with -## the full path of the icon. -## foo.directory.in is merged with the translations to create foo.directory -## foo.directory is installed and renamed -## -groups = Sawfish -group_icon = sawfish-group.png -groups_files = $(groups:=.directory) -groups_in_files = $(groups_files:.directory=.directory.in) - -Gnomeccdir = $(datadir)/control-center-2/capplets/$(groups) -Gnomecc_DATA = $(groups_files) - -$(groups_in_files): %.directory.in: %.directory.in.in - sed s#Icon=\.*#Icon=$(GNOMECC_ICONS_DIR)/${group_icon}# < $< > $@ - -$(groups_files): %.directory: %.directory.in - $(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@ - -## We need to install this ourselves cause we change the name of the -## file to .directory. -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(Gnomeccdirp) - $(INSTALL_DATA) Sawfish.directory $(DESTDIR)$(Gnomeccdir)/.directory - diff --git a/capplets/desktop-links/Sawfish/Sawfish.directory.in.in b/capplets/desktop-links/Sawfish/Sawfish.directory.in.in deleted file mode 100644 index 29098b4f7..000000000 --- a/capplets/desktop-links/Sawfish/Sawfish.directory.in.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -_Name=Sawfish window manager -_Comment=Control Center Menu -Icon=gnome-ccwindowmanager.png -Type=Directory diff --git a/capplets/desktop-links/Sawfish/appearance-properties.desktop.in b/capplets/desktop-links/Sawfish/appearance-properties.desktop.in deleted file mode 100644 index 8c5cea6ac..000000000 --- a/capplets/desktop-links/Sawfish/appearance-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Appearance -_Comment=Select themes and fonts for your windows -Exec=sawfish-capplet --sawfish-group=appearance -Icon=sawfish-appearance.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/bindings-properties.desktop.in b/capplets/desktop-links/Sawfish/bindings-properties.desktop.in deleted file mode 100644 index b4053efa5..000000000 --- a/capplets/desktop-links/Sawfish/bindings-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Shortcuts -_Comment=Customize shortcut keys for your windows -Exec=sawfish-capplet --sawfish-group=bindings -Icon=sawfish-shortcuts.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/focus-properties.desktop.in b/capplets/desktop-links/Sawfish/focus-properties.desktop.in deleted file mode 100644 index 75ec62104..000000000 --- a/capplets/desktop-links/Sawfish/focus-properties.desktop.in +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -_Name=Focus behavior -_Comment=Configure how to give focus to windows -Exec=sawfish-capplet --sawfish-group=focus -Icon=sawfish-focus.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool - - - - - - - - diff --git a/capplets/desktop-links/Sawfish/match-properties.desktop.in b/capplets/desktop-links/Sawfish/match-properties.desktop.in deleted file mode 100644 index bae41ba59..000000000 --- a/capplets/desktop-links/Sawfish/match-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Matched Windows -_Comment=Configure matched windows to have particular characteristics -Exec=sawfish-capplet --sawfish-group=match-window -Icon=sawfish-matched.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/maximize-properties.desktop.in b/capplets/desktop-links/Sawfish/maximize-properties.desktop.in deleted file mode 100644 index f07fa36a2..000000000 --- a/capplets/desktop-links/Sawfish/maximize-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Minimizing and Maximizing -_Comment=Configure how to minimize, maximize, and restore windows -Exec=sawfish-capplet --sawfish-group=min-max -Icon=sawfish-minmax.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/meta-properties.desktop.in b/capplets/desktop-links/Sawfish/meta-properties.desktop.in deleted file mode 100644 index 4e202a369..000000000 --- a/capplets/desktop-links/Sawfish/meta-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Meta -_Comment=Select your Sawfish user level -Exec=sawfish-capplet --sawfish-no-flatten -Icon=gnome-ccdialog.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/misc-properties.desktop.in b/capplets/desktop-links/Sawfish/misc-properties.desktop.in deleted file mode 100644 index b371fcefb..000000000 --- a/capplets/desktop-links/Sawfish/misc-properties.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -_Name=Miscellaneous -_Comment=Select miscellaneous window options -Exec=sawfish-capplet --sawfish-group=misc -Icon=sawfish-misc.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool - diff --git a/capplets/desktop-links/Sawfish/move-properties.desktop.in b/capplets/desktop-links/Sawfish/move-properties.desktop.in deleted file mode 100644 index de50a61dc..000000000 --- a/capplets/desktop-links/Sawfish/move-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Moving and Resizing -_Comment=Configure how windows move and resize -Exec=sawfish-capplet --sawfish-group=move -Icon=sawfish-moveresize.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/placement-properties.desktop.in b/capplets/desktop-links/Sawfish/placement-properties.desktop.in deleted file mode 100644 index 86cf70ba2..000000000 --- a/capplets/desktop-links/Sawfish/placement-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Placement -_Comment=Configure positioning of windows on the desktop -Exec=sawfish-capplet --sawfish-group=placement -Icon=sawfish-placement.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/sawfish-group.png b/capplets/desktop-links/Sawfish/sawfish-group.png deleted file mode 100644 index ef95bcd47bad8f971cc6f065fca77cf404e2e334..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3047 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 diff --git a/capplets/desktop-links/Sawfish/sound-properties.desktop.in b/capplets/desktop-links/Sawfish/sound-properties.desktop.in deleted file mode 100644 index 5a54d5448..000000000 --- a/capplets/desktop-links/Sawfish/sound-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Sound -_Comment=Associate sounds with window manager events -Exec=sawfish-capplet --sawfish-group=audio -Icon=gnome-multimedia.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/Sawfish/workspace-properties.desktop.in b/capplets/desktop-links/Sawfish/workspace-properties.desktop.in deleted file mode 100644 index 2cf13fb51..000000000 --- a/capplets/desktop-links/Sawfish/workspace-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Workspaces -_Comment=Configure your workspaces and viewports -Exec=sawfish-capplet --sawfish-group=workspace -Icon=sawfish-workspaces.png -Terminal=0 -Type=Application -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=sawfish -X-GNOME-Bugzilla-Component=Config Tool diff --git a/capplets/desktop-links/accessibility-directory.png b/capplets/desktop-links/accessibility-directory.png deleted file mode 100644 index 75084f8dc83464f0e89d749953523da4ff2b88e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3688 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 af&T|xkbpcv$I}}C0000 + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * display-properties.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index e179722b5..6c7b9c016 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -13,7 +13,7 @@ icons_DATA = display-capplet.png desktop_iconsdir = $(datadir)/pixmaps desktop_icons_DATA = display-capplet.png -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = display-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/display/display-properties.desktop.in b/capplets/display/display-properties.desktop.in index 80fdd2d45..4826f008b 100644 --- a/capplets/display/display-properties.desktop.in +++ b/capplets/display/display-properties.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Settings;Appearance; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=display properties diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index 71b781cd2..1034c22b7 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * file-types.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/file-types/Makefile.am b/capplets/file-types/Makefile.am index 615629d7c..ca3eece12 100644 --- a/capplets/file-types/Makefile.am +++ b/capplets/file-types/Makefile.am @@ -19,7 +19,7 @@ gnome_file_types_properties_SOURCES = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = file-types-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = file-types.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/file-types/file-types.desktop.in b/capplets/file-types/file-types.desktop.in index 35da9b651..923f9418e 100644 --- a/capplets/file-types/file-types.desktop.in +++ b/capplets/file-types/file-types.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings;AdvancedSettings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=mime-types diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index a0987f5b9..449238f48 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * font-properties.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/font/Makefile.am b/capplets/font/Makefile.am index d5285bd9b..404932d1d 100644 --- a/capplets/font/Makefile.am +++ b/capplets/font/Makefile.am @@ -16,7 +16,7 @@ pixmap_DATA = \ subpixel-vrgb.png \ subpixel-vbgr.png -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = font-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/font/font-properties.desktop.in b/capplets/font/font-properties.desktop.in index de1fc4afb..34f08e8db 100644 --- a/capplets/font/font-properties.desktop.in +++ b/capplets/font/font-properties.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Settings;Appearance; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=font properties diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 062d2f5a6..216e7b6e2 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * keybinding.desktop.in: add OnlyShowIn=GNOME; + 2004-10-17 Vincent Untz * gnome-keybinding-properties.c: add the keybinding to launch a diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 4136d6c19..2ff7ed46c 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -13,7 +13,7 @@ gnome_keybinding_properties_SOURCES = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = gnome-keybinding-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = keybinding.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/keybindings/keybinding.desktop.in b/capplets/keybindings/keybinding.desktop.in index ffeae0537..1e9db907f 100644 --- a/capplets/keybindings/keybinding.desktop.in +++ b/capplets/keybindings/keybinding.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=Keybinding diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 132cc4d02..1f5f95d8b 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * keyboard.desktop.in: add OnlyShowIn=GNOME; + 2004-10-21 Sebastien Bacher * gnome-keyboard-properties.glade: diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 917e56c4b..a8acc8c84 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -25,7 +25,7 @@ pixmaps_DATA = \ keyboard-volume.png \ keyboard-bell.png -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/keyboard/keyboard.desktop.in b/capplets/keyboard/keyboard.desktop.in index 97ec8dc44..cb1adaecc 100644 --- a/capplets/keyboard/keyboard.desktop.in +++ b/capplets/keyboard/keyboard.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=Keyboard diff --git a/capplets/localization/Makefile.am b/capplets/localization/Makefile.am index 47fda0a1b..c295d6fb9 100644 --- a/capplets/localization/Makefile.am +++ b/capplets/localization/Makefile.am @@ -16,7 +16,7 @@ pixmapsdir = $(GNOMECC_PIXMAPS_DIR) pixmaps_DATA = \ localization-capplet.png -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications desktop_in_files = localization.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/localization/localization.desktop.in b/capplets/localization/localization.desktop.in index 8e7392e99..2a2b2d477 100644 --- a/capplets/localization/localization.desktop.in +++ b/capplets/localization/localization.desktop.in @@ -8,5 +8,6 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index f1a37b387..0ea122272 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * gnome-settings-mouse.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 42f7cda2e..e59566594 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -27,7 +27,7 @@ cursorfont_DATA = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = gnome-mouse-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = gnome-settings-mouse.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/mouse/gnome-settings-mouse.desktop.in b/capplets/mouse/gnome-settings-mouse.desktop.in index 22ab78a2b..dcf1211d9 100644 --- a/capplets/mouse/gnome-settings-mouse.desktop.in +++ b/capplets/mouse/gnome-settings-mouse.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=mouse diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog index e474aa3b5..af2758c76 100644 --- a/capplets/network/ChangeLog +++ b/capplets/network/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * gnome-network-preferences.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 589f84733..ea35602fe 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -9,7 +9,7 @@ gnome_network_preferences_LDADD = \ gladedir = $(GNOMECC_GLADE_DIR) glade_DATA = gnome-network-preferences.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications desktop_in_files = gnome-network-preferences.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/network/gnome-network-preferences.desktop.in b/capplets/network/gnome-network-preferences.desktop.in index 869b0b0f2..f9c2647fc 100644 --- a/capplets/network/gnome-network-preferences.desktop.in +++ b/capplets/network/gnome-network-preferences.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=network preferences diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index ef8b99e7b..db2d7fd8e 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * gnome-settings-sound.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index d490a9f3d..70378a18c 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -14,7 +14,7 @@ Glade_DATA = sound-properties.glade desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR) desktop_icons_DATA = visual-bell.png -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = gnome-settings-sound.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/sound/gnome-settings-sound.desktop.in b/capplets/sound/gnome-settings-sound.desktop.in index d4c7f2678..d20dee8bc 100644 --- a/capplets/sound/gnome-settings-sound.desktop.in +++ b/capplets/sound/gnome-settings-sound.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=sound diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index ccb4ed9c4..1b2afc0f6 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications. + + * gtk-theme-selector.desktop.in: add OnlyShowIn=GNOME; + Tue Nov 2 16:03:41 2004 Jonathan Blandford * theme-switcher.c (install_dialog_response): Patch from diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am index c12667707..b0174fd4d 100644 --- a/capplets/theme-switcher/Makefile.am +++ b/capplets/theme-switcher/Makefile.am @@ -25,7 +25,7 @@ gnome_theme_manager_LDFLAGS = -export-dynamic @INTLTOOL_DESKTOP_RULE@ -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = gtk-theme-selector.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/theme-switcher/gtk-theme-selector.desktop.in b/capplets/theme-switcher/gtk-theme-selector.desktop.in index 7b25e531f..341da6e39 100644 --- a/capplets/theme-switcher/gtk-theme-selector.desktop.in +++ b/capplets/theme-switcher/gtk-theme-selector.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=theme-manager diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index d12dd35a8..ae45a30ab 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * gnome-ui-properties.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am index 3ca090255..890f7fe54 100644 --- a/capplets/ui-properties/Makefile.am +++ b/capplets/ui-properties/Makefile.am @@ -6,7 +6,7 @@ gnome_ui_properties_SOURCES = \ @INTLTOOL_DESKTOP_RULE@ -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = gnome-ui-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/ui-properties/gnome-ui-properties.desktop.in b/capplets/ui-properties/gnome-ui-properties.desktop.in index fcce94e3d..f552dfc67 100644 --- a/capplets/ui-properties/gnome-ui-properties.desktop.in +++ b/capplets/ui-properties/gnome-ui-properties.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=other-capplets diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index 096714417..e4e9bf913 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: install .desktop file in $(datadir)/applications + + * window-properties.desktop.in: add OnlyShowIn=GNOME; + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index 243695368..72c5fd916 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -11,7 +11,7 @@ gnome_window_properties_SOURCES = \ gladedir = $(GNOMECC_GLADE_DIR) glade_DATA = gnome-window-properties.glade -desktopdir = $(GNOMECC_DESKTOP_DIR) +desktopdir = $(datadir)/applications Desktop_in_files = window-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) diff --git a/capplets/windows/window-properties.desktop.in b/capplets/windows/window-properties.desktop.in index bfec0ca03..dfa3db7d4 100644 --- a/capplets/windows/window-properties.desktop.in +++ b/capplets/windows/window-properties.desktop.in @@ -8,6 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=GNOME;Application;Settings; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center X-GNOME-Bugzilla-Component=Window preferences diff --git a/configure.in b/configure.in index 4b90db50a..0cbbca37d 100644 --- a/configure.in +++ b/configure.in @@ -487,8 +487,6 @@ fi AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${GETTEXT_PACKAGE}",[Path to gnomecc data files]) GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' AC_SUBST(GNOMECC_ICONS_DIR) -GNOMECC_DESKTOP_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/capplets' -AC_SUBST(GNOMECC_DESKTOP_DIR) GNOMECC_GLADE_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/interfaces' AC_SUBST(GNOMECC_GLADE_DIR) GNOMECC_PIXMAPS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/pixmaps' @@ -529,7 +527,6 @@ capplets/Makefile capplets/common/Makefile capplets/default-applications/Makefile capplets/background/Makefile -capplets/desktop-links/Makefile capplets/display/Makefile capplets/font/Makefile capplets/keybindings/Makefile diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 35fe9024d..40d8127d0 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,8 @@ +2004-11-09 Mark McLoughlin + + * Makefile.am: don't define $(SETTINGS_DIR) - its not + use anymore. + 2004-10-14 Jody Goldberg * Release 2.8.1 diff --git a/control-center/Makefile.am b/control-center/Makefile.am index 4118070c2..5d7bb3f60 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -20,7 +20,6 @@ ui_DATA = gnomecc-ui.xml INCLUDES = \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \ -DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\" \ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ -DART_DIR=\""$(splashdir)"\" \