From 23fa2e15713edb80aadf60df21dda1795dfab74d Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sat, 6 Jun 2009 00:04:24 +0300 Subject: Get rid of EphyEmbedFactory. It's useless now, since there's only one backend. --- src/ephy-shell.c | 3 +-- src/ephy-window.c | 3 +-- src/popup-commands.c | 7 +++---- src/window-commands.c | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 614d88d7f..fe603f44b 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -56,7 +56,6 @@ #include "ephy-prefs.h" #include "ephy-gui.h" #include "ephy-stock-icons.h" -#include "ephy-embed-factory.h" #include "ephy-web-view.h" #ifdef ENABLE_NETWORK_MANAGER @@ -483,7 +482,7 @@ ephy_shell_new_tab_full (EphyShell *shell, } if (active_is_blank == FALSE) { - embed = EPHY_EMBED (ephy_embed_factory_new_object (EPHY_TYPE_EMBED)); + embed = EPHY_EMBED (g_object_new (EPHY_TYPE_EMBED, NULL)); g_assert (embed != NULL); gtk_widget_show (GTK_WIDGET (embed)); diff --git a/src/ephy-window.c b/src/ephy-window.c index 562c3f3a8..2916b9efd 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -55,7 +55,6 @@ #include "ephy-action-helper.h" #include "ephy-find-toolbar.h" #include "ephy-embed-persist.h" -#include "ephy-embed-factory.h" #include "ephy-location-entry.h" #include "ephy-web-view.h" @@ -2292,7 +2291,7 @@ save_property_url (EphyEmbed *embed, if (!ephy_embed_utils_address_has_web_scheme (location)) return FALSE; persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_flags (persist, 0); diff --git a/src/popup-commands.c b/src/popup-commands.c index 00db15425..282020818 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -23,7 +23,6 @@ #include "popup-commands.h" #include "ephy-shell.h" #include "ephy-embed-container.h" -#include "ephy-embed-factory.h" #include "ephy-embed-persist.h" #include "ephy-embed-utils.h" #include "ephy-prefs.h" @@ -215,7 +214,7 @@ save_property_url (GtkAction *action, location = g_value_get_string (value); persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); ephy_embed_persist_set_fc_title (persist, title); ephy_embed_persist_set_fc_parent (persist, GTK_WINDOW (window)); @@ -326,7 +325,7 @@ popup_cmd_set_image_as_background (GtkAction *action, location = g_value_get_string (value); persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); base = g_path_get_basename (location); base_converted = g_filename_from_utf8 (base, -1, NULL, NULL, NULL); @@ -448,7 +447,7 @@ save_temp_source (const char *address) } persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); ephy_embed_persist_set_source (persist, address); ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_FROM_CACHE | diff --git a/src/window-commands.c b/src/window-commands.c index 66bf63b55..eb39dc618 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -25,7 +25,6 @@ #include "ephy-embed-single.h" #include "ephy-embed-utils.h" #include "ephy-shell.h" -#include "ephy-embed-factory.h" #include "ephy-embed-persist.h" #include "ephy-debug.h" #include "ephy-command-manager.h" @@ -305,7 +304,7 @@ window_cmd_file_save_as (GtkAction *action, g_return_if_fail (embed != NULL); persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_fc_title (persist, _("Save As")); @@ -636,7 +635,7 @@ save_temp_source (EphyEmbed *embed, } persist = EPHY_EMBED_PERSIST - (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST)); + (g_object_new (EPHY_TYPE_EMBED_PERSIST, NULL)); ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_COPY_PAGE | -- cgit v1.2.3