Diff

public text v1 · immutable
#21711
·published 2005-08-31 13:00 UTC
Index: src/epiphany.defs===================================================================RCS file: /cvs/gnome/epiphany/src/epiphany.defs,vretrieving revision 1.20diff -u -r1.20 epiphany.defs--- src/epiphany.defs	10 Aug 2005 18:14:09 -0000	1.20+++ src/epiphany.defs	31 Aug 2005 12:58:57 -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")@@ -616,9 +619,7 @@   ) ) ---;; From ../../embed/ephy-embed-factory.h+;; From ../embed/ephy-embed-factory.h  (define-function ephy_embed_factory_new_object   (c-name "ephy_embed_factory_new_object")@@ -904,7 +905,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")@@ -1160,6 +1210,12 @@   (return-type "GType") ) +(define-function ephy_favicon_cache_new+  (c-name "ephy_favicon_cache_new")+  (is-constructor-of "EphyFaviconCache")+  (return-type "EphyFaviconCache*")+)+ (define-method get   (of-object "EphyFaviconCache")   (c-name "ephy_favicon_cache_get")@@ -1169,6 +1225,11 @@   ) ) +(define-method clear+  (of-object "EphyFaviconCache")+  (c-name "ephy_favicon_cache_clear")+  (return-type "none")+)   ;; From ../../embed/ephy-history.h@@ -1446,6 +1507,30 @@   (return-type "GType") ) +(define-function egg_editable_toolbar_new+  (c-name "egg_editable_toolbar_new")+  (is-constructor-of "EggEditableToolbar")+  (return-type "GtkWidget*")+  (parameters+    '("GtkUIManager*" "manager")+  )+)++(define-method set_model+  (of-object "EggEditableToolbar")+  (c-name "egg_editable_toolbar_set_model")+  (return-type "none")+  (parameters+    '("EggToolbarsModel*" "model")+  )+)++(define-method get_model+  (of-object "EggEditableToolbar")+  (c-name "egg_editable_toolbar_get_model")+  (return-type "EggToolbarsModel*")+)+ (define-method set_edit_mode   (of-object "EggEditableToolbar")   (c-name "egg_editable_toolbar_set_edit_mode")@@ -1499,8 +1584,6 @@   ) ) -- ;; From ../../lib/egg/egg-toolbars-model.h  (define-function egg_toolbars_model_flags_get_type@@ -1513,83 +1596,118 @@   (return-type "GType") ) -(define-method add_toolbar+(define-function egg_toolbars_model_new+  (c-name "egg_toolbars_model_new")+  (is-constructor-of "EggToolbarsModel")+  (return-type "EggToolbarsModel*")+)++(define-method load   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_add_toolbar")-  (return-type "int")+  (c-name "egg_toolbars_model_load")+  (return-type "gboolean")   (parameters-    '("int" "position")-    '("const-char*" "name")+    '("const-char*" "xml_file")   ) ) -(define-method get_flags+(define-method save   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_get_flags")-  (return-type "EggTbModelFlags")+  (c-name "egg_toolbars_model_save")+  (return-type "none")   (parameters-    '("int" "toolbar_position")+    '("const-char*" "xml_file")+    '("const-char*" "version")   ) ) -(define-method set_flags+(define-method get_types   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_set_flags")+  (c-name "egg_toolbars_model_get_types")+  (return-type "GList*")+)++(define-method set_types+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_set_types")   (return-type "none")   (parameters-    '("int" "toolbar_position")-    '("EggTbModelFlags" "flags")+    '("GList*" "types")   ) ) -(define-method add_separator+(define-method get_name   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_add_separator")-  (return-type "none")+  (c-name "egg_toolbars_model_get_name")+  (return-type "char*")   (parameters-    '("int" "toolbar_position")-    '("int" "position")+    '("GdkAtom" "type")+    '("const-char*" "data")+    '("gboolean" "create")   ) ) -;; (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+(define-method get_data   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_get_item_id")+  (c-name "egg_toolbars_model_get_data")   (return-type "char*")   (parameters-    '("const-char*" "type")+    '("GdkAtom" "type")     '("const-char*" "name")   ) ) -(define-method get_item_data+(define-method get_avail   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_get_item_data")-  (return-type "char*")+  (c-name "egg_toolbars_model_get_avail")+  (return-type "GPtrArray*")+)++(define-method get_n_avail+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_get_n_avail")+  (return-type "gint")   (parameters-    '("const-char*" "type")-    '("const-char*" "id")+    '("const-char*" "name")   ) ) -(define-method add_item+(define-method set_n_avail   (of-object "EggToolbarsModel")-  (c-name "egg_toolbars_model_add_item")-  (return-type "gboolean")+  (c-name "egg_toolbars_model_set_n_avail")+  (return-type "none")+  (parameters+    '("const-char*" "name")+    '("gint" "count")+  )+)++(define-method get_flags+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_get_flags")+  (return-type "EggTbModelFlags")   (parameters     '("int" "toolbar_position")+  )+)++(define-method set_flags+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_set_flags")+  (return-type "none")+  (parameters+    '("int" "toolbar_position")+    '("EggTbModelFlags" "flags")+  )+)++(define-method add_toolbar+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_add_toolbar")+  (return-type "int")+  (parameters     '("int" "position")-    '("const-char*" "id")-    '("const-char*" "type")+    '("const-char*" "name")   ) ) @@ -1602,6 +1720,17 @@   ) ) +(define-method add_item+  (of-object "EggToolbarsModel")+  (c-name "egg_toolbars_model_add_item")+  (return-type "gboolean")+  (parameters+    '("int" "toolbar_position")+    '("int" "position")+    '("const-char*" "name")+  )+)+ (define-method remove_item   (of-object "EggToolbarsModel")   (c-name "egg_toolbars_model_remove_item")@@ -1636,13 +1765,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 +1789,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 +1956,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 +2453,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 +2484,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")@@ -2497,18 +2654,44 @@   (return-type "EphyNode*") ) +(define-function ephy_bookmarks_compare_topics+  (c-name "ephy_bookmarks_compare_topics")+  (return-type "int")+  (parameters+    '("gconstpointer" "a")+    '("gconstpointer" "b")+  )+) +(define-function ephy_bookmarks_compare_topic_pointers+  (c-name "ephy_bookmarks_compare_topic_pointers")+  (return-type "int")+  (parameters+    '("gconstpointer" "a")+    '("gconstpointer" "b")+  )+) -;; From ../../src/bookmarks/ephy-bookmarksbar.h--(define-function ephy_bookmarksbar_get_type-  (c-name "ephy_bookmarksbar_get_type")-  (return-type "GType")+(define-function ephy_bookmarks_compare_bookmarks+  (c-name "ephy_bookmarks_compare_bookmarks")+  (return-type "int")+  (parameters+    '("gconstpointer" "a")+    '("gconstpointer" "b")+  ) ) +(define-function ephy_bookmarks_compare_bookmark_pointers+  (c-name "ephy_bookmarks_compare_bookmark_pointers")+  (return-type "int")+  (parameters+    '("gconstpointer" "a")+    '("gconstpointer" "b")+  )+)  -;; From ../../src/ephy-extension.h+;; From ../src/ephy-extension.h  (define-function ephy_extension_get_type   (c-name "ephy_extension_get_type")@@ -2612,7 +2795,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")@@ -3175,6 +3374,24 @@   (return-type "GType") ) +(define-function ephy_toolbar_new+  (c-name "ephy_toolbar_new")+  (is-constructor-of "EphyToolbar")+  (return-type "EphyToolbar*")+  (parameters+    '("EphyWindow*" "window")+  )+)++(define-method set_favicon+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_favicon")+  (return-type "none")+  (parameters+    '("GdkPixbuf*" "icon")+  )+)+ (define-method set_show_leave_fullscreen   (of-object "EphyToolbar")   (c-name "ephy_toolbar_set_show_leave_fullscreen")@@ -3196,6 +3413,38 @@   (return-type "const-char*") ) +(define-method set_location+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_location")+  (return-type "none")+  (parameters+    '("const-char*" "address")+    '("const-char*" "typed_address")+  )+)++(define-method set_navigation_actions+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_navigation_actions")+  (return-type "none")+  (parameters+    '("gboolean" "back")+    '("gboolean" "forward")+    '("gboolean" "up")+  )+)++(define-method set_security_state+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_security_state")+  (return-type "none")+  (parameters+    '("gboolean" "show_lock")+    '("const-char*" "stock_id")+    '("const-char*" "tooltip")+  )+)+ (define-method set_lock_visibility   (of-object "EphyToolbar")   (c-name "ephy_toolbar_set_lock_visibility")@@ -3205,9 +3454,66 @@   ) ) +(define-method set_spinning+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_spinning")+  (return-type "none")+  (parameters+    '("gboolean" "spinning")+  )+)++(define-method set_zoom+  (of-object "EphyToolbar")+  (c-name "ephy_toolbar_set_zoom")+  (return-type "none")+  (parameters+    '("gboolean" "can_zoom")+    '("float" "zoom")+  )+)+ +;; 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")+) -;; From ../../src/ephy-window.h+(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  (define-function ephy_window_get_type   (c-name "ephy_window_get_type")@@ -3250,12 +3556,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")@@ -3362,162 +3662,3 @@   (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")-)---;; Boxed types ...--(define-boxed Cookie-  (in-module "Ephy")-  (c-name "EphyCookie")-  (gtype-id "EPHY_TYPE_COOKIE")-  (fields-    '("char*" "name")-    '("char*" "value")-    '("char*" "domain")-    '("char*" "path")-    '("gulong" "expires")-    '("glong" "real_expires")-    '("guint" "is_secure")-    '("guint" "is_session")-  )-)--(define-boxed PasswordInfo-  (in-module "Ephy")-  (c-name "EphyPasswordInfo")-  (gtype-id  "EPHY_TYPE_PASSWORD_INFO")-  (copy_func "ephy_password_info_copy")-  (release-func "ephy_password_info_free")-  (fields-    '("char*" "host")-    '("char*" "username")-    '("char*" "password")-  )-)--(define-boxed Node-  (in-module "Ephy")-  (c-name "EphyNode")-  (gtype-id "EPHY_TYPE_NODE")-)-Index: src/epiphany.override===================================================================RCS file: /cvs/gnome/epiphany/src/epiphany.override,vretrieving revision 1.4diff -u -r1.4 epiphany.override--- src/epiphany.override	31 Jul 2005 21:03:12 -0000	1.4+++ src/epiphany.override	31 Aug 2005 12:58:57 -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