svnno****@sourc*****
svnno****@sourc*****
Sat Mar 1 18:47:05 JST 2008
Revision: 3427
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3427
Author: ikezoe
Date: 2008-03-01 18:47:04 +0900 (Sat, 01 Mar 2008)
Log Message:
-----------
code cleanup.
Modified Paths:
--------------
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-02-29 23:42:23 UTC (rev 3426)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-03-01 09:47:04 UTC (rev 3427)
@@ -297,9 +297,7 @@
gboolean lock);
static gchar *kz_gecko_embed_get_body_text (KzEmbed *kzembed);
-#if 0
-static gchar *kz_gecko_embed_get_selection_source (KzEmbed *kzembed);
-#endif
+
static void kz_gecko_embed_set_encoding (KzEmbed *kzembed,
const char *encoding);
static void kz_gecko_embed_get_encoding (KzEmbed *kzembed,
@@ -340,11 +338,6 @@
KzBookmark *history);
static guint kz_gecko_embed_get_last_modified (KzEmbed *kzembed);
-
-#if 0
-static void kz_gecko_embed_set_edit_mode (KzEmbed *kzembed);
-static void kz_gecko_embed_set_view_mode (KzEmbed *kzembed);
-#endif
static void kz_gecko_embed_fine_scroll (KzEmbed *kzembed,
int horiz,
int vert);
@@ -492,9 +485,6 @@
iface->get_lock = kz_gecko_embed_get_lock;
iface->set_lock = kz_gecko_embed_set_lock;
iface->get_body_text = kz_gecko_embed_get_body_text;
-#if 0
- iface->get_selection_source = kz_gecko_embed_get_selection_source;
-#endif
iface->set_encoding = kz_gecko_embed_set_encoding;
iface->get_encoding = kz_gecko_embed_get_encoding;
iface->print = kz_gecko_embed_print;
@@ -521,11 +511,6 @@
iface->set_allow_images = kz_gecko_embed_set_allow_images;
iface->show_page_certificate = kz_gecko_embed_show_page_certificate;
-
-#if 0
- iface->set_edit_mode = set_edit_mode;
- iface->set_view_mode = set_view_mode;
-#endif
iface->link_message = NULL;
iface->js_status = NULL;
iface->location = NULL;
@@ -1521,29 +1506,7 @@
NS_CSTRING_ENCODING_UTF8, str);
return g_strdup(str.get());
}
-#if 0
-static gchar *
-kz_gecko_embed_get_selection_source(KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
- if (!priv->wrapper) return NULL;
-
- nsresult rv;
-
- nsCOMPtr<nsISelection> selection;
- rv = priv->wrapper->GetSelection(getter_AddRefs(selection));
- if (!selection) return NULL;
-
- nsAutoString string;
- rv = priv->wrapper->GetSelectionSource(selection, PR_TRUE, string);
- if (NS_FAILED(rv)) return NULL;
-
- return g_strdup(NS_ConvertUCS2toUTF8(string).get());
-}
-#endif
-
#if USE_MIGEMO
static gboolean
kz_gecko_embed_get_body_string(KzGeckoEmbed *mozembed, gchar **body_string,
@@ -3204,45 +3167,7 @@
}
-#if 0
static void
-kz_gecko_embed_set_edit_mode (KzEmbed *kzembed)
-{
- g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
-
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
-
- nsCOMPtr<nsIDOMWindow> domWindow;
- priv->wrapper->GetDOMWindow(getter_AddRefs(domWindow));
-
- nsCOMPtr<nsIEditingSession> edit;
- edit = do_GetInterface(priv->wrapper->mWebBrowser);
- if (edit)
- {
- edit->MakeWindowEditable(domWindow, "html", PR_FALSE);
- }
-}
-
-static void
-kz_gecko_embed_set_view_mode (KzEmbed *kzembed)
-{
- g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
-
- KzGeckoEmbed *mozembed = KZ_GECKO_EMBED(kzembed);
-
- nsCOMPtr<nsIDOMWindow> domWindow;
- priv->wrapper->GetDOMWindow(getter_AddRefs(domWindow));
-
- nsCOMPtr<nsIEditingSession> edit;
- edit = do_GetInterface(priv->wrapper->mWebBrowser);
- if (edit)
- {
- edit->TearDownEditorOnWindow(domWindow);
- }
-}
-#endif
-
-static void
kz_gecko_embed_fine_scroll (KzEmbed *kzembed,
int horiz, int vert)
{
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2008-02-29 23:42:23 UTC (rev 3426)
+++ kazehakase/trunk/src/kz-embed.c 2008-03-01 09:47:04 UTC (rev 3427)
@@ -924,18 +924,6 @@
}
-#if 0
-gchar *
-kz_embed_get_selection_source (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_EMBED(kzembed), NULL);
- g_return_val_if_fail(KZ_EMBED_GET_IFACE(kzembed)->get_selection_source, NULL);
-
- return KZ_EMBED_GET_IFACE(kzembed)->get_selection_source(kzembed);
-}
-#endif
-
-
void
kz_embed_set_encoding (KzEmbed *kzembed, const char *encoding)
{
@@ -1112,29 +1100,7 @@
}
-#if 0
void
-kz_embed_set_edit_mode (KzEmbed *kzembed)
-{
- g_return_if_fail(KZ_IS_EMBED(kzembed));
- g_return_if_fail(KZ_EMBED_GET_IFACE(kzembed)->set_edit_mode);
-
- KZ_EMBED_GET_IFACE(kzembed)->set_edit_mode(kzembed);
-}
-
-
-void
-kz_embed_set_view_mode (KzEmbed *kzembed)
-{
- g_return_if_fail(KZ_IS_EMBED(kzembed));
- g_return_if_fail(KZ_EMBED_GET_IFACE(kzembed)->set_view_mode);
-
- KZ_EMBED_GET_IFACE(kzembed)->set_view_mode(kzembed);
-}
-#endif
-
-
-void
kz_embed_fine_scroll (KzEmbed *kzembed,
int horiz, int vert)
{
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2008-02-29 23:42:23 UTC (rev 3426)
+++ kazehakase/trunk/src/kz-embed.h 2008-03-01 09:47:04 UTC (rev 3427)
@@ -410,9 +410,7 @@
gboolean lock);
gchar *kz_embed_get_body_text (KzEmbed *kzembed);
-#if 0
-gchar *kz_embed_get_selection_source (KzEmbed *kzembed);
-#endif
+
void kz_embed_set_encoding (KzEmbed *kzembed,
const char *encoding);
void kz_embed_get_encoding (KzEmbed *kzembed,
@@ -455,11 +453,6 @@
guint kz_embed_get_last_modified (KzEmbed *kzembed);
-
-#if 0
-void kz_embed_set_edit_mode (KzEmbed *kzembed);
-void kz_embed_set_view_mode (KzEmbed *kzembed);
-#endif
void kz_embed_fine_scroll (KzEmbed *kzembed,
int horiz,
int vert);