aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/epiphany.defs14
-rw-r--r--src/epiphany.override24
3 files changed, 41 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8284050ea..ba589bc82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2005-07-31 Christian Persch <chpe@cvs.gnome.org>
* src/epiphany.defs:
+ * src/epiphany.override:
+
+ Fix crash on "window.get_toolbar()". Fixes bug #170105.
+
+2005-07-31 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/epiphany.defs:
Update python bindings.
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 9067e19e4..3f79e24c5 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -1,5 +1,12 @@
;; -*- scheme -*-
; object definitions ...
+(define-object EditableToolbar
+ (in-module "Egg")
+ (parent "GtkVBox")
+ (c-name "EggEditableToolbar")
+ (gtype-id "EGG_TYPE_EDITABLE_TOOLBAR")
+)
+
(define-object Bookmarks
(in-module "Ephy")
(parent "GObject")
@@ -176,6 +183,13 @@
(gtype-id "EPHY_TYPE_TAB")
)
+(define-object Toolbar
+ (in-module "Ephy")
+ (parent "EggEditableToolbar")
+ (c-name "EphyToolbar")
+ (gtype-id "EPHY_TYPE_TOOLBAR")
+)
+
(define-object Window
(in-module "Ephy")
(parent "GtkWindow")
diff --git a/src/epiphany.override b/src/epiphany.override
index 7a0224d0e..f6b8d15b7 100644
--- a/src/epiphany.override
+++ b/src/epiphany.override
@@ -40,7 +40,6 @@ headers
#include "ephy-extensions-manager.h"
#include "ephy-history.h"
#include "ephy-lib-type-builtins.h"
-#include "ephy-loader.h"
#include "ephy-node-db.h"
#include "ephy-node.h"
#include "ephy-notebook.h"
@@ -54,6 +53,18 @@ headers
#include "ephy-type-builtins.h"
#include "ephy-window.h"
#include "ephy-link.h"
+#include "ephy-link-action.h"
+#include "egg-toolbars-model.h"
+#include "egg-editable-toolbar.h"
+#include "ephy-toolbars-model.h"
+#include "ephy-toolbar.h"
+#include "ephy-bookmarksbar-model.h"
+#include "ephy-bookmarksbar.h"
+#include "ephy-search-entry.h"
+#include "ephy-spinner.h"
+#include "ephy-location-action.h"
+#include "ephy-favicon-cache.h"
+#include "eggtypebuiltins.h"
void pyepiphany_register_classes (PyObject *d);
void pyepiphany_add_constants (PyObject *module, const gchar *strip_prefix);
@@ -156,12 +167,17 @@ _helper_wrap_boxed_gptrarray (GType type, GPtrArray *list, gboolean own_ref, gbo
%%
modulename epiphany
%%
-import gtk.Bin as PyGtkBin_Type
-import gtk.Window as PyGtkWindow_Type
-import gtk.UIManager as PyGtkUIManager_Type
import gtk.Widget as PyGtkWidget_Type
+import gtk.Bin as PyGtkBin_Type
+import gtk.VBox as PyGtkVBox_Type
import gtk.Statusbar as PyGtkStatusbar_Type
import gtk.Notebook as PyGtkNotebook_Type
+import gtk.Toolbar as PyGtkToolbar_Type
+import gtk.Entry as PyGtkEntry_Type
+import gtk.EventBox as PyGtkEventBox_Type
+import gtk.Window as PyGtkWindow_Type
+import gtk.Action as PyGtkAction_Type
+import gtk.UIManager as PyGtkUIManager_Type
import gobject.GObject as PyGObject_Type
%%
ignore-glob