On session logout, check if there are downloads pending (since they're not

2006-02-02  Christian Persch  <chpe@cvs.gnome.org>

	* embed/downloader-view.c:
	* embed/downloader-view.h:
	* embed/ephy-embed-shell.c:
	(ephy_embed_shell_get_downloader_view_nocreate):
	* embed/ephy-embed-shell.h:
	* lib/ephy-gui.c: (ephy_gui_message_dialog_get_content_box):
	* lib/ephy-gui.h:
	* src/ephy-session.c:
	(confirm_shutdown_dialog_update_timeout_label),
	(confirm_shutdown_dialog_tick_cb),
	(confirm_shutdown_dialog_response_cb),
	(confirm_shutdown_dialog_accept_cb),
	(confirm_shutdown_dialog_weak_ref_cb), (confirm_shutdown_cb),
	(save_yourself_cb):

	On session logout, check if there are downloads pending (since
	they're not resumable, bug #128048). #if 0'd for now.

4 files changed, 16 insertions, 6 deletions

diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 4877f03df..1057d0e79 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -70,7 +70,7 @@ enum
 
 #define EPHY_DOWNLOADER_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_DOWNLOADER_VIEW, DownloaderViewPrivate))
 
-struct DownloaderViewPrivate
+struct _DownloaderViewPrivate
 {
 	GtkTreeModel *model;
 	GHashTable *downloads_hash;
diff --git a/embed/downloader-view.h b/embed/downloader-view.h
index 2e3b869fc..5a8fb7368 100644
--- a/embed/downloader-view.h
+++ b/embed/downloader-view.h
@@ -36,11 +36,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_DOWNLOADER_VIEW_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DOWNLOADER_VIEW))
 #define EPHY_DOWNLOADER_VIEW_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DOWNLOADER_VIEW, DownloaderViewClass))
 
-typedef struct DownloaderView DownloaderView;
-typedef struct DownloaderViewClass DownloaderViewClass;
-typedef struct DownloaderViewPrivate DownloaderViewPrivate;
+typedef struct _DownloaderView		DownloaderView;
+typedef struct _DownloaderViewPrivate	DownloaderViewPrivate;
+typedef struct _DownloaderViewClass	DownloaderViewClass;
 
-struct DownloaderView
+struct _DownloaderView
 {
         EphyDialog parent;
 
@@ -48,7 +48,7 @@ struct DownloaderView
         DownloaderViewPrivate *priv;
 };
 
-struct DownloaderViewClass
+struct _DownloaderViewClass
 {
         EphyDialogClass parent_class;
 };
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 32dd8e1bc..6474fb2ed 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -202,6 +202,14 @@ ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell)
 	return G_OBJECT (shell->priv->downloader_view);
 }
 
+GObject *
+ephy_embed_shell_get_downloader_view_nocreate (EphyEmbedShell *shell)
+{
+	g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL);
+
+	return (GObject *) shell->priv->downloader_view;
+}
+
 static GObject *
 impl_get_embed_single (EphyEmbedShell *shell)
 {
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 5f5a1b7df..74a25a22e 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -67,6 +67,8 @@ GObject		  *ephy_embed_shell_get_global_history	(EphyEmbedShell *shell);
 
 GObject		  *ephy_embed_shell_get_downloader_view	(EphyEmbedShell *shell);
 
+GObject		  *ephy_embed_shell_get_downloader_view_nocreate	(EphyEmbedShell *shell);
+
 GObject		  *ephy_embed_shell_get_encodings	(EphyEmbedShell *shell);
 
 GObject		  *ephy_embed_shell_get_embed_single	(EphyEmbedShell *shell);