debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use static variable to store speeddial markup.

Browse source 
While it does not make anything faster, it causess way less I/O.
This commit is contained in:
Paweł Forysiuk 2011-08-07 00:46:06 +02:00 committed by Christian Dywan
parent 1cdda41b59
commit aeef4e4ee3
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-view.c
View file

@ -198,6 +198,8 @@ enum {
static guint signals[LAST_SIGNAL]; static guint signals[LAST_SIGNAL];
static gchar* speeddial_markup = NULL;
static void static void
midori_view_finalize (GObject* object); midori_view_finalize (GObject* object);
@ -3744,15 +3746,12 @@ prepare_speed_dial_html (MidoriView* view)
cols * (thumb_size + 60), cols * (thumb_size + 60),
thumb_size < 160 ? "hidden" : "visible"); thumb_size < 160 ? "hidden" : "visible");
if (!katze_object_get_boolean (view->settings, "enable-scripts"))
{
g_string_append (markup, g_string_append (markup,
"<style type=\"text/css\">" "<noscript><style type=\"text/css\">"
"#content h4 span:before { visibility: hidden; }\n" "#content h4 span:before { visibility: hidden; }\n"
"div.config { visibility: hidden; }\n" "div.config { visibility: hidden; }\n"
".cross { visibility:hidden; }\n" ".cross { visibility:hidden; }\n"
".activated p { background-image: none; }</style>"); ".activated p { background-image: none; }</style></noscript>");
}
while (slot <= rows * cols) while (slot <= rows * cols)
{ {
@ -3863,9 +3862,11 @@ midori_view_set_uri (MidoriView* view,
katze_assign (view->uri, g_strdup ("")); katze_assign (view->uri, g_strdup (""));
katze_item_set_uri (view->item, ""); katze_item_set_uri (view->item, "");
data = prepare_speed_dial_html (view); if (speeddial_markup == NULL);
speeddial_markup = prepare_speed_dial_html (view);
midori_view_load_alternate_string (view, midori_view_load_alternate_string (view,
data, "res:/", "about:blank", NULL); speeddial_markup, "res:/", "about:blank", NULL);
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
if (g_getenv ("MIDORI_STARTTIME") != NULL) if (g_getenv ("MIDORI_STARTTIME") != NULL)
@ -3874,7 +3875,6 @@ midori_view_set_uri (MidoriView* view,
g_timer_destroy (timer); g_timer_destroy (timer);
} }
#endif #endif
g_free (data);
} }
/* This is not prefectly elegant, but creating /* This is not prefectly elegant, but creating
special pages inline is the simplest solution. */ special pages inline is the simplest solution. */
@ -5513,6 +5513,7 @@ midori_view_speed_dial_save (MidoriView* view,
config_file = g_build_filename (sokoke_set_config_dir (NULL), "speeddial", NULL); config_file = g_build_filename (sokoke_set_config_dir (NULL), "speeddial", NULL);
sokoke_key_file_save_to_file (key_file, config_file, NULL); sokoke_key_file_save_to_file (key_file, config_file, NULL);
katze_assign (speeddial_markup, prepare_speed_dial_html (view));
i = 0; i = 0;
while ((tab = midori_browser_get_nth_tab (browser, i++))) while ((tab = midori_browser_get_nth_tab (browser, i++)))