diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-17 21:58:21 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-17 21:58:21 +0800 |
| commit | f220f9282e63ca352def47b86ec5f9c5c5c57696 (patch) | |
| tree | 131d1dff90041138a058eaa8e3844f19f5293f3e /embed/mozilla/EphyUtils.cpp | |
| parent | b89fb9d5a5860e5349115717d48b240cf9715f4b (diff) | |
| download | gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.gz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.bz2 gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.lz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.xz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.zst gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.zip | |
Add event type to the callback.
2006-01-17 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-file-helpers.c: (ephy_file_monitor_timeout_cb),
(ephy_file_monitor_cb):
* lib/ephy-file-helpers.h:
Add event type to the callback.
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/EphyUtils.h:
New function, like NS_NewFileURI (which we can't use since
nsNetUtil.h conflicts with embed strings).
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
Check that the user CSS file exists before registering it.
Also handle file-deleted events.
* src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_build):
* src/bookmarks/ephy-topics-palette.c:
(ephy_topics_palette_constructor),
(ephy_topics_palette_class_init):
Build fixes.
Diffstat (limited to 'embed/mozilla/EphyUtils.cpp')
| -rw-r--r-- | embed/mozilla/EphyUtils.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp index 24e674591..a043b7e66 100644 --- a/embed/mozilla/EphyUtils.cpp +++ b/embed/mozilla/EphyUtils.cpp @@ -30,6 +30,7 @@ #include <nsIIOService.h> #include <nsIURI.h> +#include <nsIFile.h> #include <nsIDOMWindow.h> #include <nsIServiceManager.h> #undef MOZILLA_INTERNAL_API @@ -75,14 +76,23 @@ EphyUtils::NewURI (nsIURI **result, nsIURI *baseURI) { nsresult rv; - nsCOMPtr<nsIIOService> ioService; rv = EphyUtils::GetIOService (getter_AddRefs (ioService)); NS_ENSURE_SUCCESS (rv, rv); - rv = ioService->NewURI (spec, charset, baseURI, result); + return ioService->NewURI (spec, charset, baseURI, result); +} - return rv; +nsresult +EphyUtils::NewFileURI (nsIURI **result, + nsIFile *spec) +{ + nsresult rv; + nsCOMPtr<nsIIOService> ioService; + rv = EphyUtils::GetIOService (getter_AddRefs (ioService)); + NS_ENSURE_SUCCESS (rv, rv); + + return ioService->NewFileURI (spec, result); } GtkWidget * |