epiphany r8332 - in trunk: doc/reference/tmpl embed embed/webkit src

[xan svn gnome org]

Author: xan
Date: Wed Jul  2 19:25:25 2008
New Revision: 8332
URL: http://svn.gnome.org/viewvc/epiphany?rev=8332&view=rev

Log:
embed: remove ephy_embed_close.

Just destroy the embed widget.


Modified:
   trunk/doc/reference/tmpl/ephy-embed.sgml
   trunk/embed/ephy-embed.c
   trunk/embed/ephy-embed.h
   trunk/embed/webkit/webkit-embed.c
   trunk/src/ephy-window.c
   trunk/src/epiphany.defs

Modified: trunk/doc/reference/tmpl/ephy-embed.sgml
==============================================================================
--- trunk/doc/reference/tmpl/ephy-embed.sgml	(original)
+++ trunk/doc/reference/tmpl/ephy-embed.sgml	Wed Jul  2 19:25:25 2008
@@ -302,7 +302,6 @@
 @print_preview_n_pages: 
 @print_preview_navigate: 
 @has_modified_forms: 
- close: 
 @get_document_type: 
 @get_load_percent: 
 @get_load_status: 

Modified: trunk/embed/ephy-embed.c
==============================================================================
--- trunk/embed/ephy-embed.c	(original)
+++ trunk/embed/ephy-embed.c	Wed Jul  2 19:25:25 2008
@@ -610,19 +610,6 @@
 }
 
 /**
- * ephy_embed_close:
- * @embed: an #EphyEmbed
- *
- * Closes the @embed
- **/
-void
-ephy_embed_close (EphyEmbed *embed)
-{
-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->close (embed);
-}
-
-/**
  * ephy_embed_set_encoding:
  * @embed: an #EphyEmbed
  * @encoding: the desired encoding

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Wed Jul  2 19:25:25 2008
@@ -202,7 +202,6 @@
 							   EphyEmbedPrintPreviewNavType type,
 							   int page);
 	gboolean	   (* has_modified_forms)	  (EphyEmbed *embed);
-	void		   (* close)			  (EphyEmbed *embed);
 	EphyEmbedDocumentType	(* get_document_type)	  (EphyEmbed *embed);
 	int		   (* get_load_percent)		  (EphyEmbed *embed);
 	gboolean	   (* get_load_status)		  (EphyEmbed *embed);
@@ -331,8 +330,6 @@
 							 int page);
 
 /* Misc. utility */
-void		  ephy_embed_close			(EphyEmbed *embed);
-
 gboolean	  ephy_embed_has_modified_forms		(EphyEmbed *embed);
 
 G_END_DECLS

Modified: trunk/embed/webkit/webkit-embed.c
==============================================================================
--- trunk/embed/webkit/webkit-embed.c	(original)
+++ trunk/embed/webkit/webkit-embed.c	Wed Jul  2 19:25:25 2008
@@ -108,12 +108,6 @@
                                                 ephy_command_manager_iface_init))
 
 static void
-impl_close (EphyEmbed *embed)
-{
-  gtk_widget_destroy (GTK_WIDGET (embed));
-}
-
-static void
 webkit_embed_title_changed_cb (WebKitWebView *web_view,
                                WebKitWebFrame *web_frame,
                                const gchar *title,
@@ -523,7 +517,6 @@
   iface->scroll_pixels = impl_scroll_pixels;
   iface->shistory_copy = impl_shistory_copy;
   iface->show_page_certificate = impl_show_page_certificate;
-  iface->close = impl_close;
   iface->set_encoding = impl_set_encoding;
   iface->get_encoding = impl_get_encoding;
   iface->has_automatic_encoding = impl_has_automatic_encoding;

Modified: trunk/src/ephy-window.c
==============================================================================
--- trunk/src/ephy-window.c	(original)
+++ trunk/src/ephy-window.c	Wed Jul  2 19:25:25 2008
@@ -2830,7 +2830,7 @@
 	if (!ephy_embed_has_modified_forms (embed) ||
 	    confirm_close_with_modified_forms (window))
 	{
-		ephy_embed_close (embed);
+		gtk_widget_destroy (GTK_WIDGET (embed));
 	}
 }
 

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Wed Jul  2 19:25:25 2008
@@ -1208,12 +1208,6 @@
   )
 )
 
-(define-method close
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_close")
-  (return-type "none")
-)
-
 (define-method has_modified_forms
   (of-object "EphyEmbed")
   (c-name "ephy_embed_has_modified_forms")