diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2005-11-14 15:18:09 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2005-11-14 15:18:09 +0000 |
| commit | 564a9d03aa5898cda7540f952279e768382fbb1d (patch) | |
| tree | 150a85474c1e72b136388cecee164ee5f1253787 /capplets/keybindings | |
| parent | c64b931ac0b0772ec1816aaf0ceb6837b53a6368 (diff) | |
| download | gnome-control-center-564a9d03aa5898cda7540f952279e768382fbb1d.tar.gz | |
Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. ANSIfy
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* */*: Huge cleanup. Individual ChangeLogs have info.
Closing bug #320157.
* libkbddraw/keyboard-drawing.h: ANSIfy some function declarations.
Diffstat (limited to 'capplets/keybindings')
| -rw-r--r-- | capplets/keybindings/ChangeLog | 7 | ||||
| -rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 3 | ||||
| -rw-r--r-- | capplets/keybindings/gnome-keybinding-properties.c | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index c2b347f53..4893cd0b7 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,10 @@ +2005-11-14 Kjartan Maraas <kmaraas@gnome.org> + + * eggcellrendererkeys.c: (egg_cell_renderer_keys_set_accelerator): + Remove some unused code. + * gnome-keybinding-properties.c: (should_show_key): Mark some + arrays static. + 2005-02-08 Sebastien Bacher <seb128@debian.org> * eggcellrendererkeys.c: (egg_cell_renderer_keys_start_editing): diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 7d56e7c27..c52caef63 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -628,7 +628,6 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, { char *text; gboolean changed; - GtkCellRendererText *celltext; g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); @@ -663,12 +662,10 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, if (changed) { /* sync string to the key values */ - celltext = GTK_CELL_RENDERER_TEXT (keys); text = convert_keysym_state_to_string (keys->accel_key, keys->keycode, keys->accel_mask); g_object_set (keys, "text", text, NULL); g_free (text); } - } void diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 72d81f5e5..6a8886212 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -38,7 +38,7 @@ typedef struct gint data; } KeyListEntry; -const KeyListEntry desktop_key_list[] = +static const KeyListEntry desktop_key_list[] = { { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, @@ -59,7 +59,7 @@ const KeyListEntry desktop_key_list[] = #endif { NULL } }; -const KeyListEntry sounds_key_list[] = +static const KeyListEntry sounds_key_list[] = { { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 }, @@ -74,7 +74,7 @@ const KeyListEntry sounds_key_list[] = { NULL } }; -const KeyListEntry metacity_key_list[] = +static const KeyListEntry metacity_key_list[] = { { "/apps/metacity/window_keybindings/activate_window_menu", ALWAYS_VISIBLE, 0 }, { "/apps/metacity/window_keybindings/toggle_fullscreen", ALWAYS_VISIBLE, 0 }, @@ -442,7 +442,6 @@ should_show_key (const KeyListEntry *entry) return TRUE; else return FALSE; - break; } return FALSE; |