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

[xan svn gnome org]

Author: xan
Date: Sun Jun 29 18:16:16 2008
New Revision: 8309
URL: http://svn.gnome.org/viewvc/epiphany?rev=8309&view=rev

Log:
embed: remove ephy_embed_print.

And use the WebKit API directly.


Modified:
   trunk/doc/reference/epiphany-sections.txt
   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/epiphany.defs
   trunk/src/window-commands.c

Modified: trunk/doc/reference/epiphany-sections.txt
==============================================================================
--- trunk/doc/reference/epiphany-sections.txt	(original)
+++ trunk/doc/reference/epiphany-sections.txt	Sun Jun 29 18:16:16 2008
@@ -82,7 +82,6 @@
 ephy_embed_find_next
 ephy_embed_set_encoding
 ephy_embed_get_encoding_info
-ephy_embed_print
 ephy_embed_print_preview_close
 ephy_embed_print_preview_n_pages
 ephy_embed_print_preview_navigate

Modified: trunk/doc/reference/tmpl/ephy-embed.sgml
==============================================================================
--- trunk/doc/reference/tmpl/ephy-embed.sgml	(original)
+++ trunk/doc/reference/tmpl/ephy-embed.sgml	Sun Jun 29 18:16:16 2008
@@ -309,7 +309,6 @@
 @get_encoding: 
 @has_automatic_encoding: 
 @set_encoding: 
- print: 
 @set_print_preview_mode: 
 @print_preview_n_pages: 
 @print_preview_navigate: 
@@ -468,14 +467,6 @@
 @encoding: 
 
 
-<!-- ##### FUNCTION ephy_embed_print ##### -->
-<para>
-
-</para>
-
- embed: 
-
-
 <!-- ##### FUNCTION ephy_embed_print_preview_n_pages ##### -->
 <para>
 

Modified: trunk/embed/ephy-embed.c
==============================================================================
--- trunk/embed/ephy-embed.c	(original)
+++ trunk/embed/ephy-embed.c	Sun Jun 29 18:16:16 2008
@@ -724,20 +724,6 @@
 }
 
 /**
- * ephy_embed_print:
- * @embed: an #EphyEmbed
- *
- * Sends a document to the printer.
- *
- **/
-void
-ephy_embed_print (EphyEmbed *embed)
-{
-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->print (embed);
-}
-
-/**
  * ephy_embed_set_print_preview_mode:
  * @embed: an #EphyEmbed
  * @preview_mode: Whether the print preview mode is enabled.

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Sun Jun 29 18:16:16 2008
@@ -201,7 +201,6 @@
 	gboolean	   (* has_automatic_encoding)	  (EphyEmbed *embed);
 	void		   (* set_encoding)		  (EphyEmbed *embed,
 							   const char *encoding);
-	void		   (* print)			  (EphyEmbed *embed);
 	void		   (* set_print_preview_mode)	  (EphyEmbed *embed,
 							   gboolean mode);
 	int		   (* print_preview_n_pages)	  (EphyEmbed *embed);
@@ -340,8 +339,6 @@
 							 const char *encoding);
 
 /* Print */
-void		  ephy_embed_print			(EphyEmbed *embed);
-
 void		  ephy_embed_set_print_preview_mode	(EphyEmbed *embed,
 							 gboolean preview_mode);
 

Modified: trunk/embed/webkit/webkit-embed.c
==============================================================================
--- trunk/embed/webkit/webkit-embed.c	(original)
+++ trunk/embed/webkit/webkit-embed.c	Sun Jun 29 18:16:16 2008
@@ -465,12 +465,6 @@
 }
 
 static void
-impl_print (EphyEmbed *embed)
-{
-  webkit_web_view_execute_script (WEBKIT_EMBED (embed)->priv->web_view, "print();");
-}
-
-static void
 impl_set_print_preview_mode (EphyEmbed *embed, gboolean preview_mode)
 {
 }
@@ -570,7 +564,6 @@
   iface->set_encoding = impl_set_encoding;
   iface->get_encoding = impl_get_encoding;
   iface->has_automatic_encoding = impl_has_automatic_encoding;
-  iface->print = impl_print;
   iface->set_print_preview_mode = impl_set_print_preview_mode;
   iface->print_preview_n_pages = impl_print_preview_n_pages;
   iface->print_preview_navigate = impl_print_preview_navigate;

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Sun Jun 29 18:16:16 2008
@@ -1198,12 +1198,6 @@
   )
 )
 
-(define-method print
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_print")
-  (return-type "none")
-)
-
 (define-method set_print_preview_mode
   (of-object "EphyEmbed")
   (c-name "ephy_embed_set_print_preview_mode")

Modified: trunk/src/window-commands.c
==============================================================================
--- trunk/src/window-commands.c	(original)
+++ trunk/src/window-commands.c	Sun Jun 29 18:16:16 2008
@@ -109,7 +109,7 @@
           (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
-	ephy_embed_print (embed);
+	webkit_web_view_execute_script (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), "print();");
 }
 
 void