[epiphany/wip/gtkaction-to-gaction] Update function header
- From: Iulian Radu <iulianradu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/gtkaction-to-gaction] Update function header
- Date: Fri, 1 Jul 2016 20:00:44 +0000 (UTC)
commit b8f87ed3fab4ae64ddc4c22dbfeaea905db6854f
Author: Iulian Radu <iulian radu67 gmail com>
Date: Fri Jul 1 21:46:25 2016 +0300
Update function header
src/window-commands.c | 47 ++++++++++++++++++++++++-----------------------
src/window-commands.h | 5 +++--
2 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/src/window-commands.c b/src/window-commands.c
index 358f8d0..58ab39f 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1597,29 +1597,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)
@@ -1693,6 +1670,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 077093f..64476a6 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -132,8 +132,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);
@@ -143,6 +141,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]