GNOME.org
 

[gnome-control-center] [keyboard] Rename keybindings to keyboard

commit 728331f3061ac68e410a0aa9cfca2103a6d8c862
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Oct 31 23:58:35 2010 -0400

    [keyboard] Rename keybindings to keyboard

 configure.ac                                       |    6 +-
 panels/Makefile.am                                 |    2 +-
 .../gnome-keybindings-panel.desktop.in.in          |   15 ------
 .../00-multimedia-key.xml.in                       |    0
 .../01-desktop-key.xml.in                          |    0
 panels/{keybindings => keyboard}/Makefile.am       |   26 +++++-----
 .../cc-keyboard-panel.c}                           |   54 ++++++++++----------
 .../cc-keyboard-panel.h}                           |   44 ++++++++--------
 panels/{keybindings => keyboard}/eggaccelerators.c |    0
 panels/{keybindings => keyboard}/eggaccelerators.h |    0
 .../eggcellrendererkeys.c                          |    0
 .../eggcellrendererkeys.h                          |    0
 .../gnome-keybindings.pc.in                        |    0
 .../gnome-keyboard-panel.c}                        |    2 +-
 panels/keyboard/gnome-keyboard-panel.desktop.in.in |   15 ++++++
 .../gnome-keyboard-panel.h}                        |    0
 .../gnome-keyboard-panel.ui}                       |    0
 .../keyboard-module.c}                             |    4 +-
 panels/{keybindings => keyboard}/wm-common.c       |    0
 panels/{keybindings => keyboard}/wm-common.h       |    0
 po/POTFILES.in                                     |   12 ++--
 po/POTFILES.skip                                   |    2 +-
 22 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0a9e080..d0867aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,9 +335,9 @@ panels/default-applications/gnome-default-applications-panel.desktop.in
 panels/default-applications/gnome-default-applications.pc
 panels/display/Makefile
 panels/display/gnome-display-panel.desktop.in
-panels/keybindings/Makefile
-panels/keybindings/gnome-keybindings-panel.desktop.in
-panels/keybindings/gnome-keybindings.pc
+panels/keyboard/Makefile
+panels/keyboard/gnome-keyboard-panel.desktop.in
+panels/keyboard/gnome-keybindings.pc
 panels/region/Makefile
 panels/region/gnome-region-panel.desktop.in
 panels/mouse/Makefile
diff --git a/panels/Makefile.am b/panels/Makefile.am
index 62041ec..e71040e 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS= \
 	network \
 	sound \
 	default-applications \
-	keybindings \
+	keyboard \
 	universal-access \
 	user-accounts \
 	datetime
diff --git a/panels/keybindings/00-multimedia-key.xml.in b/panels/keyboard/00-multimedia-key.xml.in
similarity index 100%
rename from panels/keybindings/00-multimedia-key.xml.in
rename to panels/keyboard/00-multimedia-key.xml.in
diff --git a/panels/keybindings/01-desktop-key.xml.in b/panels/keyboard/01-desktop-key.xml.in
similarity index 100%
rename from panels/keybindings/01-desktop-key.xml.in
rename to panels/keyboard/01-desktop-key.xml.in
diff --git a/panels/keybindings/Makefile.am b/panels/keyboard/Makefile.am
similarity index 66%
rename from panels/keybindings/Makefile.am
rename to panels/keyboard/Makefile.am
index 764b107..0de3540 100644
--- a/panels/keybindings/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -1,33 +1,33 @@
 # This is used in GNOMECC_CAPPLETS_CFLAGS
-cappletname = keybinding
+cappletname = keyboard
 
 ccpanelsdir = $(PANELS_DIR)
-ccpanels_LTLIBRARIES = libkeybinding-properties.la
+ccpanels_LTLIBRARIES = libkeyboard.la
 
-libkeybinding_properties_la_SOURCES =   \
-	keybindings-module.c		\
-	cc-keybindings-panel.c		\
-	cc-keybindings-panel.h		\
+libkeyboard_la_SOURCES =   \
+	keyboard-module.c		\
+	cc-keyboard-panel.c		\
+	cc-keyboard-panel.h		\
 	wm-common.c			\
 	wm-common.h			\
-	gnome-keybinding-properties.c	\
-	gnome-keybinding-properties.h	\
+	gnome-keyboard-panel.c		\
+	gnome-keyboard-panel.h		\
 	eggcellrendererkeys.c		\
 	eggcellrendererkeys.h		\
 	eggaccelerators.c		\
 	eggaccelerators.h
 
-libkeybinding_properties_la_CFLAGS = $(PANEL_CFLAGS)
-libkeybinding_properties_la_LIBADD = $(PANEL_LIBS)
-libkeybinding_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
+libkeyboard_la_CFLAGS = $(PANEL_CFLAGS)
+libkeyboard_la_LIBADD = $(PANEL_LIBS)
+libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 @INTLTOOL_DESKTOP_RULE@
 
 uidir   = $(pkgdatadir)/ui
-ui_DATA = gnome-keybinding-properties.ui
+ui_DATA = gnome-keyboard-panel.ui
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-keybindings-panel.desktop.in
+Desktop_in_files = gnome-keyboard-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/panels/keybindings/cc-keybindings-panel.c b/panels/keyboard/cc-keyboard-panel.c
similarity index 58%
rename from panels/keybindings/cc-keybindings-panel.c
rename to panels/keyboard/cc-keyboard-panel.c
index 3a98163..b4a9f9b 100644
--- a/panels/keybindings/cc-keybindings-panel.c
+++ b/panels/keyboard/cc-keyboard-panel.c
@@ -19,22 +19,22 @@
  *
  */
 
-#include "cc-keybindings-panel.h"
-#include "gnome-keybinding-properties.h"
+#include "cc-keyboard-panel.h"
+#include "gnome-keyboard-panel.h"
 
-G_DEFINE_DYNAMIC_TYPE (CcKeybindingsPanel, cc_keybindings_panel, CC_TYPE_PANEL)
+G_DEFINE_DYNAMIC_TYPE (CcKeyboardPanel, cc_keyboard_panel, CC_TYPE_PANEL)
 
-#define KEYBINDINGS_PANEL_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBINDINGS_PANEL, CcKeybindingsPanelPrivate))
+#define KEYBOARD_PANEL_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelPrivate))
 
-struct _CcKeybindingsPanelPrivate
+struct _CcKeyboardPanelPrivate
 {
   GtkBuilder *builder;
 };
 
 
 static void
-cc_keybindings_panel_get_property (GObject    *object,
+cc_keyboard_panel_get_property (GObject    *object,
                                guint       property_id,
                                GValue     *value,
                                GParamSpec *pspec)
@@ -47,7 +47,7 @@ cc_keybindings_panel_get_property (GObject    *object,
 }
 
 static void
-cc_keybindings_panel_set_property (GObject      *object,
+cc_keyboard_panel_set_property (GObject      *object,
                                guint         property_id,
                                const GValue *value,
                                GParamSpec   *pspec)
@@ -60,43 +60,43 @@ cc_keybindings_panel_set_property (GObject      *object,
 }
 
 static void
-cc_keybindings_panel_dispose (GObject *object)
+cc_keyboard_panel_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (cc_keybindings_panel_parent_class)->dispose (object);
+  G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->dispose (object);
 }
 
 static void
-cc_keybindings_panel_finalize (GObject *object)
+cc_keyboard_panel_finalize (GObject *object)
 {
-  G_OBJECT_CLASS (cc_keybindings_panel_parent_class)->finalize (object);
+  G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object);
 }
 
 static void
-cc_keybindings_panel_class_init (CcKeybindingsPanelClass *klass)
+cc_keyboard_panel_class_init (CcKeyboardPanelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (CcKeybindingsPanelPrivate));
+  g_type_class_add_private (klass, sizeof (CcKeyboardPanelPrivate));
 
-  object_class->get_property = cc_keybindings_panel_get_property;
-  object_class->set_property = cc_keybindings_panel_set_property;
-  object_class->dispose = cc_keybindings_panel_dispose;
-  object_class->finalize = cc_keybindings_panel_finalize;
+  object_class->get_property = cc_keyboard_panel_get_property;
+  object_class->set_property = cc_keyboard_panel_set_property;
+  object_class->dispose = cc_keyboard_panel_dispose;
+  object_class->finalize = cc_keyboard_panel_finalize;
 }
 
 static void
-cc_keybindings_panel_class_finalize (CcKeybindingsPanelClass *klass)
+cc_keyboard_panel_class_finalize (CcKeyboardPanelClass *klass)
 {
 }
 
 static void
-cc_keybindings_panel_init (CcKeybindingsPanel *self)
+cc_keyboard_panel_init (CcKeyboardPanel *self)
 {
-  CcKeybindingsPanelPrivate *priv;
+  CcKeyboardPanelPrivate *priv;
   GError *error = NULL;
-  const gchar *uifile = GNOMECC_UI_DIR "/gnome-keybinding-properties.ui";
+  const gchar *uifile = GNOMECC_UI_DIR "/gnome-keyboard-panel.ui";
 
-  priv = self->priv = KEYBINDINGS_PANEL_PRIVATE (self);
+  priv = self->priv = KEYBOARD_PANEL_PRIVATE (self);
 
 
   priv->builder = gtk_builder_new ();
@@ -121,11 +121,11 @@ cc_keybindings_panel_init (CcKeybindingsPanel *self)
 }
 
 void
-cc_keybindings_panel_register (GIOModule *module)
+cc_keyboard_panel_register (GIOModule *module)
 {
-  cc_keybindings_panel_register_type (G_TYPE_MODULE (module));
+  cc_keyboard_panel_register_type (G_TYPE_MODULE (module));
   g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
-                                  CC_TYPE_KEYBINDINGS_PANEL,
-                                  "keybinding", 0);
+                                  CC_TYPE_KEYBOARD_PANEL,
+                                  "keyboard", 0);
 }
 
diff --git a/panels/keybindings/cc-keybindings-panel.h b/panels/keyboard/cc-keyboard-panel.h
similarity index 53%
rename from panels/keybindings/cc-keybindings-panel.h
rename to panels/keyboard/cc-keyboard-panel.h
index cfd7be2..fe6a011 100644
--- a/panels/keybindings/cc-keybindings-panel.h
+++ b/panels/keyboard/cc-keyboard-panel.h
@@ -20,55 +20,55 @@
  */
 
 
-#ifndef _CC_KEYBINDINGS_PANEL_H
-#define _CC_KEYBINDINGS_PANEL_H
+#ifndef _CC_KEYBOARD_PANEL_H
+#define _CC_KEYBOARD_PANEL_H
 
 #include <libgnome-control-center/cc-panel.h>
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBINDINGS_PANEL cc_keybindings_panel_get_type()
+#define CC_TYPE_KEYBOARD_PANEL cc_keyboard_panel_get_type()
 
-#define CC_KEYBINDINGS_PANEL(obj) \
+#define CC_KEYBOARD_PANEL(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  CC_TYPE_KEYBINDINGS_PANEL, CcKeybindingsPanel))
+  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanel))
 
-#define CC_KEYBINDINGS_PANEL_CLASS(klass) \
+#define CC_KEYBOARD_PANEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  CC_TYPE_KEYBINDINGS_PANEL, CcKeybindingsPanelClass))
+  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
 
-#define CC_IS_KEYBINDINGS_PANEL(obj) \
+#define CC_IS_KEYBOARD_PANEL(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  CC_TYPE_KEYBINDINGS_PANEL))
+  CC_TYPE_KEYBOARD_PANEL))
 
-#define CC_IS_KEYBINDINGS_PANEL_CLASS(klass) \
+#define CC_IS_KEYBOARD_PANEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  CC_TYPE_KEYBINDINGS_PANEL))
+  CC_TYPE_KEYBOARD_PANEL))
 
-#define CC_KEYBINDINGS_PANEL_GET_CLASS(obj) \
+#define CC_KEYBOARD_PANEL_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  CC_TYPE_KEYBINDINGS_PANEL, CcKeybindingsPanelClass))
+  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
 
-typedef struct _CcKeybindingsPanel CcKeybindingsPanel;
-typedef struct _CcKeybindingsPanelClass CcKeybindingsPanelClass;
-typedef struct _CcKeybindingsPanelPrivate CcKeybindingsPanelPrivate;
+typedef struct _CcKeyboardPanel CcKeyboardPanel;
+typedef struct _CcKeyboardPanelClass CcKeyboardPanelClass;
+typedef struct _CcKeyboardPanelPrivate CcKeyboardPanelPrivate;
 
-struct _CcKeybindingsPanel
+struct _CcKeyboardPanel
 {
   CcPanel parent;
 
-  CcKeybindingsPanelPrivate *priv;
+  CcKeyboardPanelPrivate *priv;
 };
 
-struct _CcKeybindingsPanelClass
+struct _CcKeyboardPanelClass
 {
   CcPanelClass parent_class;
 };
 
-GType cc_keybindings_panel_get_type (void) G_GNUC_CONST;
+GType cc_keyboard_panel_get_type (void) G_GNUC_CONST;
 
-void  cc_keybindings_panel_register (GIOModule *module);
+void  cc_keyboard_panel_register (GIOModule *module);
 
 G_END_DECLS
 
-#endif /* _CC_KEYBINDINGS_PANEL_H */
+#endif /* _CC_KEYBOARD_PANEL_H */
diff --git a/panels/keybindings/eggaccelerators.c b/panels/keyboard/eggaccelerators.c
similarity index 100%
rename from panels/keybindings/eggaccelerators.c
rename to panels/keyboard/eggaccelerators.c
diff --git a/panels/keybindings/eggaccelerators.h b/panels/keyboard/eggaccelerators.h
similarity index 100%
rename from panels/keybindings/eggaccelerators.h
rename to panels/keyboard/eggaccelerators.h
diff --git a/panels/keybindings/eggcellrendererkeys.c b/panels/keyboard/eggcellrendererkeys.c
similarity index 100%
rename from panels/keybindings/eggcellrendererkeys.c
rename to panels/keyboard/eggcellrendererkeys.c
diff --git a/panels/keybindings/eggcellrendererkeys.h b/panels/keyboard/eggcellrendererkeys.h
similarity index 100%
rename from panels/keybindings/eggcellrendererkeys.h
rename to panels/keyboard/eggcellrendererkeys.h
diff --git a/panels/keybindings/gnome-keybindings.pc.in b/panels/keyboard/gnome-keybindings.pc.in
similarity index 100%
rename from panels/keybindings/gnome-keybindings.pc.in
rename to panels/keyboard/gnome-keybindings.pc.in
diff --git a/panels/keybindings/gnome-keybinding-properties.c b/panels/keyboard/gnome-keyboard-panel.c
similarity index 99%
rename from panels/keybindings/gnome-keybinding-properties.c
rename to panels/keyboard/gnome-keyboard-panel.c
index 11fb811..0f7d98a 100644
--- a/panels/keybindings/gnome-keybinding-properties.c
+++ b/panels/keyboard/gnome-keyboard-panel.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "wm-common.h"
-#include "gnome-keybinding-properties.h"
+#include "gnome-keyboard-panel.h"
 #include "eggcellrendererkeys.h"
 
 #define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
diff --git a/panels/keyboard/gnome-keyboard-panel.desktop.in.in b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
new file mode 100644
index 0000000..1ecf612
--- /dev/null
+++ b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=Keyboard
+_Comment=Change keyboard settings
+Exec=gnome-control-center keyboard
+Icon=preferences-desktop-keyboard
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=keyboard
+X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-Settings-Panel=keyboard
diff --git a/panels/keybindings/gnome-keybinding-properties.h b/panels/keyboard/gnome-keyboard-panel.h
similarity index 100%
rename from panels/keybindings/gnome-keybinding-properties.h
rename to panels/keyboard/gnome-keyboard-panel.h
diff --git a/panels/keybindings/gnome-keybinding-properties.ui b/panels/keyboard/gnome-keyboard-panel.ui
similarity index 100%
rename from panels/keybindings/gnome-keybinding-properties.ui
rename to panels/keyboard/gnome-keyboard-panel.ui
diff --git a/panels/keybindings/keybindings-module.c b/panels/keyboard/keyboard-module.c
similarity index 93%
rename from panels/keybindings/keybindings-module.c
rename to panels/keyboard/keyboard-module.c
index 4d33ce9..483f51c 100644
--- a/panels/keybindings/keybindings-module.c
+++ b/panels/keyboard/keyboard-module.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "cc-keybindings-panel.h"
+#include "cc-keyboard-panel.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -32,7 +32,7 @@ g_io_module_load (GIOModule *module)
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
   /* register the panel */
-  cc_keybindings_panel_register (module);
+  cc_keyboard_panel_register (module);
 }
 
 void
diff --git a/panels/keybindings/wm-common.c b/panels/keyboard/wm-common.c
similarity index 100%
rename from panels/keybindings/wm-common.c
rename to panels/keyboard/wm-common.c
diff --git a/panels/keybindings/wm-common.h b/panels/keyboard/wm-common.h
similarity index 100%
rename from panels/keybindings/wm-common.h
rename to panels/keyboard/wm-common.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 99fc637..0a43871 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,12 +19,12 @@ panels/default-applications/gnome-default-applications.xml.in
 [type: gettext/glade]panels/display/display-capplet.ui
 panels/display/gnome-display-panel.desktop.in.in
 panels/display/xrandr-capplet.c
-panels/keybindings/00-multimedia-key.xml.in
-panels/keybindings/01-desktop-key.xml.in
-panels/keybindings/eggcellrendererkeys.c
-panels/keybindings/gnome-keybinding-properties.c
-[type: gettext/glade]panels/keybindings/gnome-keybinding-properties.ui
-panels/keybindings/gnome-keybindings-panel.desktop.in.in
+panels/keyboard/00-multimedia-key.xml.in
+panels/keyboard/01-desktop-key.xml.in
+panels/keyboard/eggcellrendererkeys.c
+panels/keyboard/gnome-keyboard-panel.c
+[type: gettext/glade]panels/keyboard/gnome-keybinding-properties.ui
+panels/keyboard/gnome-keyboard-panel.desktop.in.in
 panels/region/gnome-region-panel.c
 [type: gettext/glade]panels/region/gnome-region-panel.ui
 [type: gettext/glade]panels/region/gnome-region-properties-layout-chooser.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2dbd03f..01d9a85 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,7 +6,7 @@ panels/datetime/gnome-datetime-panel.desktop.in
 panels/default-applications/gnome-default-applications-panel.desktop.in
 panels/default-applications/gnome-at-session.desktop.in
 panels/display/gnome-display-panel.desktop.in
-panels/keybindings/gnome-keybindings-panel.desktop.in
+panels/keyboard/gnome-keyboard-panel.desktop.in
 panels/region/gnome-region-panel.desktop.in
 panels/sound/data/gnome-sound-panel.desktop.in
 panels/sound/data/sounds/gnome-sounds-default.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]