svnno****@sourc*****
svnno****@sourc*****
Sat Mar 1 19:04:23 JST 2008
Revision: 3428
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3428
Author: ikezoe
Date: 2008-03-01 19:04:22 +0900 (Sat, 01 Mar 2008)
Log Message:
-----------
code cleanup.
Modified Paths:
--------------
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-03-01 09:47:04 UTC (rev 3427)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-03-01 10:04:22 UTC (rev 3428)
@@ -203,155 +203,132 @@
KzEmbedEvent *info);
static gchar *kz_gecko_embed_store_history_file (KzGeckoEmbed *kzembed);
-static void kz_gecko_embed_load_url (KzEmbed *kzembed,
- const gchar *url);
-static void kz_gecko_embed_view_source (KzEmbed *kzembed,
- const gchar *url);
+static void load_url (KzEmbed *kzembed,
+ const gchar *url);
+static void view_source (KzEmbed *kzembed,
+ const gchar *url);
+static gboolean is_loading (KzEmbed *kzembed);
+static const gchar *get_title (KzEmbed *kzembed);
+static const gchar *get_location (KzEmbed *kzembed);
+static gchar *ensure_title (KzEmbed *kzembed);
+static gchar *get_link_message (KzEmbed *kzembed);
+static gdouble get_progress (KzEmbed *kzembed);
+static gboolean can_cut_selection (KzEmbed *kzembed);
+static gboolean can_copy_selection (KzEmbed *kzembed);
+static gboolean can_paste (KzEmbed *kzembed);
+static void cut_selection (KzEmbed *kzembed);
+static void copy_selection (KzEmbed *kzembed);
+static void paste (KzEmbed *kzembed);
+static void select_all (KzEmbed *kzembed);
+static gchar *get_selection_string (KzEmbed *kzembed);
+static gboolean find (KzEmbed *kzembed,
+ const char *keyword,
+ gboolean backward);
+static gboolean incremental_search (KzEmbed *kzembed,
+ const char *keyword,
+ gboolean backward);
+static gboolean selection_is_collapsed(KzEmbed *kzembed);
+static gboolean get_links (KzEmbed *kzembed,
+ GList **list,
+ gboolean selected_only);
+static gboolean get_dest_anchors (KzEmbed *kzembed,
+ GList **list);
+static void copy_page (KzEmbed *kzembed,
+ KzEmbed *dkzembed,
+ KzEmbedCopyType type);
+static gboolean shistory_copy (KzEmbed *source,
+ KzEmbed *dest,
+ gboolean back_history,
+ gboolean forward_history,
+ gboolean set_current);
+static gboolean shistory_get_pos (KzEmbed *kzembed,
+ int *pos,
+ int *count);
+static void shistory_get_nth (KzEmbed *kzembed,
+ int nth,
+ gboolean is_relative,
+ char **aUrl,
+ char **aTitle);
+static void reload (KzEmbed *kzembed,
+ KzEmbedReloadFlag flags);
+static void stop_load (KzEmbed *kzembed);
+static void go_back (KzEmbed *kzembed);
+static void go_forward (KzEmbed *kzembed);
+static gboolean can_go_back (KzEmbed *kzembed);
+static gboolean can_go_forward (KzEmbed *kzembed);
+static gboolean can_go_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link);
+static void go_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link);
+static void append_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ KzNavi *navi);
+static void set_nth_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ KzNavi *navi,
+ guint n);
+static KzNavi *get_nth_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ guint n);
+static GList *get_nav_links (KzEmbed *kzembed,
+ KzEmbedNavLink link);
+static void go_history_index (KzEmbed *kzembed,
+ gint index);
+static void do_command (KzEmbed *kzembed,
+ const char *command);
+static gboolean can_do_command (KzEmbed *kzembed,
+ const char *command);
+static gboolean get_lock (KzEmbed *kzembed);
+static void set_lock (KzEmbed *kzembed,
+ gboolean lock);
+static gchar *get_body_text (KzEmbed *kzembed);
+static void set_encoding (KzEmbed *kzembed,
+ const char *encoding);
+static void get_encoding (KzEmbed *kzembed,
+ char **encoding,
+ gboolean *forced);
+static void print (KzEmbed *kzembed);
+static void print_preview (KzEmbed *kzembed);
+static GList *get_printer_list (KzEmbed *kzembed);
+static void create_thumbnail (KzEmbed *kzembed,
+ EggPixbufThumbSize size);
+static gboolean save_with_content (KzEmbed *kzembed,
+ const char *rawfilename);
+static gboolean set_text_into_textarea(KzEmbed *kzembed,
+ gpointer element,
+ const gchar *text);
+static gchar *get_text_from_textarea(KzEmbed *kzembed,
+ gpointer element);
+static void zoom_set (KzEmbed *kzembed,
+ int zoom,
+ gboolean reflow);
+static int zoom_get (KzEmbed *kzembed);
+static void set_text_size (KzEmbed *kzembed,
+ int zoom,
+ gboolean reflow);
+static int get_text_size (KzEmbed *kzembed);
-static gboolean kz_gecko_embed_is_loading (KzEmbed *kzembed);
+static gchar *get_html_with_contents(KzEmbed *kzembed,
+ const gchar *storedir);
+static void set_history (KzEmbed *kzembed,
+ KzBookmark *history);
+static void get_history (KzEmbed *kzembed,
+ KzBookmark *history);
+static guint get_last_modified (KzEmbed *kzembed);
+static void fine_scroll (KzEmbed *kzembed,
+ int horiz,
+ int vert);
+static void page_up (KzEmbed *kzembed);
+static void page_down (KzEmbed *kzembed);
-static const gchar *kz_gecko_embed_get_title (KzEmbed *kzembed);
-static const gchar *kz_gecko_embed_get_location (KzEmbed *kzembed);
-static gchar *kz_gecko_embed_ensure_title (KzEmbed *kzembed);
-static gchar *kz_gecko_embed_get_link_message (KzEmbed *kzembed);
+static gboolean get_allow_javascript (KzEmbed *kzembed);
+static void set_allow_javascript (KzEmbed *kzembed,
+ gboolean allow);
+static gboolean get_allow_images (KzEmbed *kzembed);
+static void set_allow_images (KzEmbed *kzembed,
+ gboolean allow);
+static void show_page_certificate (KzEmbed *kzembed);
-static gdouble kz_gecko_embed_get_progress (KzEmbed *kzembed);
-
-static gboolean kz_gecko_embed_can_cut_selection (KzEmbed *kzembed);
-static gboolean kz_gecko_embed_can_copy_selection (KzEmbed *kzembed);
-static gboolean kz_gecko_embed_can_paste (KzEmbed *kzembed);
-static void kz_gecko_embed_cut_selection (KzEmbed *kzembed);
-static void kz_gecko_embed_copy_selection (KzEmbed *kzembed);
-static void kz_gecko_embed_paste (KzEmbed *kzembed);
-static void kz_gecko_embed_select_all (KzEmbed *kzembed);
-
-static gchar *kz_gecko_embed_get_selection_string (KzEmbed *kzembed);
-
-static gboolean kz_gecko_embed_find (KzEmbed *kzembed,
- const char *keyword,
- gboolean backward);
-static gboolean kz_gecko_embed_incremental_search (KzEmbed *kzembed,
- const char *keyword,
- gboolean backward);
-
-static gboolean kz_gecko_embed_selection_is_collapsed(KzEmbed *kzembed);
-
-static gboolean kz_gecko_embed_get_links (KzEmbed *kzembed,
- GList **list,
- gboolean selected_only);
-
-static gboolean kz_gecko_embed_get_dest_anchors (KzEmbed *kzembed,
- GList **list);
-
-static void kz_gecko_embed_copy_page (KzEmbed *kzembed,
- KzEmbed *dkzembed,
- KzEmbedCopyType type);
-static gboolean kz_gecko_embed_shistory_copy (KzEmbed *source,
- KzEmbed *dest,
- gboolean back_history,
- gboolean forward_history,
- gboolean set_current);
-static gboolean kz_gecko_embed_shistory_get_pos (KzEmbed *kzembed,
- int *pos,
- int *count);
-static void kz_gecko_embed_shistory_get_nth (KzEmbed *kzembed,
- int nth,
- gboolean is_relative,
- char **aUrl,
- char **aTitle);
-
-static void kz_gecko_embed_reload (KzEmbed *kzembed,
- KzEmbedReloadFlag flags);
-static void kz_gecko_embed_stop_load (KzEmbed *kzembed);
-static void kz_gecko_embed_go_back (KzEmbed *kzembed);
-static void kz_gecko_embed_go_forward (KzEmbed *kzembed);
-
-static gboolean kz_gecko_embed_can_go_back (KzEmbed *kzembed);
-static gboolean kz_gecko_embed_can_go_forward (KzEmbed *kzembed);
-static gboolean kz_gecko_embed_can_go_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link);
-static void kz_gecko_embed_go_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link);
-static void kz_gecko_embed_append_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- KzNavi *navi);
-static void kz_gecko_embed_set_nth_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- KzNavi *navi,
- guint n);
-static KzNavi *kz_gecko_embed_get_nth_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- guint n);
-static GList *kz_gecko_embed_get_nav_links (KzEmbed *kzembed,
- KzEmbedNavLink link);
-static void kz_gecko_embed_go_history_index (KzEmbed *kzembed,
- gint index);
-
-static void kz_gecko_embed_do_command (KzEmbed *kzembed,
- const char *command);
-static gboolean kz_gecko_embed_can_do_command (KzEmbed *kzembed,
- const char *command);
-
-static gboolean kz_gecko_embed_get_lock (KzEmbed *kzembed);
-static void kz_gecko_embed_set_lock (KzEmbed *kzembed,
- gboolean lock);
-
-static gchar *kz_gecko_embed_get_body_text (KzEmbed *kzembed);
-
-static void kz_gecko_embed_set_encoding (KzEmbed *kzembed,
- const char *encoding);
-static void kz_gecko_embed_get_encoding (KzEmbed *kzembed,
- char **encoding,
- gboolean *forced);
-static void kz_gecko_embed_print (KzEmbed *kzembed);
-static void kz_gecko_embed_print_preview (KzEmbed *kzembed);
-static GList *kz_gecko_embed_get_printer_list (KzEmbed *kzembed);
-static void kz_gecko_embed_create_thumbnail (KzEmbed *kzembed,
- EggPixbufThumbSize size);
-
-
-static gboolean kz_gecko_embed_save_with_content (KzEmbed *kzembed,
- const char *rawfilename);
-
-static gboolean kz_gecko_embed_set_text_into_textarea(KzEmbed *kzembed,
- gpointer element,
- const gchar *text);
-static gchar *kz_gecko_embed_get_text_from_textarea(KzEmbed *kzembed,
- gpointer element);
-
-
-static void kz_gecko_embed_zoom_set (KzEmbed *kzembed,
- int zoom,
- gboolean reflow);
-static int kz_gecko_embed_zoom_get (KzEmbed *kzembed);
-static void kz_gecko_embed_set_text_size (KzEmbed *kzembed,
- int zoom,
- gboolean reflow);
-static int kz_gecko_embed_get_text_size (KzEmbed *kzembed);
-
-static gchar *kz_gecko_embed_get_html_with_contents(KzEmbed *kzembed,
- const gchar *storedir);
-
-static void kz_gecko_embed_set_history (KzEmbed *kzembed,
- KzBookmark *history);
-static void kz_gecko_embed_get_history (KzEmbed *kzembed,
- KzBookmark *history);
-static guint kz_gecko_embed_get_last_modified (KzEmbed *kzembed);
-
-static void kz_gecko_embed_fine_scroll (KzEmbed *kzembed,
- int horiz,
- int vert);
-static void kz_gecko_embed_page_up (KzEmbed *kzembed);
-static void kz_gecko_embed_page_down (KzEmbed *kzembed);
-
-static gboolean kz_gecko_embed_get_allow_javascript (KzEmbed *kzembed);
-static void kz_gecko_embed_set_allow_javascript (KzEmbed *kzembed,
- gboolean allow);
-static gboolean kz_gecko_embed_get_allow_images (KzEmbed *kzembed);
-static void kz_gecko_embed_set_allow_images (KzEmbed *kzembed,
- gboolean allow);
-static void kz_gecko_embed_show_page_certificate (KzEmbed *kzembed);
-
/* KzEmbedPrefs interfaces */
static void kz_gecko_embed_prefs_iface_init (KzEmbedPrefsIFace *iface);
static gboolean kz_gecko_embed_prefs_init (KzEmbedPrefs *embed_prefs);
@@ -440,76 +417,76 @@
static void
kz_gecko_embed_iface_init (KzEmbedIFace *iface)
{
- iface->load_url = kz_gecko_embed_load_url;
- iface->view_source = kz_gecko_embed_view_source;
- iface->is_loading = kz_gecko_embed_is_loading;
- iface->get_title = kz_gecko_embed_get_title;
- iface->get_location = kz_gecko_embed_get_location;
- iface->ensure_title = kz_gecko_embed_ensure_title;
- iface->get_link_message = kz_gecko_embed_get_link_message;
- iface->get_progress = kz_gecko_embed_get_progress;
- iface->can_cut_selection = kz_gecko_embed_can_cut_selection;
- iface->can_copy_selection = kz_gecko_embed_can_copy_selection;
- iface->can_paste = kz_gecko_embed_can_paste;
- iface->cut_selection = kz_gecko_embed_cut_selection;
- iface->copy_selection = kz_gecko_embed_copy_selection;
- iface->paste = kz_gecko_embed_paste;
- iface->select_all = kz_gecko_embed_select_all;
- iface->get_selection_string = kz_gecko_embed_get_selection_string;
- iface->find = kz_gecko_embed_find;
- iface->incremental_search = kz_gecko_embed_incremental_search;
- iface->selection_is_collapsed = kz_gecko_embed_selection_is_collapsed;
- iface->get_links = kz_gecko_embed_get_links;
- iface->get_dest_anchors = kz_gecko_embed_get_dest_anchors;
- iface->copy_page = kz_gecko_embed_copy_page;
- iface->shistory_copy = kz_gecko_embed_shistory_copy;
- iface->shistory_get_pos = kz_gecko_embed_shistory_get_pos;
- iface->shistory_get_nth = kz_gecko_embed_shistory_get_nth;
- iface->reload = kz_gecko_embed_reload;
- iface->stop_load = kz_gecko_embed_stop_load;
- iface->go_back = kz_gecko_embed_go_back;
- iface->go_forward = kz_gecko_embed_go_forward;
- iface->can_go_back = kz_gecko_embed_can_go_back;
- iface->can_go_forward = kz_gecko_embed_can_go_forward;
- iface->can_go_nav_link = kz_gecko_embed_can_go_nav_link;
- iface->go_nav_link = kz_gecko_embed_go_nav_link;
- iface->append_nav_link = kz_gecko_embed_append_nav_link;
+ iface->load_url = load_url;
+ iface->view_source = view_source;
+ iface->is_loading = is_loading;
+ iface->get_title = get_title;
+ iface->get_location = get_location;
+ iface->ensure_title = ensure_title;
+ iface->get_link_message = get_link_message;
+ iface->get_progress = get_progress;
+ iface->can_cut_selection = can_cut_selection;
+ iface->can_copy_selection = can_copy_selection;
+ iface->can_paste = can_paste;
+ iface->cut_selection = cut_selection;
+ iface->copy_selection = copy_selection;
+ iface->paste = paste;
+ iface->select_all = select_all;
+ iface->get_selection_string = get_selection_string;
+ iface->find = find;
+ iface->incremental_search = incremental_search;
+ iface->selection_is_collapsed = selection_is_collapsed;
+ iface->get_links = get_links;
+ iface->get_dest_anchors = get_dest_anchors;
+ iface->copy_page = copy_page;
+ iface->shistory_copy = shistory_copy;
+ iface->shistory_get_pos = shistory_get_pos;
+ iface->shistory_get_nth = shistory_get_nth;
+ iface->reload = reload;
+ iface->stop_load = stop_load;
+ iface->go_back = go_back;
+ iface->go_forward = go_forward;
+ iface->can_go_back = can_go_back;
+ iface->can_go_forward = can_go_forward;
+ iface->can_go_nav_link = can_go_nav_link;
+ iface->go_nav_link = go_nav_link;
+ iface->append_nav_link = append_nav_link;
iface->set_nav_link = NULL;
- iface->set_nth_nav_link = kz_gecko_embed_set_nth_nav_link;
+ iface->set_nth_nav_link = set_nth_nav_link;
iface->get_nav_link = NULL;
- iface->get_nth_nav_link = kz_gecko_embed_get_nth_nav_link;
- iface->get_nav_links = kz_gecko_embed_get_nav_links;
- iface->go_history_index = kz_gecko_embed_go_history_index;
- iface->do_command = kz_gecko_embed_do_command;
- iface->can_do_command = kz_gecko_embed_can_do_command;
- 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;
- iface->set_encoding = kz_gecko_embed_set_encoding;
- iface->get_encoding = kz_gecko_embed_get_encoding;
- iface->print = kz_gecko_embed_print;
- iface->print_preview = kz_gecko_embed_print_preview;
- iface->get_printer_list = kz_gecko_embed_get_printer_list;
- iface->create_thumbnail = kz_gecko_embed_create_thumbnail;
- iface->save_with_content = kz_gecko_embed_save_with_content;
- iface->set_text_into_textarea = kz_gecko_embed_set_text_into_textarea;
- iface->get_text_from_textarea = kz_gecko_embed_get_text_from_textarea;
- iface->zoom_set = kz_gecko_embed_zoom_set;
- iface->zoom_get = kz_gecko_embed_zoom_get;
- iface->set_text_size = kz_gecko_embed_set_text_size;
- iface->get_text_size = kz_gecko_embed_get_text_size;
- iface->get_html_with_contents = kz_gecko_embed_get_html_with_contents;
- iface->set_history = kz_gecko_embed_set_history;
- iface->get_history = kz_gecko_embed_get_history;
- iface->get_last_modified = kz_gecko_embed_get_last_modified;
- iface->fine_scroll = kz_gecko_embed_fine_scroll;
- iface->page_up = kz_gecko_embed_page_up;
- iface->page_down = kz_gecko_embed_page_down;
- iface->get_allow_javascript = kz_gecko_embed_get_allow_javascript;
- iface->set_allow_javascript = kz_gecko_embed_set_allow_javascript;
- iface->get_allow_images = kz_gecko_embed_get_allow_images;
- iface->set_allow_images = kz_gecko_embed_set_allow_images;
- iface->show_page_certificate = kz_gecko_embed_show_page_certificate;
+ iface->get_nth_nav_link = get_nth_nav_link;
+ iface->get_nav_links = get_nav_links;
+ iface->go_history_index = go_history_index;
+ iface->do_command = do_command;
+ iface->can_do_command = can_do_command;
+ iface->get_lock = get_lock;
+ iface->set_lock = set_lock;
+ iface->get_body_text = get_body_text;
+ iface->set_encoding = set_encoding;
+ iface->get_encoding = get_encoding;
+ iface->print = print;
+ iface->print_preview = print_preview;
+ iface->get_printer_list = get_printer_list;
+ iface->create_thumbnail = create_thumbnail;
+ iface->save_with_content = save_with_content;
+ iface->set_text_into_textarea = set_text_into_textarea;
+ iface->get_text_from_textarea = get_text_from_textarea;
+ iface->zoom_set = zoom_set;
+ iface->zoom_get = zoom_get;
+ iface->set_text_size = set_text_size;
+ iface->get_text_size = get_text_size;
+ iface->get_html_with_contents = get_html_with_contents;
+ iface->set_history = set_history;
+ iface->get_history = get_history;
+ iface->get_last_modified = get_last_modified;
+ iface->fine_scroll = fine_scroll;
+ iface->page_up = page_up;
+ iface->page_down = page_down;
+ iface->get_allow_javascript = get_allow_javascript;
+ iface->set_allow_javascript = set_allow_javascript;
+ iface->get_allow_images = get_allow_images;
+ iface->set_allow_images = set_allow_images;
+ iface->show_page_certificate = show_page_certificate;
iface->link_message = NULL;
iface->js_status = NULL;
@@ -636,7 +613,7 @@
#endif
priv->last_highlight = NULL;
- kz_gecko_embed_load_url(KZ_EMBED(kzembed), "about:blank");
+ load_url(KZ_EMBED(kzembed), "about:blank");
}
static GObject*
@@ -740,7 +717,7 @@
}
}
KZ_CONF_GET("Global", "use_javascript", java, BOOL);
- kz_gecko_embed_set_allow_javascript(KZ_EMBED(widget), java);
+ set_allow_javascript(KZ_EMBED(widget), java);
}
@@ -796,7 +773,7 @@
static void
-kz_gecko_embed_load_url (KzEmbed *kzembed, const gchar *url)
+load_url (KzEmbed *kzembed, const gchar *url)
{
gchar *start_page = NULL;
@@ -822,7 +799,7 @@
static void
-kz_gecko_embed_view_source (KzEmbed *kzembed, const gchar *url)
+view_source (KzEmbed *kzembed, const gchar *url)
{
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
KzMozWrapper *wrapper = priv->wrapper;
@@ -860,7 +837,7 @@
static gboolean
-kz_gecko_embed_is_loading (KzEmbed *kzembed)
+is_loading (KzEmbed *kzembed)
{
return KZ_IS_GECKO_EMBED(kzembed)
? KZ_GECKO_EMBED_GET_PRIVATE(kzembed)->is_loading
@@ -869,14 +846,14 @@
static const gchar *
-kz_gecko_embed_get_title (KzEmbed *kzembed)
+get_title (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
return KZ_GECKO_EMBED_GET_PRIVATE(kzembed)->title;
}
static gchar *
-kz_gecko_embed_ensure_title (KzEmbed *kzembed)
+ensure_title (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -887,7 +864,7 @@
if (priv->location && *priv->location)
{
- if (kz_gecko_embed_is_loading(kzembed))
+ if (is_loading(kzembed))
{
return g_strdup_printf(_("Loading %s ..."),
priv->location);
@@ -899,7 +876,7 @@
}
else
{
- if (kz_gecko_embed_is_loading(kzembed))
+ if (is_loading(kzembed))
return g_strdup(_("Loading..."));
}
@@ -907,7 +884,7 @@
}
static gchar *
-kz_gecko_embed_get_link_message (KzEmbed *kzembed)
+get_link_message (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_GECKO_EMBED(kzembed), NULL);
@@ -916,7 +893,7 @@
static gdouble
-kz_gecko_embed_get_progress (KzEmbed *kzembed)
+get_progress (KzEmbed *kzembed)
{
gdouble progress;
@@ -940,7 +917,7 @@
static const gchar *
-kz_gecko_embed_get_location (KzEmbed *kzembed)
+get_location (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -1052,7 +1029,7 @@
KZ_CONF_GET("History", "store_cache", store_cache, BOOL);
gchar *cache = g_strconcat("file://", KZ_GET_HISTORY_DIR, NULL);
- const gchar *location = kz_gecko_embed_get_location(KZ_EMBED(kzembed));
+ const gchar *location = get_location(KZ_EMBED(kzembed));
if (location &&
(g_str_has_prefix(location, "http:") ||
g_str_has_prefix(location, "https:") ||
@@ -1094,7 +1071,7 @@
if (KZ_GET_SEARCH)
{
- const gchar *title = kz_gecko_embed_get_title(KZ_EMBED(kzembed));
+ const gchar *title = get_title(KZ_EMBED(kzembed));
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(domDoc);
nsCOMPtr<nsIDOMSerializer> serializer;
@@ -1370,7 +1347,7 @@
#endif
static gboolean
-kz_gecko_embed_can_cut_selection (KzEmbed *kzembed)
+can_cut_selection (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -1386,7 +1363,7 @@
}
static gboolean
-kz_gecko_embed_can_copy_selection (KzEmbed *kzembed)
+can_copy_selection (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -1402,7 +1379,7 @@
}
static gboolean
-kz_gecko_embed_can_paste (KzEmbed *kzembed)
+can_paste (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -1418,7 +1395,7 @@
}
static void
-kz_gecko_embed_cut_selection (KzEmbed *kzembed)
+cut_selection (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -1428,7 +1405,7 @@
}
static void
-kz_gecko_embed_copy_selection (KzEmbed *kzembed)
+copy_selection (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -1438,7 +1415,7 @@
}
static void
-kz_gecko_embed_paste (KzEmbed *kzembed)
+paste (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -1448,7 +1425,7 @@
}
static void
-kz_gecko_embed_select_all (KzEmbed *kzembed)
+select_all (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -1458,7 +1435,7 @@
}
static gchar *
-kz_gecko_embed_get_selection_string(KzEmbed *kzembed)
+get_selection_string(KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -1482,7 +1459,7 @@
}
static gchar *
-kz_gecko_embed_get_html_with_contents (KzEmbed *kzembed, const gchar *storedir)
+get_html_with_contents (KzEmbed *kzembed, const gchar *storedir)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -1756,8 +1733,7 @@
static gboolean
-kz_gecko_embed_find (KzEmbed *kzembed, const char *keyword,
- gboolean backward)
+find (KzEmbed *kzembed, const char *keyword, gboolean backward)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
g_return_val_if_fail(keyword, FALSE);
@@ -1835,8 +1811,7 @@
}
static gboolean
-kz_gecko_embed_incremental_search (KzEmbed *kzembed, const char *keyword,
- gboolean backward)
+incremental_search (KzEmbed *kzembed, const char *keyword, gboolean backward)
{
nsresult rv;
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -1924,7 +1899,7 @@
}
static gboolean
-kz_gecko_embed_selection_is_collapsed (KzEmbed *kzembed)
+selection_is_collapsed (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), TRUE);
@@ -1946,8 +1921,7 @@
static gboolean
-kz_gecko_embed_get_links (KzEmbed *kzembed, GList **list,
- gboolean selected_only)
+get_links (KzEmbed *kzembed, GList **list, gboolean selected_only)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -1980,7 +1954,7 @@
static gboolean
-kz_gecko_embed_get_dest_anchors (KzEmbed *kzembed, GList **list)
+get_dest_anchors (KzEmbed *kzembed, GList **list)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -2308,7 +2282,7 @@
}
static void
-kz_gecko_embed_reload (KzEmbed *kzembed, KzEmbedReloadFlag flags)
+reload (KzEmbed *kzembed, KzEmbedReloadFlag flags)
{
gint32 moz_flags;
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2339,7 +2313,7 @@
static void
-kz_gecko_embed_stop_load (KzEmbed *kzembed)
+stop_load (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
gtk_moz_embed_stop_load(GTK_MOZ_EMBED(kzembed));
@@ -2347,7 +2321,7 @@
static void
-kz_gecko_embed_go_back (KzEmbed *kzembed)
+go_back (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
gtk_moz_embed_go_back(GTK_MOZ_EMBED(kzembed));
@@ -2355,7 +2329,7 @@
static void
-kz_gecko_embed_go_forward (KzEmbed *kzembed)
+go_forward (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
gtk_moz_embed_go_forward(GTK_MOZ_EMBED(kzembed));
@@ -2363,22 +2337,21 @@
static gboolean
-kz_gecko_embed_can_go_back (KzEmbed *kzembed)
+can_go_back (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
return gtk_moz_embed_can_go_back(GTK_MOZ_EMBED(kzembed));
}
static gboolean
-kz_gecko_embed_can_go_forward (KzEmbed *kzembed)
+can_go_forward (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
return gtk_moz_embed_can_go_forward(GTK_MOZ_EMBED(kzembed));
}
static gboolean
-kz_gecko_embed_can_go_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link)
+can_go_nav_link (KzEmbed *kzembed, KzEmbedNavLink link)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -2388,8 +2361,7 @@
}
static void
-kz_gecko_embed_go_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link)
+go_nav_link (KzEmbed *kzembed, KzEmbedNavLink link)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2402,9 +2374,9 @@
static void
-kz_gecko_embed_append_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- KzNavi *navi)
+append_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ KzNavi *navi)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
g_return_if_fail(link < KZ_EMBED_LINK_GUARD);
@@ -2417,10 +2389,10 @@
}
static void
-kz_gecko_embed_set_nth_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- KzNavi *navi,
- guint n)
+set_nth_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ KzNavi *navi,
+ guint n)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
g_return_if_fail(link < KZ_EMBED_LINK_GUARD);
@@ -2448,9 +2420,7 @@
static KzNavi *
-kz_gecko_embed_get_nth_nav_link (KzEmbed *kzembed,
- KzEmbedNavLink link,
- guint n)
+get_nth_nav_link (KzEmbed *kzembed, KzEmbedNavLink link, guint n)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -2461,8 +2431,7 @@
static GList *
-kz_gecko_embed_get_nav_links (KzEmbed *kzembed,
- KzEmbedNavLink link)
+get_nav_links (KzEmbed *kzembed, KzEmbedNavLink link)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -2473,7 +2442,7 @@
static void
-kz_gecko_embed_go_history_index (KzEmbed *kzembed, gint index)
+go_history_index (KzEmbed *kzembed, gint index)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2484,8 +2453,7 @@
}
static void
-kz_gecko_embed_copy_page (KzEmbed *kzembed, KzEmbed *dkzembed,
- KzEmbedCopyType type)
+copy_page (KzEmbed *kzembed, KzEmbed *dkzembed, KzEmbedCopyType type)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
g_return_if_fail(KZ_IS_GECKO_EMBED(dkzembed));
@@ -2513,11 +2481,11 @@
static gboolean
-kz_gecko_embed_shistory_copy (KzEmbed *source,
- KzEmbed *dest,
- gboolean back_history,
- gboolean forward_history,
- gboolean set_current)
+shistory_copy (KzEmbed *source,
+ KzEmbed *dest,
+ gboolean back_history,
+ gboolean forward_history,
+ gboolean set_current)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(source), FALSE);
g_return_val_if_fail(KZ_IS_GECKO_EMBED(dest), FALSE);
@@ -2533,8 +2501,7 @@
/* picked from galeon-1.3.11a */
static gboolean
-kz_gecko_embed_shistory_get_pos (KzEmbed *kzembed,
- int *pos, int *count)
+shistory_get_pos (KzEmbed *kzembed, int *pos, int *count)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -2552,11 +2519,11 @@
/* picked from galeon-1.3.11a */
static void
-kz_gecko_embed_shistory_get_nth (KzEmbed *kzembed,
- int nth,
- gboolean is_relative,
- char **aUrl,
- char **aTitle)
+shistory_get_nth (KzEmbed *kzembed,
+ int nth,
+ gboolean is_relative,
+ char **aUrl,
+ char **aTitle)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2567,7 +2534,7 @@
if (is_relative)
{
int pos, count;
- if (kz_gecko_embed_shistory_get_pos(kzembed, &pos, &count))
+ if (shistory_get_pos(kzembed, &pos, &count))
pos += nth;
else
return;
@@ -2591,7 +2558,7 @@
static gboolean
-kz_gecko_embed_get_lock (KzEmbed *kzembed)
+get_lock (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -2600,7 +2567,7 @@
static void
-kz_gecko_embed_set_lock (KzEmbed *kzembed, gboolean lock)
+set_lock (KzEmbed *kzembed, gboolean lock)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
@@ -2609,7 +2576,7 @@
static gchar *
-kz_gecko_embed_get_body_text(KzEmbed *kzembed)
+get_body_text(KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -2626,7 +2593,7 @@
static void
-kz_gecko_embed_set_encoding (KzEmbed *kzembed, const char *encoding)
+set_encoding (KzEmbed *kzembed, const char *encoding)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2636,7 +2603,7 @@
}
static void
-kz_gecko_embed_get_encoding (KzEmbed *kzembed, char **encoding, gboolean *forced)
+get_encoding (KzEmbed *kzembed, char **encoding, gboolean *forced)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2646,7 +2613,7 @@
}
static gboolean
-kz_gecko_embed_save_with_content (KzEmbed *kzembed, const char *rawfilename)
+save_with_content (KzEmbed *kzembed, const char *rawfilename)
{
nsresult rv;
KzMozWrapper *wrapper = NULL;
@@ -2714,7 +2681,7 @@
static void
-kz_gecko_embed_print (KzEmbed *kzembed)
+print (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2726,7 +2693,7 @@
static void
-kz_gecko_embed_print_preview (KzEmbed *kzembed)
+print_preview (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2738,7 +2705,7 @@
static GList *
-kz_gecko_embed_get_printer_list (KzEmbed *kzembed)
+get_printer_list (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -2753,8 +2720,7 @@
static gchar *
-kz_gecko_embed_get_text_from_textarea (KzEmbed *kzembed,
- gpointer element)
+get_text_from_textarea (KzEmbed *kzembed, gpointer element)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
@@ -2776,9 +2742,7 @@
static gboolean
-kz_gecko_embed_set_text_into_textarea (KzEmbed *kzembed,
- gpointer element,
- const gchar *text)
+set_text_into_textarea (KzEmbed *kzembed, gpointer element, const gchar *text)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -2862,7 +2826,7 @@
static void
-kz_gecko_embed_create_thumbnail (KzEmbed *kzembed, EggPixbufThumbSize size)
+create_thumbnail (KzEmbed *kzembed, EggPixbufThumbSize size)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2876,7 +2840,7 @@
if (uri[0] == '\0')
return;
- guint last_modified = kz_gecko_embed_get_last_modified(kzembed);
+ guint last_modified = get_last_modified(kzembed);
if (last_modified == 0)
{
GTimeVal now;
@@ -2925,7 +2889,7 @@
void
-kz_gecko_embed_do_command (KzEmbed *kzembed, const char *command)
+do_command (KzEmbed *kzembed, const char *command)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2939,7 +2903,7 @@
}
static gboolean
-kz_gecko_embed_can_do_command (KzEmbed *kzembed, const char *command)
+can_do_command (KzEmbed *kzembed, const char *command)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -2955,7 +2919,7 @@
}
static void
-kz_gecko_embed_zoom_set (KzEmbed *kzembed, int zoom, gboolean reflow)
+zoom_set (KzEmbed *kzembed, int zoom, gboolean reflow)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2963,18 +2927,18 @@
priv->wrapper->SetImageZoom ((float)(zoom) / 100);
- kz_gecko_embed_set_text_size(kzembed, zoom, reflow);
+ set_text_size(kzembed, zoom, reflow);
}
static int
-kz_gecko_embed_zoom_get (KzEmbed *kzembed)
+zoom_get (KzEmbed *kzembed)
{
- return kz_gecko_embed_get_text_size(kzembed);
+ return get_text_size(kzembed);
}
static void
-kz_gecko_embed_set_text_size (KzEmbed *kzembed, int zoom, gboolean reflow)
+set_text_size (KzEmbed *kzembed, int zoom, gboolean reflow)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -2984,7 +2948,7 @@
}
static int
-kz_gecko_embed_get_text_size (KzEmbed *kzembed)
+get_text_size (KzEmbed *kzembed)
{
float f;
int zoom;
@@ -3004,7 +2968,7 @@
}
static void
-kz_gecko_embed_set_history (KzEmbed *kzembed, KzBookmark *history)
+set_history (KzEmbed *kzembed, KzBookmark *history)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
g_return_if_fail(KZ_IS_BOOKMARK(history));
@@ -3049,11 +3013,11 @@
/* set current */
gint cur = kz_bookmark_get_current(history);
- kz_gecko_embed_go_history_index(kzembed, cur);
+ go_history_index(kzembed, cur);
}
static void
-kz_gecko_embed_get_history (KzEmbed *kzembed, KzBookmark *history)
+get_history (KzEmbed *kzembed, KzBookmark *history)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
g_return_if_fail(KZ_IS_BOOKMARK(history));
@@ -3082,10 +3046,7 @@
gchar *title = NULL, *uri = NULL;
KzBookmark *bookmark = NULL;
- kz_gecko_embed_shistory_get_nth (kzembed,
- i, FALSE,
- &uri,
- &title);
+ shistory_get_nth(kzembed, i, FALSE, &uri, &title);
if (tab)
{
bookmark = KZ_BOOKMARK(tab->data);
@@ -3137,7 +3098,7 @@
static guint
-kz_gecko_embed_get_last_modified (KzEmbed *kzembed)
+get_last_modified (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), 0);
@@ -3168,8 +3129,7 @@
static void
-kz_gecko_embed_fine_scroll (KzEmbed *kzembed,
- int horiz, int vert)
+fine_scroll (KzEmbed *kzembed, int horiz, int vert)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -3181,7 +3141,7 @@
}
static void
-kz_gecko_embed_page_up (KzEmbed *kzembed)
+page_up (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -3193,7 +3153,7 @@
}
static void
-kz_gecko_embed_page_down (KzEmbed *kzembed)
+page_down (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -3205,7 +3165,7 @@
}
static gboolean
-kz_gecko_embed_get_allow_javascript (KzEmbed *kzembed)
+get_allow_javascript (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -3220,7 +3180,7 @@
}
static void
-kz_gecko_embed_set_allow_javascript (KzEmbed *kzembed, gboolean allow)
+set_allow_javascript (KzEmbed *kzembed, gboolean allow)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -3232,7 +3192,7 @@
}
static gboolean
-kz_gecko_embed_get_allow_images (KzEmbed *kzembed)
+get_allow_images (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
@@ -3247,7 +3207,7 @@
}
static void
-kz_gecko_embed_set_allow_images (KzEmbed *kzembed, gboolean allow)
+set_allow_images (KzEmbed *kzembed, gboolean allow)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
@@ -3259,7 +3219,7 @@
}
static void
-kz_gecko_embed_show_page_certificate (KzEmbed *kzembed)
+show_page_certificate (KzEmbed *kzembed)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));