rendered paste bodyIndex: epiphany.defs===================================================================RCS file: /cvs/gnome/epiphany/src/epiphany.defs,vretrieving revision 1.20diff -u -r1.20 epiphany.defs--- epiphany.defs 10 Aug 2005 18:14:09 -0000 1.20+++ epiphany.defs 31 Aug 2005 13:23:06 -0000@@ -14,13 +14,6 @@ (gtype-id "EPHY_TYPE_BOOKMARKS") ) -(define-object BookmarksBar- (in-module "Ephy")- (parent "EggEditableToolbar")- (c-name "EphyBookmarksBar")- (gtype-id "EPHY_TYPE_BOOKMARKSBAR")-)- (define-interface CommandManager (in-module "Ephy") (c-name "EphyCommandManager")@@ -112,6 +105,13 @@ (gtype-id "EPHY_TYPE_LINK_ACTION") ) +(define-object LinkActionGroup+ (in-module "Ephy")+ (parent "GtkActionGroup")+ (c-name "EphyLinkActionGroup")+ (gtype-id "EPHY_TYPE_LINK_ACTION_GROUP")+)+ (define-object LocationAction (in-module "Ephy") (parent "EphyLinkAction")@@ -178,9 +178,6 @@ (parent "GtkStatusbar") (c-name "EphyStatusbar") (gtype-id "EPHY_TYPE_STATUSBAR")- (fields- '("GtkTooltips*" "tooltips")- ) ) (define-object Tab@@ -197,13 +194,6 @@ (gtype-id "EPHY_TYPE_TOOLBAR") ) -(define-object EggToolbarsModel- (in-module "Egg")- (parent "GObject")- (c-name "EggToolbarsModel")- (gtype-id "EGG_TYPE_TOOLBARS_MODEL")-)- (define-object Window (in-module "Ephy") (parent "GtkWindow")@@ -240,6 +230,7 @@ '("no-view" "EPHY_EMBED_PERSIST_NO_VIEW") '("ask-destination" "EPHY_EMBED_PERSIST_ASK_DESTINATION") '("do-conversion" "EPHY_EMBED_PERSIST_DO_CONVERSION")+ '("from-cache" "EPHY_EMBED_PERSIST_FROM_CACHE") ) ) @@ -285,7 +276,6 @@ '("menubar" "EPHY_EMBED_CHROME_MENUBAR") '("toolbar" "EPHY_EMBED_CHROME_TOOLBAR") '("statusbar" "EPHY_EMBED_CHROME_STATUSBAR")- '("bookmarksbar" "EPHY_EMBED_CHROME_BOOKMARKSBAR") ) ) @@ -351,6 +341,7 @@ '("text" "EGG_TB_MODEL_TEXT") '("styles-mask" "EGG_TB_MODEL_STYLES_MASK") '("accept-items-only" "EGG_TB_MODEL_ACCEPT_ITEMS_ONLY")+ '("hidden" "EGG_TB_MODEL_HIDDEN") ) ) @@ -472,7 +463,19 @@ ) -;; From ../../embed/ephy-command-manager.h+(define-enum TabAddressExpire+ (in-module "Ephy")+ (c-name "EphyTabAddressExpire")+ (gtype-id "EPHY_TYPE_TAB_ADDRESS_EXPIRE")+ (values+ '("now" "EPHY_TAB_ADDRESS_EXPIRE_NOW")+ '("next" "EPHY_TAB_ADDRESS_EXPIRE_NEXT")+ '("current" "EPHY_TAB_ADDRESS_EXPIRE_CURRENT")+ )+)+++;; From ../embed/ephy-command-manager.h (define-function ephy_command_manager_get_type (c-name "ephy_command_manager_get_type")@@ -904,7 +907,56 @@ -;; From ../../embed/ephy-embed.h+;; From ../embed/ephy-embed-type-builtins.h++(define-function ephy_embed_net_state_get_type+ (c-name "ephy_embed_net_state_get_type")+ (return-type "GType")+)++(define-function ephy_embed_chrome_get_type+ (c-name "ephy_embed_chrome_get_type")+ (return-type "GType")+)++(define-function ephy_embed_print_preview_nav_type_get_type+ (c-name "ephy_embed_print_preview_nav_type_get_type")+ (return-type "GType")+)++(define-function ephy_embed_security_level_get_type+ (c-name "ephy_embed_security_level_get_type")+ (return-type "GType")+)++(define-function ephy_embed_document_type_get_type+ (c-name "ephy_embed_document_type_get_type")+ (return-type "GType")+)++(define-function ephy_embed_event_context_get_type+ (c-name "ephy_embed_event_context_get_type")+ (return-type "GType")+)++(define-function ephy_embed_persist_flags_get_type+ (c-name "ephy_embed_persist_flags_get_type")+ (return-type "GType")+)++(define-function ephy_content_check_type_get_type+ (c-name "ephy_content_check_type_get_type")+ (return-type "GType")+)++(define-function ephy_permission_get_type+ (c-name "ephy_permission_get_type")+ (return-type "GType")+)++++;; From ../embed/ephy-embed.h (define-function ephy_embed_net_state_get_type (c-name "ephy_embed_net_state_get_type")@@ -1169,6 +1221,11 @@ ) ) +(define-method clear+ (of-object "EphyFaviconCache")+ (c-name "ephy_favicon_cache_clear")+ (return-type "none")+) ;; From ../../embed/ephy-history.h@@ -1513,16 +1570,6 @@ (return-type "GType") ) -(define-method add_toolbar- (of-object "EggToolbarsModel")- (c-name "egg_toolbars_model_add_toolbar")- (return-type "int")- (parameters- '("int" "position")- '("const-char*" "name")- )-)- (define-method get_flags (of-object "EggToolbarsModel") (c-name "egg_toolbars_model_get_flags")@@ -1552,35 +1599,6 @@ ) ) -;; (define-method get_item_type-;; (of-object "EggToolbarsModel")-;; (c-name "egg_toolbars_model_get_item_type")-;; (return-type "char*")-;; (parameters-;; '("GdkAtom" "dnd_type")-;; )-;; )--(define-method get_item_id- (of-object "EggToolbarsModel")- (c-name "egg_toolbars_model_get_item_id")- (return-type "char*")- (parameters- '("const-char*" "type")- '("const-char*" "name")- )-)--(define-method get_item_data- (of-object "EggToolbarsModel")- (c-name "egg_toolbars_model_get_item_data")- (return-type "char*")- (parameters- '("const-char*" "type")- '("const-char*" "id")- )-)- (define-method add_item (of-object "EggToolbarsModel") (c-name "egg_toolbars_model_add_item")@@ -1588,8 +1606,7 @@ (parameters '("int" "toolbar_position") '("int" "position")- '("const-char*" "id")- '("const-char*" "type")+ '("const-char*" "name") ) ) @@ -1636,13 +1653,10 @@ (define-method item_nth (of-object "EggToolbarsModel") (c-name "egg_toolbars_model_item_nth")- (return-type "none")+ (return-type "const-char*") (parameters '("int" "toolbar_position") '("int" "position")- '("gboolean*" "is_separator")- '("const-char**" "id")- '("const-char**" "type") ) ) @@ -1663,7 +1677,16 @@ -;; From ../../lib/ephy-dialog.h+;; From ../lib/egg/eggtypebuiltins.h++(define-function egg_tb_model_flags_get_type+ (c-name "egg_tb_model_flags_get_type")+ (return-type "GType")+)++++;; From ../lib/ephy-dialog.h (define-function ephy_dialog_get_type (c-name "ephy_dialog_get_type")@@ -1821,7 +1844,26 @@ -;; From ../../lib/ephy-node-db.h+;; From ../lib/ephy-lib-type-builtins.h++(define-function ephy_node_signal_type_get_type+ (c-name "ephy_node_signal_type_get_type")+ (return-type "GType")+)++(define-function ephy_state_window_flags_get_type+ (c-name "ephy_state_window_flags_get_type")+ (return-type "GType")+)++(define-function ephy_dbus_bus_get_type+ (c-name "ephy_dbus_bus_get_type")+ (return-type "GType")+)++++;; From ../lib/ephy-node-db.h (define-function ephy_node_db_get_type (c-name "ephy_node_db_get_type")@@ -2299,7 +2341,16 @@ -;; From ../../src/bookmarks/ephy-bookmarks.h+;; From ../src/bookmarks/ephy-bookmarks-type-builtins.h++(define-function ephy_bookmark_property_get_type+ (c-name "ephy_bookmark_property_get_type")+ (return-type "GType")+)++++;; From ../src/bookmarks/ephy-bookmarks.h (define-function ephy_bookmarks_get_type (c-name "ephy_bookmarks_get_type")@@ -2321,12 +2372,6 @@ ) ) -(define-method get_toolbars_model- (of-object "EphyBookmarks")- (c-name "ephy_bookmarks_get_toolbars_model")- (return-type "GObject*")-)- (define-method add (of-object "EphyBookmarks") (c-name "ephy_bookmarks_add")@@ -2498,16 +2543,6 @@ ) --;; From ../../src/bookmarks/ephy-bookmarksbar.h--(define-function ephy_bookmarksbar_get_type- (c-name "ephy_bookmarksbar_get_type")- (return-type "GType")-)--- ;; From ../../src/ephy-extension.h (define-function ephy_extension_get_type@@ -2612,7 +2647,23 @@ -;; From ../../src/ephy-link.h+(define-function ephy_link_action_group_get_type+ (c-name "ephy_link_action_group_get_type")+ (return-type "GType")+)++(define-function ephy_link_action_group_new+ (c-name "ephy_link_action_group_new")+ (is-constructor-of "EphyLinkActionGroup")+ (return-type "EphyLinkActionGroup*")+ (parameters+ '("char*" "name")+ )+)++++;; From ../src/ephy-link.h (define-function ephy_link_flags_get_type (c-name "ephy_link_flags_get_type")@@ -3206,8 +3257,46 @@ ) +;; From ../src/ephy-type-builtins.h++(define-function ephy_link_flags_get_type+ (c-name "ephy_link_flags_get_type")+ (return-type "GType")+)++(define-function ephy_shell_error_get_type+ (c-name "ephy_shell_error_get_type")+ (return-type "GType")+)++(define-function ephy_shell_startup_flags_get_type+ (c-name "ephy_shell_startup_flags_get_type")+ (return-type "GType")+)++(define-function ephy_new_tab_flags_get_type+ (c-name "ephy_new_tab_flags_get_type")+ (return-type "GType")+)++(define-function ephy_tab_navigation_flags_get_type+ (c-name "ephy_tab_navigation_flags_get_type")+ (return-type "GType")+)++(define-function ephy_tab_address_expire_get_type+ (c-name "ephy_tab_address_expire_get_type")+ (return-type "GType")+)++(define-function ephy_navigation_direction_get_type+ (c-name "ephy_navigation_direction_get_type")+ (return-type "GType")+)+ -;; From ../../src/ephy-window.h++;; From ../src/ephy-window.h (define-function ephy_window_get_type (c-name "ephy_window_get_type")@@ -3250,12 +3339,6 @@ (return-type "GtkWidget*") ) -(define-method get_bookmarksbar- (of-object "EphyWindow")- (c-name "ephy_window_get_bookmarksbar")- (return-type "GtkWidget*")-)- (define-method get_notebook (of-object "EphyWindow") (c-name "ephy_window_get_notebook")@@ -3361,126 +3444,6 @@ (of-object "EphyWindow") (c-name "ephy_window_get_context_event") (return-type "EphyEmbedEvent*")-)----;; From ../embed/ephy-embed-type-builtins.h--(define-function ephy_embed_net_state_get_type- (c-name "ephy_embed_net_state_get_type")- (return-type "GType")-)--(define-function ephy_embed_chrome_get_type- (c-name "ephy_embed_chrome_get_type")- (return-type "GType")-)--(define-function ephy_embed_print_preview_nav_type_get_type- (c-name "ephy_embed_print_preview_nav_type_get_type")- (return-type "GType")-)--(define-function ephy_embed_security_level_get_type- (c-name "ephy_embed_security_level_get_type")- (return-type "GType")-)--(define-function ephy_embed_document_type_get_type- (c-name "ephy_embed_document_type_get_type")- (return-type "GType")-)--(define-function ephy_embed_event_context_get_type- (c-name "ephy_embed_event_context_get_type")- (return-type "GType")-)--(define-function ephy_embed_persist_flags_get_type- (c-name "ephy_embed_persist_flags_get_type")- (return-type "GType")-)--(define-function ephy_content_check_type_get_type- (c-name "ephy_content_check_type_get_type")- (return-type "GType")-)--(define-function ephy_permission_get_type- (c-name "ephy_permission_get_type")- (return-type "GType")-)----;; From ../lib/egg/eggtypebuiltins.h--(define-function egg_tb_model_flags_get_type- (c-name "egg_tb_model_flags_get_type")- (return-type "GType")-)----;; From ../lib/ephy-lib-type-builtins.h--(define-function ephy_node_signal_type_get_type- (c-name "ephy_node_signal_type_get_type")- (return-type "GType")-)--(define-function ephy_state_window_flags_get_type- (c-name "ephy_state_window_flags_get_type")- (return-type "GType")-)----;; From ../src/bookmarks/ephy-bookmarks-type-builtins.h--(define-function ephy_bookmark_property_get_type- (c-name "ephy_bookmark_property_get_type")- (return-type "GType")-)----;; From ../src/ephy-type-builtins.h--(define-function ephy_link_flags_get_type- (c-name "ephy_link_flags_get_type")- (return-type "GType")-)--(define-function ephy_shell_error_get_type- (c-name "ephy_shell_error_get_type")- (return-type "GType")-)--(define-function ephy_shell_startup_flags_get_type- (c-name "ephy_shell_startup_flags_get_type")- (return-type "GType")-)--(define-function ephy_new_tab_flags_get_type- (c-name "ephy_new_tab_flags_get_type")- (return-type "GType")-)--(define-function ephy_tab_navigation_flags_get_type- (c-name "ephy_tab_navigation_flags_get_type")- (return-type "GType")-)--(define-function ephy_tab_address_expire_get_type- (c-name "ephy_tab_address_expire_get_type")- (return-type "GType")-)--(define-function ephy_navigation_direction_get_type- (c-name "ephy_navigation_direction_get_type")- (return-type "GType") ) Index: epiphany.override===================================================================RCS file: /cvs/gnome/epiphany/src/epiphany.override,vretrieving revision 1.4diff -u -r1.4 epiphany.override--- epiphany.override 31 Jul 2005 21:03:12 -0000 1.4+++ epiphany.override 31 Aug 2005 13:23:06 -0000@@ -181,6 +181,9 @@ import gtk.Window as PyGtkWindow_Type import gtk.Action as PyGtkAction_Type import gtk.UIManager as PyGtkUIManager_Type+import gtk.Menu as PyGtkMenu_Type+import gtk.ActionGroup as PyGtkActionGroup_Type+import gtk.gdk.Pixbuf as PyGdkPixbuf_Type import gobject.GObject as PyGObject_Type %% ignore-glob