summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Radu <iulian.radu67@gmail.com>2016-07-01 21:46:25 +0300
committerIulian Radu <iulian.radu67@gmail.com>2016-07-11 19:24:20 +0300
commit74072785db835fa5a1dc3e110e57ff4787b89fd4 (patch)
tree304f2c4001876e0c7a797829396e1d94a94bca14
parent34ff81f0ddb860b329a7d5fd3b1c04ed87e82656 (diff)
downloadepiphany-74072785db835fa5a1dc3e110e57ff4787b89fd4.tar.gz
Update function header
-rw-r--r--src/window-commands.c47
-rw-r--r--src/window-commands.h5
2 files changed, 27 insertions, 25 deletions
diff --git a/src/window-commands.c b/src/window-commands.c
index e2928a6f8..da20d73ae 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1624,29 +1624,6 @@ window_cmd_view_toggle_inspector (GSimpleAction *action,
}
void
-window_cmd_load_location (GtkAction *action,
- EphyWindow *window)
-{
- const char *location;
-
- location = ephy_window_get_location (window);
-
- if (location) {
- EphyBookmarks *bookmarks;
- char *address;
-
- bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-
- address = ephy_bookmarks_resolve_address (bookmarks, location, NULL);
- g_return_if_fail (address != NULL);
-
- ephy_link_open (EPHY_LINK (window), address,
- ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)),
- ephy_link_flags_from_current_event ());
- }
-}
-
-void
window_cmd_edit_select_all (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
@@ -1720,6 +1697,30 @@ window_cmd_go_location (GSimpleAction *action,
}
void
+window_cmd_load_location (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ const char *location;
+
+ location = ephy_window_get_location (window);
+
+ if (location) {
+ EphyBookmarks *bookmarks;
+ char *address;
+
+ bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+
+ address = ephy_bookmarks_resolve_address (bookmarks, location, NULL);
+ g_return_if_fail (address != NULL);
+
+ ephy_link_open (EPHY_LINK (user_data), address,
+ ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (user_data)),
+ ephy_link_flags_from_current_event ());
+ }
+}
+
+void
window_cmd_change_browse_with_caret (GSimpleAction *action,
GVariant *state,
gpointer user_data)
diff --git a/src/window-commands.h b/src/window-commands.h
index 302793ffd..151a20984 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -135,8 +135,6 @@ void window_cmd_view_page_source (GSimpleAction *action,
void window_cmd_view_toggle_inspector (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
-void window_cmd_load_location (GtkAction *action,
- EphyWindow *window);
void window_cmd_edit_select_all (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
@@ -146,6 +144,9 @@ void window_cmd_file_send_to (GSimpleAction *action,
void window_cmd_go_location (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
+void window_cmd_load_location (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data);
void window_cmd_change_browse_with_caret (GSimpleAction *action,
GVariant *state,
gpointer user_data);