wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1084022 - Don't log errors for missing default favicons. r=rnewman

Browse Source
This commit is contained in:
Brian Nicholson 2014-11-12 20:37:02 -08:00
parent 2c2f87dc6a
commit 36bf2c5de3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/db/LocalBrowserDB.java
View File

@ -417,8 +417,12 @@ public class LocalBrowserDB {
faviconField.setAccessible(true);
return faviconField.getInt(null);
} catch (IllegalAccessException | NoSuchFieldException ex) {
Log.wtf(LOGTAG, "Reflection error fetching favicon: " + name, ex);
} catch (IllegalAccessException | NoSuchFieldException e) {
// We'll end up here for any default bookmark that doesn't have a favicon in
// resources/raw/ (i.e., about:firefox). When this happens, the Favicons service will
// fall back to the default branding icon for about pages. Non-about pages should always
// specify an icon; otherwise, the placeholder globe favicon will be used.
Log.d(LOGTAG, "No raw favicon resource found for " + name);
}
Log.e(LOGTAG, "Failed to find favicon resource ID for " + name);

1
mobile/android/base/strings.xml.in
View File

@ -394,7 +394,6 @@
profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -->
<string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
<string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
<string name="bookmarkdefaults_favicon_aboutfirefox">chrome/chrome/content/branding/favicon64.png</string>
<!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_addons -->
<string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>