summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-10-07 15:11:02 +0000
committerChristian Persch <chpe@src.gnome.org>2006-10-07 15:11:02 +0000
commit9121caf12576c03497962432e04dc49ab596a08f (patch)
tree8ed23b92cbcc44ae9b6afd08c66c4a2c025d7e37
parente4d4f79233eeb5d284e6b4d1f976496f46fe51e9 (diff)
downloadtotem-9121caf12576c03497962432e04dc49ab596a08f.tar.gz
Don't crash when printing a page with a plugin. Bug #360253.
2006-10-07 Christian Persch <chpe@cvs.gnome.org> * browser-plugin/totemPlugin.cpp: Don't crash when printing a page with a plugin. Bug #360253.
-rw-r--r--ChangeLog6
-rw-r--r--browser-plugin/totemPlugin.cpp9
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 72046b287..d620d1552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-07 Christian Persch <chpe@cvs.gnome.org>
+
+ * browser-plugin/totemPlugin.cpp:
+
+ Don't crash when printing a page with a plugin. Bug #360253.
+
2006-10-04 Bastien Nocera <hadess@hadess.net>
* browser-plugin/totemBasicPlugin.cpp:
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index e2114b259..b3cbd8a72 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -848,6 +848,13 @@ totem_plugin_url_notify (NPP instance, const char* url,
D("plugin_url_notify");
}
+static void
+totem_plugin_print (NPP instance,
+ NPPrint* platformPrint)
+{
+ D("plugin_print");
+}
+
static char *
totem_plugin_get_description (void)
{
@@ -1054,7 +1061,7 @@ NP_Initialize (NPNetscapeFuncs * moz_funcs,
NewNPP_WriteReadyProc(totem_plugin_write_ready);
plugin_funcs->write = NewNPP_WriteProc(totem_plugin_write);
/* Printing ? */
- plugin_funcs->print = NewNPP_PrintProc(NULL);
+ plugin_funcs->print = NewNPP_PrintProc(totem_plugin_print);
/* What's that for ? */
plugin_funcs->event = NewNPP_HandleEventProc(NULL);
plugin_funcs->urlnotify =