epiphany r8825 - in trunk: embed embed/webkit src

[xan svn gnome org]

Author: xan
Date: Sat Feb 28 10:17:46 2009
New Revision: 8825
URL: http://svn.gnome.org/viewvc/epiphany?rev=8825&view=rev

Log:
Remove get_backend function, there's only one possibility now.

Modified:
   trunk/embed/ephy-embed-single.c
   trunk/embed/ephy-embed-single.h
   trunk/embed/webkit/webkit-embed-single.c
   trunk/src/epiphany.defs
   trunk/src/window-commands.c

Modified: trunk/embed/ephy-embed-single.c
==============================================================================
--- trunk/embed/ephy-embed-single.c	(original)
+++ trunk/embed/ephy-embed-single.c	Sat Feb 28 10:17:46 2009
@@ -288,20 +288,3 @@
 	EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
 	return iface->open_window (single, parent, address, name, features);
 }
-
-/**
- * ephy_embed_single_get_backend_name
- * @single: the #EphyEmbedSingle
- *
- * Can be used to find the particular backend that is being used
- * for rendering pages.
- * 
- * Returns: the name of the backend. Valid returns are "gecko-1.7", 
- * "gecko-1.8", "gecko-1.9" and "WebKit"
- */
-const char *
-ephy_embed_single_get_backend_name (EphyEmbedSingle *single)
-{
-	EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single);
-	return iface->get_backend_name (single);
-}

Modified: trunk/embed/ephy-embed-single.h
==============================================================================
--- trunk/embed/ephy-embed-single.h	(original)
+++ trunk/embed/ephy-embed-single.h	Sat Feb 28 10:17:46 2009
@@ -101,8 +101,6 @@
 GList		*ephy_embed_single_get_font_list	(EphyEmbedSingle *single,
 							 const char *lang_group);
 
-const char	*ephy_embed_single_get_backend_name	(EphyEmbedSingle *single);
-
 G_END_DECLS
 
 #endif

Modified: trunk/embed/webkit/webkit-embed-single.c
==============================================================================
--- trunk/embed/webkit/webkit-embed-single.c	(original)
+++ trunk/embed/webkit/webkit-embed-single.c	Sat Feb 28 10:17:46 2009
@@ -128,14 +128,6 @@
   return WEBKIT_EMBED_SINGLE (esingle)->priv->online;
 }
 
-static const char *
-impl_get_backend_name (EphyEmbedSingle *esingle)
-{
-  /* If you alter the return values here, remember to update
-   * the docs in ephy-embed-single.c */
-  return "WebKit";
-}
-
 static GList *
 impl_get_font_list (EphyEmbedSingle *shell,
                     const char *langGroup)
@@ -325,7 +317,6 @@
   iface->get_network_status = impl_get_network_status;
   iface->get_font_list = impl_get_font_list;
   iface->open_window = impl_open_window;
-  iface->get_backend_name = impl_get_backend_name;
 }
 
 static void

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Sat Feb 28 10:17:46 2009
@@ -860,12 +860,6 @@
   )
 )
 
-(define-method get_backend_name
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_get_backend_name")
-  (return-type "const-char*")
-)
-
 ;; From ../embed/ephy-embed-type-builtins.h
 
 (define-function ephy_embed_net_state_get_type

Modified: trunk/src/window-commands.c
==============================================================================
--- trunk/src/window-commands.c	(original)
+++ trunk/src/window-commands.c	Sat Feb 28 10:17:46 2009
@@ -784,8 +784,6 @@
 		   "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA")
 	};
 
-	EphyEmbedShell *shell;
-	EphyEmbedSingle *single;
 	char *licence, *comments;
 	GKeyFile *key_file;
 	GError *error = NULL;
@@ -863,11 +861,8 @@
 
 	g_key_file_free (key_file);
 
-	shell = ephy_embed_shell_get_default ();
-	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (shell));
-
 	comments = g_strdup_printf (_("Lets you view web pages and find information on the internet.\n"
-				      "Powered by %s"), ephy_embed_single_get_backend_name (single) );
+				      "Powered by WebKit"));
 
 	licence = g_strjoin ("\n\n",
 			     _(licence_part[0]),