From 9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 13 Jul 2003 08:52:36 +0000 Subject: 2003-07-13 Marco Pesenti Gritti * Makefile.am: * configure.in: * embed/Makefile.am: * embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache), (impl_get_downloader_view): * embed/ephy-embed-shell.h: * embed/ephy-embed-single.c: * embed/ephy-embed-single.h: * embed/mozilla/ProgressListener.cpp: * embed/mozilla/mozilla-embed.cpp: * lib/Makefile.am: * lib/ephy-langs.h: * lib/ephy-node.c: (unref_signal_objects), (ephy_node_signal_connect_object): * plugins/Makefile.am: * plugins/sample/Makefile.am: * plugins/sample/sample.c: (bmk_added), (bmk_removed), (bmk_changed), (switch_page_cb), (window_focus_in_cb), (location_changed_cb), (tab_added_cb), (new_window_cb), (plugin_init): * src/Makefile.am: * src/bookmarks/Makefile.am: * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_sync_icon): * src/bookmarks/ephy-bookmark-properties.c: (set_window_icon), (ephy_bookmark_properties_init): * src/bookmarks/ephy-bookmarks-editor.c: (provide_favicon), (ephy_bookmarks_editor_init): * src/bookmarks/ephy-bookmarks.c: (update_favorites_menus): * src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu): * src/ephy-automation.c: (impl_ephy_automation_loadurl), (impl_ephy_automation_quit), (impl_ephy_automation_load_session): * src/ephy-favicon-action.c: (ephy_favicon_action_init): * src/ephy-history-window.c: (confirmation_dialog_response_cb), (provide_favicon): * src/ephy-location-action.c: (connect_proxy): * src/ephy-notebook.c: (sync_icon): * src/ephy-shell.c: (ephy_shell_get_active_window), (ephy_shell_get_session), (ephy_shell_get_autocompletion), (ephy_shell_get_toolbars_model): * src/ephy-shell.h: * src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_init), (ephy_tab_get_action): * src/ephy-tab.h: * src/ephy-tabs-menu.c: (ephy_tabs_menu_update): * src/ephy-window.c: (ephy_window_fullscreen), (ephy_window_unfullscreen), (sync_tab_icon), (ephy_window_init), (remove_from_session), (ephy_window_get_active_tab): --- embed/Makefile.am | 39 +++++++++++++++++++++++--------------- embed/ephy-embed-shell.c | 13 +++++++------ embed/ephy-embed-shell.h | 10 ++++------ embed/ephy-embed-single.c | 1 + embed/ephy-embed-single.h | 2 -- embed/mozilla/ProgressListener.cpp | 4 +++- embed/mozilla/mozilla-embed.cpp | 1 + 7 files changed, 40 insertions(+), 30 deletions(-) (limited to 'embed') diff --git a/embed/Makefile.am b/embed/Makefile.am index f26c57dc0..5ca9f0a3b 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -16,35 +16,44 @@ INCLUDES = \ noinst_LTLIBRARIES = libephyembed.la +headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany +header_DATA = $(INST_H_FILES) + +NOINST_H_FILES = \ + downloader-view.h \ + ephy-embed-dialog.h \ + ephy-embed-popup-control.h \ + ephy-embed-utils.h \ + ephy-favicon-cache.h \ + find-dialog.h \ + print-dialog.h + +INST_H_FILES = \ + ephy-embed.h \ + ephy-embed-event.h \ + ephy-embed-persist.h \ + ephy-embed-prefs.h \ + ephy-embed-single.h \ + ephy-embed-shell.h \ + ephy-embed-types.h \ + ephy-history.h + libephyembed_la_SOURCES = \ downloader-view.c \ - downloader-view.h \ ephy-embed.c \ - ephy-embed.h \ ephy-embed-dialog.c \ - ephy-embed-dialog.h \ ephy-embed-event.c \ - ephy-embed-event.h \ ephy-embed-persist.c \ - ephy-embed-persist.h \ ephy-embed-popup-control.c \ - ephy-embed-popup-control.h \ - ephy-embed-prefs.h \ ephy-embed-single.c \ - ephy-embed-single.h \ ephy-embed-shell.c \ - ephy-embed-shell.h \ - ephy-embed-types.h \ ephy-embed-utils.c \ - ephy-embed-utils.h \ ephy-favicon-cache.c \ - ephy-favicon-cache.h \ ephy-history.c \ - ephy-history.h \ find-dialog.c \ - find-dialog.h \ print-dialog.c \ - print-dialog.h + $(INST_H_FILES) \ + $(NO_INST_H_FILES) libephyembed_la_LIBADD = \ $(top_builddir)/embed/mozilla/libephymozillaembed.la diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 61e8096a7..f772cccf5 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -23,6 +23,7 @@ #include "ephy-favicon-cache.h" #include "mozilla-embed-single.h" #include "ephy-debug.h" +#include "downloader-view.h" #include @@ -43,7 +44,7 @@ ephy_embed_shell_finalize (GObject *object); static EphyHistory * impl_get_global_history (EphyEmbedShell *shell); -static DownloaderView * +static GObject * impl_get_downloader_view (EphyEmbedShell *shell); static GObjectClass *parent_class = NULL; @@ -168,7 +169,7 @@ ephy_embed_shell_new (const char *type) * * Return value: the favicons cache **/ -EphyFaviconCache * +GObject * ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ees) { if (ees->priv->favicon_cache == NULL) @@ -176,7 +177,7 @@ ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ees) ees->priv->favicon_cache = ephy_favicon_cache_new (); } - return ees->priv->favicon_cache; + return G_OBJECT (ees->priv->favicon_cache); } EphyHistory * @@ -186,7 +187,7 @@ ephy_embed_shell_get_global_history (EphyEmbedShell *shell) return klass->get_global_history (shell); } -DownloaderView * +GObject * ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell) { EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); @@ -230,7 +231,7 @@ impl_get_global_history (EphyEmbedShell *shell) return shell->priv->global_history; } -static DownloaderView * +static GObject * impl_get_downloader_view (EphyEmbedShell *shell) { if (!shell->priv->downloader_view) @@ -241,6 +242,6 @@ impl_get_downloader_view (EphyEmbedShell *shell) (gpointer *)&shell->priv->downloader_view); } - return shell->priv->downloader_view; + return G_OBJECT (shell->priv->downloader_view); } diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h index a5e6bd16b..30d365d09 100644 --- a/embed/ephy-embed-shell.h +++ b/embed/ephy-embed-shell.h @@ -21,9 +21,7 @@ #include "ephy-embed.h" #include "ephy-embed-single.h" -#include "ephy-favicon-cache.h" #include "ephy-history.h" -#include "downloader-view.h" #include #include @@ -56,8 +54,8 @@ struct EphyEmbedShellClass GObjectClass parent_class; /* Methods */ - EphyHistory * (* get_global_history) (EphyEmbedShell *shell); - DownloaderView * (* get_downloader_view) (EphyEmbedShell *shell); + EphyHistory * (* get_global_history) (EphyEmbedShell *shell); + GObject * (* get_downloader_view) (EphyEmbedShell *shell); }; GType ephy_embed_shell_get_type (void); @@ -66,11 +64,11 @@ GType ephy_embed_shell_get_impl (void); EphyEmbedShell *ephy_embed_shell_new (const char *type); -EphyFaviconCache *ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ges); +GObject *ephy_embed_shell_get_favicon_cache (EphyEmbedShell *ges); EphyHistory *ephy_embed_shell_get_global_history (EphyEmbedShell *shell); -DownloaderView *ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell); +GObject *ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell); EphyEmbedSingle *ephy_embed_shell_get_embed_single (EphyEmbedShell *shell); diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index e329c4e74..66f6da6ee 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -23,6 +23,7 @@ #include "ephy-favicon-cache.h" #include "mozilla-embed-single.h" #include "ephy-debug.h" +#include "downloader-view.h" #include diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index fd1964d32..ee5b0cf74 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -20,9 +20,7 @@ #define EPHY_EMBED_SINGLE_H #include "ephy-embed.h" -#include "ephy-favicon-cache.h" #include "ephy-history.h" -#include "downloader-view.h" #include "ephy-langs.h" #include diff --git a/embed/mozilla/ProgressListener.cpp b/embed/mozilla/ProgressListener.cpp index 077232f71..e9cc7b835 100644 --- a/embed/mozilla/ProgressListener.cpp +++ b/embed/mozilla/ProgressListener.cpp @@ -24,6 +24,7 @@ #include "ProgressListener.h" #include "ephy-file-helpers.h" +#include "downloader-view.h" #include "mozilla-embed-persist.h" #include "nsXPIDLString.h" #include "nsCOMPtr.h" @@ -117,7 +118,8 @@ NS_METHOD GProgressListener::PrivateInit (void) if (NS_FAILED (rv)) return NS_ERROR_FAILURE; source = g_strdup (cTmp.get()); - mDownloaderView = ephy_embed_shell_get_downloader_view (embed_shell); + mDownloaderView = DOWNLOADER_VIEW + (ephy_embed_shell_get_downloader_view (embed_shell)); downloader_view_add_download (mDownloaderView, filename, source, dest, (gpointer)this); g_free (source); diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 40d7bc8a8..b0fbda45b 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -354,6 +354,7 @@ static void mozilla_embed_init (MozillaEmbed *embed) { embed->priv = g_new0 (MozillaEmbedPrivate, 1); + embed->priv->no_page = 1; mozilla_embed_connect_signals (embed); } -- cgit v1.2.3