diff options
| -rw-r--r-- | src/epiphany.defs | 84 | ||||
| -rw-r--r-- | src/epiphany.override | 13 |
2 files changed, 12 insertions, 85 deletions
diff --git a/src/epiphany.defs b/src/epiphany.defs index 1e76301b3..4c497e707 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -187,13 +187,6 @@ (gtype-id "EPHY_TYPE_STATUSBAR") ) -(define-object Tab - (in-module "Ephy") - (parent "GtkBin") - (c-name "EphyTab") - (gtype-id "EPHY_TYPE_TAB") -) - (define-object Toolbar (in-module "Ephy") (parent "EggEditableToolbar") @@ -2884,7 +2877,7 @@ (return-type "none") (parameters '("EphyWindow*" "window") - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") ) ) @@ -2894,7 +2887,7 @@ (return-type "none") (parameters '("EphyWindow*" "window") - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") ) ) @@ -2986,10 +2979,10 @@ (define-method open (of-object "EphyLink") (c-name "ephy_link_open") - (return-type "EphyTab*") + (return-type "EphyEmbed*") (parameters '("const-char*" "address") - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") '("EphyLinkFlags" "flags") ) ) @@ -3033,7 +3026,7 @@ (c-name "ephy_notebook_add_tab") (return-type "none") (parameters - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") '("int" "position") '("gboolean" "jump_to") ) @@ -3155,10 +3148,10 @@ (define-method new_tab (of-object "EphyShell") (c-name "ephy_shell_new_tab") - (return-type "EphyTab*") + (return-type "EphyEmbed*") (parameters '("EphyWindow*" "parent_window") - '("EphyTab*" "previous_tab") + '("EphyEmbed*" "previous_tab") '("const-char*" "url") '("EphyNewTabFlags" "flags") ) @@ -3167,10 +3160,10 @@ (define-method new_tab_full (of-object "EphyShell") (c-name "ephy_shell_new_tab_full") - (return-type "EphyTab*") + (return-type "EphyEmbed*") (parameters '("EphyWindow*" "parent_window") - '("EphyTab*" "previous_tab") + '("EphyEmbed*" "previous_tab") '("const-char*" "url") '("EphyNewTabFlags" "flags") '("EphyEmbedChrome" "chrome") @@ -3306,53 +3299,6 @@ -;; From ../../src/ephy-tab.h - -(define-function ephy_tab_get_type - (c-name "ephy_tab_get_type") - (return-type "GType") -) - -;(define-function ephy_tab_new -; (c-name "ephy_tab_new") -; (is-constructor-of "EphyTab") -; (return-type "EphyTab*") -;) - -(define-method get_embed - (of-object "EphyTab") - (c-name "ephy_tab_get_embed") - (return-type "EphyEmbed*") -) - -(define-function ephy_tab_for_embed - (c-name "ephy_tab_for_embed") - (return-type "EphyTab*") - (parameters - '("EphyEmbed*" "embed") - ) -) - -(define-method get_size - (of-object "EphyTab") - (c-name "ephy_tab_get_size") - (return-type "none") - (parameters - '("int*" "width") - '("int*" "height") - ) -) - -(define-method set_size - (of-object "EphyTab") - (c-name "ephy_tab_set_size") - (return-type "none") - (parameters - '("int" "width") - '("int" "height") - ) -) - ;; From ../../src/ephy-toolbar.h (define-function ephy_toolbar_get_type @@ -3543,7 +3489,7 @@ (c-name "ephy_window_add_tab") (return-type "none") (parameters - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") '("gint" "position") '("gboolean" "jump_to") ) @@ -3554,7 +3500,7 @@ (c-name "ephy_window_remove_tab") (return-type "none") (parameters - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") ) ) @@ -3563,7 +3509,7 @@ (c-name "ephy_window_jump_to_tab") (return-type "none") (parameters - '("EphyTab*" "tab") + '("EphyEmbed*" "tab") ) ) @@ -3594,12 +3540,6 @@ (define-method get_active_tab (of-object "EphyWindow") (c-name "ephy_window_get_active_tab") - (return-type "EphyTab*") -) - -(define-method get_active_embed - (of-object "EphyWindow") - (c-name "ephy_window_get_active_embed") (return-type "EphyEmbed*") ) diff --git a/src/epiphany.override b/src/epiphany.override index 5ceee6ad3..4f8abedd7 100644 --- a/src/epiphany.override +++ b/src/epiphany.override @@ -51,7 +51,6 @@ headers #include "ephy-shell.h" #include "ephy-state.h" #include "ephy-statusbar.h" -#include "ephy-tab.h" #include "ephy-type-builtins.h" #include "ephy-window.h" #include "ephy-link.h" @@ -188,7 +187,6 @@ ignore-glob %% ignore ephy_embed_event_get_dom_event - ephy_tab_for_embed ephy_shell_error_quark ephy_shell_startup ephy_shell_get_dbus_service @@ -228,17 +226,6 @@ _wrap_ephy_embed_shell_tp_init(PyGObject *self, PyObject *args, PyObject *kwargs return 0; } %% -override ephy_tab_get_size noargs -static PyObject * -_wrap_ephy_tab_get_size(PyGObject *self) -{ - gint width; - gint height; - - ephy_tab_get_size(EPHY_TAB(self->obj), &width, &height); - return Py_BuildValue("(ii)", width, height); -} -%% override ephy_embed_event_get_coords noargs static PyObject * _wrap_ephy_embed_event_get_coords(PyGObject *self) |