aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a1f9f46c..72b1e3731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-03-14 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-window.c: (setup_multimedia_key_actions):
+
+ Fix the build.
+
+2005-03-14 Christian Persch <chpe@cvs.gnome.org>
+
* data/ui/epiphany-ui.xml:
* src/ephy-window.c: (ephy_window_key_press_event),
(setup_multimedia_key_actions), (setup_ui_manager):
diff --git a/src/ephy-window.c b/src/ephy-window.c
index dc7681e22..859801e72 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -366,7 +366,7 @@ static const struct
const char *name;
guint keyval;
GCallback callback;
-} const multimedia_actions [] = {
+} xf_key_actions [] = {
{ "XFKeyHomePage", XF86XK_HomePage, G_CALLBACK (window_cmd_go_home ) },
{ "XFKeyBack", XF86XK_Back, G_CALLBACK (window_cmd_go_back ) },
{ "XFKeyForward", XF86XK_Forward, G_CALLBACK (window_cmd_go_forward ) },
@@ -1110,17 +1110,17 @@ setup_multimedia_key_actions (EphyWindow *window)
agname = gtk_action_group_get_name (action_group);
- for (i = 0; i < G_N_ELEMENTS (multimedia_actions); i++)
+ for (i = 0; i < G_N_ELEMENTS (xf_key_actions); i++)
{
- name = multimedia_actions[i].name;
+ name = xf_key_actions[i].name;
action = g_object_new (GTK_TYPE_ACTION, "name", name, NULL);
g_signal_connect (action, "activate",
- multimedia_actions[i].callback, window);
+ xf_key_actions[i].callback, window);
accel_path = g_strconcat ("<Actions>/", agname, "/", name, NULL);
gtk_action_set_accel_path (action, accel_path);
- gtk_accel_map_add_entry (accel_path, multimedia_actions[i].keyval, 0);
+ gtk_accel_map_add_entry (accel_path, xf_key_actions[i].keyval, 0);
gtk_action_group_add_action (action_group, action);
g_free (accel_path);
}