aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-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
-rw-r--r--src/Makefile.am4
-rw-r--r--src/ephy-tab.c5
7 files changed, 17 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index ecd393cb4..00dc732ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-30 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * embed/ephy-embed-dialog.c: (ephy_embed_dialog_get_embed):
+ * embed/ephy-embed-shell.c: (ephy_embed_shell_init),
+ (ephy_embed_shell_get_favicon_cache):
+ * embed/ephy-embed-shell.h:
+ * embed/print-dialog.c: (print_dialog_print),
+ (print_dialog_preview):
+ * src/Makefile.am:
+ * src/ephy-tab.c: (ephy_tab_destroy_brsr_cb), (ephy_tab_init):
+
+ Remove some unused code
+
2003-06-29 James Willcox <jwillcox@gnome.org>
* embed/mozilla/ContentHandler.cpp:
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);
diff --git a/src/Makefile.am b/src/Makefile.am
index 2798049ba..d8041ce11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,10 +49,10 @@ epiphany_bin_SOURCES = \
ephy-encoding-menu.h \
ephy-favicon-action.c \
ephy-favicon-action.h \
- ephy-go-action.c \
- ephy-go-action.h \
ephy-favorites-menu.c \
ephy-favorites-menu.h \
+ ephy-go-action.c \
+ ephy-go-action.h \
ephy-history-window.c \
ephy-history-window.h \
ephy-location-action.c \
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 273f8440c..85f4bceb9 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -813,9 +813,6 @@ ephy_tab_destroy_brsr_cb (EphyEmbed *embed, EphyTab *tab)
g_return_if_fail (tab->priv->window != NULL);
ephy_window_remove_tab (tab->priv->window, tab);
-
- ephy_embed_shell_remove_embed (EPHY_EMBED_SHELL (ephy_shell),
- tab->priv->embed);
}
static gint
@@ -954,8 +951,6 @@ ephy_tab_init (EphyTab *tab)
tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW;
tab->priv->embed = ephy_embed_new (G_OBJECT(single));
- ephy_embed_shell_add_embed (EPHY_EMBED_SHELL (ephy_shell),
- tab->priv->embed);
embed = G_OBJECT (tab->priv->embed);
embed_widget = G_OBJECT (tab->priv->embed);
generated by cgit (git 2.34.1) at 2024-11-13 23:22:32 +0800