diff options
| author | William Jon McCann <jmccann@redhat.com> | 2010-02-02 00:33:41 -0500 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2010-02-02 00:33:41 -0500 |
| commit | eb3dd23f6ef10476403328e22fcae8f1c9faea0d (patch) | |
| tree | 0fdb06927c732897157eae98f9e15dafba111a9a | |
| parent | b4bd938acebc953d8f86caa63fa6b2e0a7629fb3 (diff) | |
| download | gnome-control-center-eb3dd23f6ef10476403328e22fcae8f1c9faea0d.tar.gz | |
[shell] Make the desktop file name match the process name
This ensures that WM_CLASS will be set properly. See
http://live.gnome.org/GnomeShell/ApplicationBased
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | shell/Makefile.am | 13 | ||||
| -rw-r--r-- | shell/gnome-control-center.desktop.in.in (renamed from shell/gnomecc.desktop.in.in) | 0 |
3 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f3a0047c5..6dfe7b7d9 100644 --- a/configure.ac +++ b/configure.ac @@ -383,7 +383,7 @@ libgnome-control-center-extension/libgnome-control-center-extension.pc libgnome-control-center-extension/libgnome-control-center-extension-uninstalled.pc po/Makefile.in shell/Makefile -shell/gnomecc.desktop.in +shell/gnome-control-center.desktop.in typing-break/Makefile ]) diff --git a/shell/Makefile.am b/shell/Makefile.am index 7cccb274b..84a3483fd 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -27,7 +27,8 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DEXTENSIONSDIR="\"$(EXTENSIONSDIR)\"" \ -DUIDIR="\"$(uidir)\"" \ - -DMENUDIR="\"$(menudir)\"" + -DMENUDIR="\"$(menudir)\"" \ + $(NULL) menudir = $(sysconfdir)/xdg/menus menu_DATA = gnomecc.menu @@ -36,7 +37,7 @@ uidir = $(pkgdatadir)/ui ui_DATA = shell.ui sysdir = $(datadir)/applications -sys_in_files = gnomecc.desktop.in +sys_in_files = gnome-control-center.desktop.in sys_DATA = $(sys_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ @@ -58,7 +59,13 @@ if GCONF_SCHEMAS_INSTALL fi endif -EXTRA_DIST = $(ui_DATA) gnomecc.desktop.in.in gnomecc.directory.in gnomecc.menu $(schemas_DATA).in +EXTRA_DIST = \ + $(ui_DATA) \ + gnome-control-center.desktop.in.in \ + gnomecc.directory.in \ + gnomecc.menu \ + $(schemas_DATA).in \ + $(NULL) DISTCLEANFILES = gnomecc.desktop gnomecc.desktop.in gnomecc.directory $(schemas_DATA) diff --git a/shell/gnomecc.desktop.in.in b/shell/gnome-control-center.desktop.in.in index 4b082e7f7..4b082e7f7 100644 --- a/shell/gnomecc.desktop.in.in +++ b/shell/gnome-control-center.desktop.in.in |