diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/ephy-embed-single.c | 7 | ||||
| -rw-r--r-- | embed/ephy-embed-single.h | 8 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 13 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-notifiers.cpp | 2 |
4 files changed, 7 insertions, 23 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index fe42ba07b..83c60026a 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -159,13 +159,10 @@ ephy_embed_single_get_language_groups (EphyEmbedSingle *shell, gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell, const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font) + GList **fontList) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->get_font_list (shell, langGroup, fontType, fontList, - default_font); + return klass->get_font_list (shell, langGroup, fontList); } gresult diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index 2ca30f41b..4ef689d3f 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -127,9 +127,7 @@ struct EphyEmbedSingleClass GList **encodings); gresult (* get_font_list) (EphyEmbedSingle *shell, const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font); + GList **fontList); gresult (* list_cookies) (EphyEmbedSingle *shell, GList **cokies); gresult (* remove_cookies) (EphyEmbedSingle *shell, @@ -172,9 +170,7 @@ gresult ephy_embed_single_get_encodings (EphyEmbedSingle *shell, gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell, const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font); + GList **fontList); /* Cookies */ gresult ephy_embed_single_list_cookies (EphyEmbedSingle *shell, diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index a850fecd0..4cee89bd5 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -214,9 +214,7 @@ impl_get_language_groups (EphyEmbedSingle *shell, static gresult impl_get_font_list (EphyEmbedSingle *shell, const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font); + GList **fontList); static gresult impl_list_cookies (EphyEmbedSingle *shell, GList **cookies); @@ -811,9 +809,7 @@ impl_get_language_groups (EphyEmbedSingle *shell, static gresult impl_get_font_list (EphyEmbedSingle *shell, const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font) + GList **fontList) { nsresult rv; PRUint32 fontCount; @@ -841,11 +837,6 @@ impl_get_font_list (EphyEmbedSingle *shell, *fontList = g_list_reverse (l); - if (default_font != NULL) - { - *default_font = g_strdup (fontType); - } - return G_OK; } diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index 6c46fe55e..0b5867921 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -440,7 +440,7 @@ mozilla_notifiers_init(EphyEmbedSingle *single) for (i = 0; i < n_fonts_languages; i++) { guint k; - char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" }; + char *types [] = { "variable", "monospace" }; char key[255]; char *info; |