svnno****@sourc*****
svnno****@sourc*****
Sat Mar 24 15:18:39 JST 2007
Revision: 2989
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=2989
Author: ikezoe
Date: 2007-03-24 15:18:39 +0900 (Sat, 24 Mar 2007)
Log Message:
-----------
* module/embed/gecko/mozilla.[cpp|h]: Remove needless codes.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
kazehakase/trunk/module/embed/gecko/mozilla-prefs.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-23 12:54:05 UTC (rev 2988)
+++ kazehakase/trunk/ChangeLog 2007-03-24 06:18:39 UTC (rev 2989)
@@ -1,3 +1,7 @@
+2007-03-24 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/gecko/mozilla.[cpp|h]: Remove needless codes.
+
2007-03-23 Kouhei Sutou <kou****@cozmi*****>
* src/utils/utils.c: used KZ_GET_SEARCH instead of kz_search_new().
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2007-03-23 12:54:05 UTC (rev 2988)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2007-03-24 06:18:39 UTC (rev 2989)
@@ -448,99 +448,6 @@
}
-//
-// Picked from Epiphany-0.7.0 (embed/mozilla/mozilla-embed-single.cpp).
-// Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
-//
-gboolean
-mozilla_prefs_get_font_list (const char *lang_group,
- const char *font_type,
- GList **font_list,
- GList **all_font_list,
- char **default_font)
-{
- nsresult rv;
- PRUint32 count;
- PRUnichar **fontArray;
-
- nsCOMPtr<nsIFontEnumerator> mozFontEnumerator;
- mozFontEnumerator = do_CreateInstance("@mozilla.org/gfx/fontenumerator;1");
- NS_ENSURE_TRUE (mozFontEnumerator, FALSE);
-
- // get the language proper fonts
- rv = mozFontEnumerator->EnumerateFonts(lang_group, font_type,
- &count, &fontArray);
- NS_ENSURE_SUCCESS (rv, FALSE);
-
- if (font_list)
- {
- GList *list = NULL;
- for (PRUint32 i = 0; i < count; i++)
- {
- char *gFontString;
-
- nsEmbedCString tmp;
- NS_UTF16ToCString(nsEmbedString(fontArray[i]),
- NS_CSTRING_ENCODING_UTF8, tmp);
- gFontString = g_strdup(tmp.get());
- list = g_list_prepend(list, gFontString);
- nsMemory::Free (fontArray[i]);
- }
- *font_list = g_list_reverse(list);
- }
- nsMemory::Free (fontArray);
-
- // get all fonts
- rv = mozFontEnumerator->EnumerateAllFonts(&count, &fontArray);
- NS_ENSURE_SUCCESS (rv, FALSE);
-
- if (font_list)
- {
- GList *list = NULL;
- for (PRUint32 i = 0; i < count; i++)
- {
- char *gFontString;
-
- nsEmbedCString tmp;
- NS_UTF16ToCString(nsEmbedString(fontArray[i]),
- NS_CSTRING_ENCODING_UTF8, tmp);
- if (!g_list_find_custom(*font_list, tmp.get(),
- (GCompareFunc)strcmp))
- {
- gFontString = g_strdup(tmp.get());
- list = g_list_prepend(list, gFontString);
- nsMemory::Free (fontArray[i]);
- }
- }
- *all_font_list = g_list_reverse(list);
- }
- nsMemory::Free (fontArray);
-
- if (default_font != NULL)
- {
- char key[255];
- char *value = NULL;
- nsCOMPtr<nsIPrefService> prefService;
-
- prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
- g_return_val_if_fail(prefService != NULL, FALSE);
-
- nsCOMPtr<nsIPrefBranch> pref;
- prefService->GetBranch("", getter_AddRefs(pref));
- g_return_val_if_fail(pref != NULL, FALSE);
-
- g_snprintf(key, sizeof(key), "font.name.%s.%s",
- font_type, lang_group);
-
- pref->GetCharPref(key, &value);
- *default_font = g_strdup(value);
- nsMemory::Free(value);
- }
-
- return TRUE;
-}
-
-
void
mozilla_prefs_set_use_proxy (gboolean use)
{
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.h 2007-03-23 12:54:05 UTC (rev 2988)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.h 2007-03-24 06:18:39 UTC (rev 2989)
@@ -46,13 +46,6 @@
gboolean new_boolean_value);
gboolean mozilla_prefs_set_int (const char *preference_name,
int new_int_value);
-
-gboolean mozilla_prefs_get_font_list (const char *lang_group,
- const char *font_type,
- GList **font_list,
- GList **all_font_list,
- char **default_font);
-
void mozilla_prefs_set_proxy (KzProxyItem *item);
void mozilla_prefs_set_use_proxy (gboolean use);