summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Scorgie <dscorgie@src.gnome.org>2008-01-10 20:32:28 +0000
committerDon Scorgie <dscorgie@src.gnome.org>2008-01-10 20:32:28 +0000
commitd8b414e004cb1dbbe8719f1bf7c75ef03d863446 (patch)
tree7c12f8b9c323d2f0e96d52ae6cb4637e30fadb4d
parentf72a37916dc0cd12239751f600b167bd60e64662 (diff)
downloadyelp-d8b414e004cb1dbbe8719f1bf7c75ef03d863446.tar.gz
Fix crash on shutdown using xulrunner 1.8.x (bug #503317 - Markus Kanet)
* src/yelp-gecko-services.cpp: Fix crash on shutdown using xulrunner 1.8.x (bug #503317 - Markus Kanet) svn path=/trunk/; revision=3027
-rw-r--r--ChangeLog4
-rw-r--r--src/yelp-gecko-services.cpp18
2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 1859bf6e..ce7228aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-10 Don Scorgie <dscorgie@svn.gnome.org>
+ * src/yelp-gecko-services.cpp:
+ Fix crash on shutdown using xulrunner 1.8.x
+ (bug #503317 - Markus Kanet)
+
* src/yelp-search-parser.c:
Get a beagle client if it's available
allowing beagle to be used again
diff --git a/src/yelp-gecko-services.cpp b/src/yelp-gecko-services.cpp
index a23db4fa..c10e6bc1 100644
--- a/src/yelp-gecko-services.cpp
+++ b/src/yelp-gecko-services.cpp
@@ -415,18 +415,18 @@ PrintListener::SetPrintSettings (YelpPrintInfo *settings,
NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
-void
-yelp_register_printing ()
-{
- const nsModuleComponentInfo sAppComps[] = {
+static const nsModuleComponentInfo sAppComps[] = {
{
- G_PRINTINGPROMPTSERVICE_CLASSNAME,
- G_PRINTINGPROMPTSERVICE_CID,
- G_PRINTINGPROMPTSERVICE_CONTRACTID,
- GPrintingPromptServiceConstructor
+ G_PRINTINGPROMPTSERVICE_CLASSNAME,
+ G_PRINTINGPROMPTSERVICE_CID,
+ G_PRINTINGPROMPTSERVICE_CONTRACTID,
+ GPrintingPromptServiceConstructor
},
- };
+};
+void
+yelp_register_printing ()
+{
nsresult rv;
nsCOMPtr<nsIComponentRegistrar> cr;
rv = NS_GetComponentRegistrar(getter_AddRefs(cr));