diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-03-17 17:02:38 +0800 |
| commit | dbdcf80ba8e559236f9937aaafba1d14b1cee46e (patch) | |
| tree | d5711b633861b6ffc879fbbce08ea1364e9a64c9 /embed/mozilla/EphySingle.cpp | |
| parent | 9765279aba4cbed66b182e91eaa18e8225305a18 (diff) | |
| download | gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.gz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.bz2 gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.lz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.xz gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.zst gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.zip | |
merging pre-gnome-2-8 branch
Diffstat (limited to 'embed/mozilla/EphySingle.cpp')
| -rw-r--r-- | embed/mozilla/EphySingle.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp index bfdba4251..a15237596 100644 --- a/embed/mozilla/EphySingle.cpp +++ b/embed/mozilla/EphySingle.cpp @@ -32,9 +32,7 @@ #include <nsIPermissionManager.h> #include <nsICookieManager.h> #include <nsIServiceManager.h> -#if MOZILLA_SNAPSHOT > 9 #include <nsICookie2.h> -#endif NS_IMPL_ISUPPORTS1(EphySingle, nsIObserver) @@ -245,23 +243,19 @@ mozilla_cookie_to_ephy_cookie (nsICookie *cookie) cookie->GetExpires (&dateTime); info->expires = dateTime; -#if MOZILLA_SNAPSHOT > 9 nsCOMPtr<nsICookie2> cookie2 = do_QueryInterface (cookie); - if (cookie2) - { + NS_ENSURE_TRUE (cookie2, info); - PRBool isSession; - cookie2->GetIsSession (&isSession); - info->is_session = isSession != PR_FALSE; + PRBool isSession; + cookie2->GetIsSession (&isSession); + info->is_session = isSession != PR_FALSE; - if (!isSession) - { - PRInt64 expiry; - cookie2->GetExpiry (&expiry); - info->real_expires = expiry; - } + if (!isSession) + { + PRInt64 expiry; + cookie2->GetExpiry (&expiry); + info->real_expires = expiry; } -#endif return info; } @@ -272,7 +266,6 @@ mozilla_permission_to_ephy_permission (nsIPermission *perm) EphyPermissionType type = (EphyPermissionType) 0; nsresult result; -#if MOZILLA_SNAPSHOT >= 10 nsCAutoString str; result = perm->GetType(str); NS_ENSURE_SUCCESS (result, NULL); @@ -289,13 +282,6 @@ mozilla_permission_to_ephy_permission (nsIPermission *perm) { type = EPT_POPUP; } -#else - PRUint32 num; - result = perm->GetType(&num); - NS_ENSURE_SUCCESS (result, NULL); - - type = (EphyPermissionType) num; -#endif PRUint32 cap; perm->GetCapability(&cap); |