diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2017-08-27 15:47:03 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2017-08-27 15:47:03 -0500 |
| commit | 104bc990d8c84bf2c678a1659679840c2b2eae5d (patch) | |
| tree | a5c20579321e020ca04fb4ff7e7d5533b4fcd5ed | |
| parent | 0a9385a5daf7de922f910f2dfef3179a7a14c50c (diff) | |
| download | epiphany-wip/chergert/completion.tar.gz | |
Fix build with recent WebKitGTK+wip/chergert/completion
Apparently namespace violations are a bad idea
| -rw-r--r-- | src/ephy-window.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 1bedad3ba..b738e35b6 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1268,9 +1268,9 @@ action_activate_cb (GtkAction *action, gpointer user_data) } static WebKitContextMenuItem * -webkit_context_menu_item_new_from_gaction_with_parameter (GAction *action, - const char *label, - GVariant *parameter) +ephy_webkit_context_menu_item_new_from_gaction_with_parameter (GAction *action, + const char *label, + GVariant *parameter) { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -1302,10 +1302,10 @@ webkit_context_menu_item_new_from_gaction_with_parameter (GAction *action, } static WebKitContextMenuItem * -webkit_context_menu_item_new_from_gaction (GAction *action, - const char *label) +ephy_webkit_context_menu_item_new_from_gaction (GAction *action, + const char *label) { - return webkit_context_menu_item_new_from_gaction_with_parameter (action, label, NULL); + return ephy_webkit_context_menu_item_new_from_gaction_with_parameter (action, label, NULL); } static char * @@ -1380,14 +1380,14 @@ add_action_to_context_menu (WebKitContextMenu *context_menu, action = g_action_map_lookup_action (G_ACTION_MAP (action_group), name); label = g_hash_table_lookup (window->action_labels, name); if (strcmp (label, "search-selection-placeholder") != 0) { - webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction (action, _(label))); + webkit_context_menu_append (context_menu, ephy_webkit_context_menu_item_new_from_gaction (action, _(label))); } else { search_term = g_variant_get_string (target, NULL); search_label = format_search_label (search_term); webkit_context_menu_append (context_menu, - webkit_context_menu_item_new_from_gaction_with_parameter (action, - search_label, - g_variant_new_string (search_term))); + ephy_webkit_context_menu_item_new_from_gaction_with_parameter (action, + search_label, + g_variant_new_string (search_term))); g_free (search_label); } } |