[gnome-control-center] panels: make .desktop file naming more consistent



commit 847bbba2b88179f30416819b78941b34fb9cc749
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Jun 2 16:54:26 2010 +0100

    panels: make .desktop file naming more consistent
    
    Give the .desktop files for settings panels a more consistent naming
    scheme.

 configure.ac                                       |   10 +++++-----
 panels/default-applications/Makefile.am            |    2 +-
 ...gnome-default-applications-panel.desktop.in.in} |    0
 panels/keybindings/Makefile.am                     |    2 +-
 ...in.in => gnome-keybindings-panel.desktop.in.in} |    0
 panels/keyboard/Makefile.am                        |    2 +-
 ...op.in.in => gnome-keyboard-panel.desktop.in.in} |    0
 panels/mouse/Makefile.am                           |    2 +-
 ...sktop.in.in => gnome-mouse-panel.desktop.in.in} |    0
 panels/network/Makefile.am                         |    2 +-
 ...top.in.in => gnome-network-panel.desktop.in.in} |    0
 11 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 25375cf..283faf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,7 +381,7 @@ capplets/appearance/data/gnome-appearance-properties.desktop.in
 capplets/appearance/data/gnome-theme-installer.desktop.in
 capplets/common/Makefile
 panels/default-applications/Makefile
-panels/default-applications/default-applications.desktop.in
+panels/default-applications/gnome-default-applications-panel.desktop.in
 panels/default-applications/gnome-at-commandline.in
 panels/default-applications/gnome-at-session.desktop.in
 panels/default-applications/gnome-default-applications.pc
@@ -389,7 +389,7 @@ capplets/display/Makefile
 capplets/display/display-properties.desktop.in
 panels/keybindings/Makefile
 panels/keybindings/gnome-keybindings.pc
-panels/keybindings/keybinding.desktop.in
+panels/keybindings/gnome-keybindings-panel.desktop.in
 docs/Makefile
 docs/reference/Makefile
 docs/reference/libgnome-control-center/Makefile
@@ -405,11 +405,11 @@ libwindow-settings/Makefile
 libwindow-settings/gnome-window-settings-2.0.pc
 panels/Makefile
 panels/mouse/Makefile
-panels/mouse/gnome-settings-mouse.desktop.in
+panels/mouse/gnome-mouse-panel.desktop.in
 panels/keyboard/Makefile
-panels/keyboard/keyboard.desktop.in
+panels/keyboard/gnome-keyboard-panel.desktop.in
 panels/network/Makefile
-panels/network/gnome-network-properties.desktop.in
+panels/network/gnome-network-panel.desktop.in
 po/Makefile.in
 shell/Makefile
 shell/gnome-control-center.desktop.in
diff --git a/panels/default-applications/Makefile.am b/panels/default-applications/Makefile.am
index ee5ed43..95412d7 100644
--- a/panels/default-applications/Makefile.am
+++ b/panels/default-applications/Makefile.am
@@ -28,7 +28,7 @@ gnome-at-mobility: gnome-at-commandline.in
 	cp $< $@
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = default-applications.desktop.in
+Desktop_in_files = gnome-default-applications-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 pkgconfigdir = $(datadir)/pkgconfig
diff --git a/panels/default-applications/default-applications.desktop.in.in b/panels/default-applications/gnome-default-applications-panel.desktop.in.in
similarity index 100%
rename from panels/default-applications/default-applications.desktop.in.in
rename to panels/default-applications/gnome-default-applications-panel.desktop.in.in
diff --git a/panels/keybindings/Makefile.am b/panels/keybindings/Makefile.am
index 85d4def..f2dee9a 100644
--- a/panels/keybindings/Makefile.am
+++ b/panels/keybindings/Makefile.am
@@ -22,7 +22,7 @@ uidir   = $(pkgdatadir)/ui
 ui_DATA = gnome-keybinding-properties.ui
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = keybinding.desktop.in
+Desktop_in_files = gnome-keybindings-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/panels/keybindings/keybinding.desktop.in.in b/panels/keybindings/gnome-keybindings-panel.desktop.in.in
similarity index 100%
rename from panels/keybindings/keybinding.desktop.in.in
rename to panels/keybindings/gnome-keybindings-panel.desktop.in.in
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 510adfc..3e6a469 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -42,7 +42,7 @@ ui_DATA = gnome-keyboard-properties-a11y-notifications.ui \
 		gnome-keyboard-properties-options-dialog.ui
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = keyboard.desktop.in
+Desktop_in_files = gnome-keyboard-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
diff --git a/panels/keyboard/keyboard.desktop.in.in b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
similarity index 100%
rename from panels/keyboard/keyboard.desktop.in.in
rename to panels/keyboard/gnome-keyboard-panel.desktop.in.in
diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am
index ea0f8c8..ef6ff15 100644
--- a/panels/mouse/Makefile.am
+++ b/panels/mouse/Makefile.am
@@ -39,7 +39,7 @@ uidir   = $(pkgdatadir)/ui
 ui_DATA = gnome-mouse-properties.ui
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-settings-mouse.desktop.in
+Desktop_in_files = gnome-mouse-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
diff --git a/panels/mouse/gnome-settings-mouse.desktop.in.in b/panels/mouse/gnome-mouse-panel.desktop.in.in
similarity index 100%
rename from panels/mouse/gnome-settings-mouse.desktop.in.in
rename to panels/mouse/gnome-mouse-panel.desktop.in.in
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index 3c07483..6f74ddd 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -32,7 +32,7 @@ iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
 dist_iconssvg_DATA = icons/scalable/gnome-network-properties.svg
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-network-properties.desktop.in
+desktop_in_files = gnome-network-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES = \
diff --git a/panels/network/gnome-network-properties.desktop.in.in b/panels/network/gnome-network-panel.desktop.in.in
similarity index 100%
rename from panels/network/gnome-network-properties.desktop.in.in
rename to panels/network/gnome-network-panel.desktop.in.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]