diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-04-09 21:45:01 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-04-09 21:45:01 +0800 |
| commit | d0187a5fa417827891126ecf0d43097cda3df9fb (patch) | |
| tree | 8280b0224de6438d89033ce9eeac888fdacd1561 /embed/mozilla/ContentHandler.cpp | |
| parent | 54ee29b111c482b2540afeca61bbb1733abade14 (diff) | |
| download | gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar.gz gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar.bz2 gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar.lz gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar.xz gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.tar.zst gsoc2013-epiphany-d0187a5fa417827891126ecf0d43097cda3df9fb.zip | |
Cleanup
svn path=/branches/gnome-2-22/; revision=8206
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index abe3401e9..82be1f19a 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -67,7 +67,10 @@ * content handler. */ GContentHandler::GContentHandler() -: mUserTime(0) +: mHelperApp(NULL), + mPermission(EPHY_MIME_PERMISSION_UNKNOWN), + mUserTime(0), + mAction(CONTENT_ACTION_NONE) { LOG ("GContentHandler ctor (%p)", this); } @@ -223,10 +226,10 @@ NS_METHOD GContentHandler::Init () return NS_OK; } -static void -response_cb (GtkWidget *dialog, - int response, - GContentHandler *self) +/* static */ void +GContentHandler::ResponseCallback (GtkWidget *dialog, + int response, + GContentHandler *self) { gtk_widget_destroy (dialog); @@ -348,7 +351,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction () NS_ADDREF_THIS(); g_signal_connect_data (dialog, "response", - G_CALLBACK (response_cb), this, + G_CALLBACK (ResponseCallback), this, (GClosureNotify) release_cb, (GConnectFlags) 0); /* FIXME: should find a way to get the user time of the user action which @@ -415,7 +418,7 @@ 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 (); + mUserTime = (PRUint32) gtk_get_current_event_time (); nsCOMPtr<nsIMIMEInfo> mimeInfo; mLauncher->GetMIMEInfo(getter_AddRefs(mimeInfo)); |