aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-08 04:31:32 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-08 04:31:32 +0800
commit250865f24a1a5fbcacf892cf014c6b0b85428ea2 (patch)
treebd01642b8b090b08fa532e2d45d68271e531ed40 /src
parentb04fefa6c0e46938090bd56cf9918748e1e48000 (diff)
downloadgsoc2013-epiphany-250865f24a1a5fbcacf892cf014c6b0b85428ea2.tar.gz
gsoc2013-epiphany-250865f24a1a5fbcacf892cf014c6b0b85428ea2.tar.zst
gsoc2013-epiphany-250865f24a1a5fbcacf892cf014c6b0b85428ea2.zip
Add switch to disable focus fix, and to disable PSM. Error out if PSM
2005-08-07 Christian Persch <chpe@cvs.gnome.org> * configure.ac: Add switch to disable focus fix, and to disable PSM. Error out if PSM isn't found but --disable-psm not given. Should prevent accidental compilation without PSM. * lib/widgets/ephy-icon-entry.c: (ephy_icon_entry_get_entry): * lib/widgets/ephy-icon-entry.h: Add ephy_icon_entry_get_entry. * src/epiphany.defs: Updated python bindings.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-window.c2
-rw-r--r--src/epiphany.defs41
2 files changed, 33 insertions, 10 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 42808fa86..538d6eddc 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1611,7 +1611,7 @@ embed_popup_deactivate_cb (GtkWidget *popup,
/* Unref the event from idle since we still need it
* from the action callbacks which will run before idle.
*/
- if (priv->idle_worker == 0)
+ if (priv->idle_worker == 0 && priv->context_event != NULL)
{
priv->idle_worker =
g_idle_add ((GSourceFunc) idle_unref_context_event, window);
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 4f5820334..5925d1075 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -804,6 +804,11 @@
(return-type "GType")
)
+(define-function ephy_embed_shell_get_default
+ (c-name "ephy_embed_shell_get_default")
+ (return-type "EphyEmbedShell*")
+)
+
(define-method get_favicon_cache
(of-object "EphyEmbedShell")
(c-name "ephy_embed_shell_get_favicon_cache")
@@ -2950,6 +2955,18 @@
(return-type "GtkWidget*")
)
+(define-method get_tooltips
+ (of-object "EphyStatusbar")
+ (c-name "ephy_statusbar_get_tooltips")
+ (return-type "GtkTooltips*")
+)
+
+(define-method get_security_frame
+ (of-object "EphyStatusbar")
+ (c-name "ephy_statusbar_get_security_frame")
+ (return-type "GtkWidget*")
+)
+
(define-method set_security_state
(of-object "EphyStatusbar")
(c-name "ephy_statusbar_set_security_state")
@@ -3032,6 +3049,12 @@
(return-type "EphyEmbedDocumentType")
)
+(define-method get_icon
+ (of-object "EphyTab")
+ (c-name "ephy_tab_get_icon")
+ (return-type "GdkPixbuf*")
+)
+
(define-method get_icon_address
(of-object "EphyTab")
(c-name "ephy_tab_get_icon_address")
@@ -3056,15 +3079,6 @@
(return-type "int")
)
-(define-method set_typed_address
- (of-object "EphyTab")
- (c-name "ephy_tab_set_typed_address")
- (return-type "none")
- (parameters
- '("const-char*" "address")
- )
-)
-
(define-method get_address
(of-object "EphyTab")
(c-name "ephy_tab_get_address")
@@ -3077,6 +3091,15 @@
(return-type "const-char*")
)
+(define-method set_typed_address
+ (of-object "EphyTab")
+ (c-name "ephy_tab_set_typed_address")
+ (return-type "none")
+ (parameters
+ '("const-char*" "address")
+ )
+)
+
(define-method get_navigation_flags
(of-object "EphyTab")
(c-name "ephy_tab_get_navigation_flags")