aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-dialog.c8
-rw-r--r--embed/ephy-embed-shell.c33
-rw-r--r--embed/ephy-embed-shell.h14
-rwxr-xr-xembed/print-dialog.c2
4 files changed, 2 insertions, 55 deletions
diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c
index 186310b13..552ec0106 100644
--- a/embed/ephy-embed-dialog.c
+++ b/embed/ephy-embed-dialog.c
@@ -17,7 +17,6 @@
*/
#include "ephy-embed-dialog.h"
-#include "ephy-embed-shell.h"
static void
ephy_embed_dialog_class_init (EphyEmbedDialogClass *klass);
@@ -199,12 +198,5 @@ ephy_embed_dialog_set_embed (EphyEmbedDialog *dialog,
EphyEmbed *
ephy_embed_dialog_get_embed (EphyEmbedDialog *dialog)
{
- if (dialog->priv->embed == NULL)
- {
- EphyEmbed *embed;
- embed = ephy_embed_shell_get_active_embed (embed_shell);
- ephy_embed_dialog_set_embed (dialog, embed);
- }
-
return dialog->priv->embed;
}
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index fe4dedebe..e23bc79bc 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -30,7 +30,6 @@ struct EphyEmbedShellPrivate
{
EphyHistory *global_history;
DownloaderView *downloader_view;
- GList *embeds;
EphyFaviconCache *favicon_cache;
EphyEmbedSingle *embed_single;
};
@@ -101,8 +100,6 @@ ephy_embed_shell_init (EphyEmbedShell *ges)
ges->priv->global_history = NULL;
ges->priv->downloader_view = NULL;
- ges->priv->embeds = NULL;
-
ges->priv->favicon_cache = NULL;
}
@@ -182,36 +179,6 @@ ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ees)
return ees->priv->favicon_cache;
}
-void
-ephy_embed_shell_add_embed (EphyEmbedShell *ges,
- EphyEmbed *embed)
-{
- ges->priv->embeds = g_list_append (ges->priv->embeds, embed);
-}
-
-void
-ephy_embed_shell_remove_embed (EphyEmbedShell *ges,
- EphyEmbed *embed)
-{
- ges->priv->embeds = g_list_remove (ges->priv->embeds, embed);
-}
-
-EphyEmbed *
-ephy_embed_shell_get_active_embed (EphyEmbedShell *ges)
-{
- GList *list = ges->priv->embeds;
-
- g_return_val_if_fail (ges->priv->embeds != NULL, NULL);
-
- return EPHY_EMBED (list->data);
-}
-
-GList *
-ephy_embed_shell_get_embeds (EphyEmbedShell *ges)
-{
- return ges->priv->embeds;
-}
-
EphyHistory *
ephy_embed_shell_get_global_history (EphyEmbedShell *shell)
{
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 95bc2a160..a5e6bd16b 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -55,10 +55,6 @@ struct EphyEmbedShellClass
{
GObjectClass parent_class;
- void (* command) (EphyEmbedShell *shell,
- char *command,
- char *param);
-
/* Methods */
EphyHistory * (* get_global_history) (EphyEmbedShell *shell);
DownloaderView * (* get_downloader_view) (EphyEmbedShell *shell);
@@ -72,16 +68,6 @@ EphyEmbedShell *ephy_embed_shell_new (const char *type);
EphyFaviconCache *ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ges);
-void ephy_embed_shell_add_embed (EphyEmbedShell *ges,
- EphyEmbed *embed);
-
-void ephy_embed_shell_remove_embed (EphyEmbedShell *ges,
- EphyEmbed *embed);
-
-EphyEmbed *ephy_embed_shell_get_active_embed (EphyEmbedShell *ges);
-
-GList *ephy_embed_shell_get_embeds (EphyEmbedShell *ges);
-
EphyHistory *ephy_embed_shell_get_global_history (EphyEmbedShell *shell);
DownloaderView *ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell);
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index f69ee8811..461655cdc 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -365,6 +365,7 @@ print_dialog_print (EphyDialog *dialog)
{
embed = ephy_embed_dialog_get_embed
(EPHY_EMBED_DIALOG(dialog));
+ g_return_if_fail (embed != NULL);
info->preview = FALSE;
ephy_embed_print (embed, info);
@@ -390,6 +391,7 @@ print_dialog_preview (EphyDialog *dialog)
{
embed = ephy_embed_dialog_get_embed
(EPHY_EMBED_DIALOG(dialog));
+ g_return_if_fail (embed != NULL);
info->preview = TRUE;
ephy_embed_print (embed, info);