aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/ContentHandler.cpp41
-rw-r--r--embed/mozilla/ContentHandler.h1
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp8
-rw-r--r--embed/mozilla/MozDownload.cpp52
4 files changed, 73 insertions, 29 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 91c9d081d..ef2e07b6b 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -25,11 +25,14 @@
#include "config.h"
+#include "ContentHandler.h"
+
#include <gtk/gtkdialog.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkbutton.h>
+#include <gtk/gtkmain.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <glib/gi18n.h>
@@ -55,17 +58,22 @@
#include "ephy-debug.h"
#include "eel-gconf-extensions.h"
-#include "ContentHandler.h"
#include "MozDownload.h"
#include "EphyUtils.h"
+/* FIXME: we don't generally have a timestamp for the user action which initiated this
+ * content handler.
+ */
#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
GContentHandler::GContentHandler()
+: mUserTime(0)
{
LOG ("GContentHandler ctor (%p)", this);
}
#else
-GContentHandler::GContentHandler() : mMimeType(nsnull)
+GContentHandler::GContentHandler()
+: mMimeType(nsnull)
+, mUserTime(0)
{
LOG ("GContentHandler ctor (%p)", this);
}
@@ -156,6 +164,9 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile(
GTK_WINDOW (dialog));
}
+ /* FIXME: this will only be the real user time if we came from ::Show */
+ ephy_gui_window_update_user_time (GTK_WIDGET (dialog), (guint32) mUserTime);
+
/* FIXME: modal -- mozilla sucks! */
do
{
@@ -267,7 +278,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
{
dialog = gtk_message_dialog_new
(parentWindow, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
/* translators: %s is the name of the application */
_("Open this file with \"%s\"?"),
mHelperApp->name);
@@ -283,7 +294,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
{
dialog = gtk_message_dialog_new
(parentWindow, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
_("Download the file?"));
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG (dialog),
@@ -312,6 +323,10 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
g_signal_connect_data (dialog, "response",
G_CALLBACK (response_cb), this,
(GClosureNotify) release_cb, (GConnectFlags) 0);
+
+ /* FIXME: should find a way to get the user time of the user action which
+ * initiated this content handler
+ */
gtk_window_present (GTK_WINDOW (dialog));
return NS_OK;
@@ -361,16 +376,30 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void)
NS_METHOD GContentHandler::MIMEDoAction (void)
{
+ /* This is okay, since we either clicked on a button, or we get 0 */
+ mUserTime = gtk_get_current_event_time ();
+
nsCOMPtr<nsIMIMEInfo> mimeInfo;
mLauncher->GetMIMEInfo(getter_AddRefs(mimeInfo));
NS_ENSURE_TRUE (mimeInfo, NS_ERROR_FAILURE);
if (mAction == CONTENT_ACTION_OPEN)
{
- nsEmbedString desc;
+ g_return_val_if_fail (mHelperApp, NS_ERROR_FAILURE);
+
+ const char *id;
+ id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
+
+ /* The current time is fine here as the user has just clicked
+ * a button (it is used as the time for the application opening)
+ */
+ char *info;
+ info = g_strdup_printf ("gnome-default:%d:%s", gtk_get_current_event_time(), id);
- NS_CStringToUTF16 (nsEmbedCString ("gnome-default"),
+ nsEmbedString desc;
+ NS_CStringToUTF16 (nsEmbedCString (info),
NS_CSTRING_ENCODING_UTF8, desc);
+ g_free (info);
/* HACK we use the application description to ask
MozDownload to open the file when download
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index 3401a68cb..6a8c58472 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -84,6 +84,7 @@ class GContentHandler : public nsIHelperAppLauncherDialog
#else
char *mMimeType;
#endif
+ PRUint32 mUserTime;
};
#endif /* CONTENT_HANDLER_H */
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 293416b28..7676c245f 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -351,10 +351,17 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
EphyFileChooser *dialog;
GtkWindow *window;
const char *title;
+ guint32 user_time;
title = ephy_embed_persist_get_fc_title (EPHY_EMBED_PERSIST (mEmbedPersist));
window = ephy_embed_persist_get_fc_parent (EPHY_EMBED_PERSIST (mEmbedPersist));
+ user_time = ephy_embed_persist_get_user_time (EPHY_EMBED_PERSIST (mEmbedPersist));
+ if (user_time == 0)
+ {
+ g_warning ("EphyHeaderSniffer::PerformSave without valid user time!\n");
+ }
+
dialog = ephy_file_chooser_new (title ? title: _("Save"),
GTK_WIDGET (window),
GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -367,6 +374,7 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
g_signal_connect (dialog, "response",
G_CALLBACK (filechooser_response_cb), this);
+ ephy_gui_window_update_user_time (GTK_WIDGET (dialog), user_time);
gtk_widget_show (GTK_WIDGET (dialog));
g_free (filename);
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 8160f2715..140eb98fc 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -61,6 +61,9 @@
#include <nsEmbedString.h>
#undef MOZILLA_STRICT_API
+#include <errno.h>
+#include <stdlib.h>
+
const char* const persistContractID = "@mozilla.org/embedding/browser/nsWebBrowserPersist;1";
MozDownload::MozDownload() :
@@ -365,58 +368,61 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
else if (NS_SUCCEEDED (aStatus))
{
GnomeVFSMimeApplication *helperApp;
-#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
nsEmbedCString mimeType;
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
rv = mMIMEInfo->GetMIMEType (mimeType);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
- helperApp = gnome_vfs_mime_get_default_application (mimeType.get());
-
nsEmbedString description;
mMIMEInfo->GetApplicationDescription (description);
nsEmbedCString cDesc;
NS_UTF16ToCString (description, NS_CSTRING_ENCODING_UTF8, cDesc);
-
- /* HACK we use the application description to decide
- if we have to open the saved file */
- if ((strcmp (cDesc.get(), "gnome-default") == 0) &&
- helperApp)
#else
char *mimeType;
rv = mMIMEInfo->GetMIMEType (&mimeType);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
- helperApp = gnome_vfs_mime_get_default_application (mimeType);
+ if (mime)
+ {
+ mimeType.Assign (mime);
+ nsMemory::Free (mime);
+ }
PRUnichar *description;
mMIMEInfo->GetApplicationDescription (&description);
+ NS_ENSURE_TRUE (description, NS_ERROR_FAILURE);
nsEmbedCString cDesc;
NS_UTF16ToCString (nsEmbedString(description),
NS_CSTRING_ENCODING_UTF8, cDesc);
+ nsMemory::Free (description);
+#endif
+
/* HACK we use the application description to decide
if we have to open the saved file */
- if (strcmp (cDesc.get(), "gnome-default") == 0 &&
- helperApp)
-#endif
+ if (g_str_has_suffix (cDesc.get(), "gnome-default:"))
{
- GList *params = NULL;
- char *param;
- nsEmbedCString aDest;
+ /* Format gnome-default:<usertime>:<helperapp id> */
+ char **str = g_strsplit (cDesc.get(), ":", -1);
+ g_return_val_if_fail (g_strv_length (str) != 3, NS_ERROR_FAILURE);
- mDestination->GetSpec (aDest);
+ char *end;
+ guint32 user_time = strtoul (str[1], &end, 0);
- param = gnome_vfs_make_uri_canonical (aDest.get ());
- params = g_list_append (params, param);
- gnome_vfs_mime_application_launch (helperApp, params);
- g_free (param);
+ helperApp = gnome_vfs_mime_application_new_from_desktop_id (str[2]);
+ if (!helperApp) return NS_ERROR_FAILURE;
- g_list_free (params);
- }
+ nsEmbedCString aDest;
+ rv = mDestination->GetSpec (aDest);
+ NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
- gnome_vfs_mime_application_free (helperApp);
+ ephy_file_launch_application (helperApp, aDest.get (), user_time);
+
+ gnome_vfs_mime_application_free (helperApp);
+ g_strfreev (str);
+ }
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 01:49:29 +0800