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

Merge build_thumbnail_path into Midori.SpeedDial

This commit is contained in:
Christian Dywan 2012-09-09 21:50:31 +02:00
parent 1ad675e24e
commit fefc3b2cbe
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
midori/midori-speeddial.vala
View File

@ -15,7 +15,6 @@ namespace Katze {
namespace Sokoke { namespace Sokoke {
extern static string js_script_eval (void* ctx, string script, void* error); extern static string js_script_eval (void* ctx, string script, void* error);
extern static string build_thumbnail_path (string uri);
} }
namespace Midori { namespace Midori {
@ -95,7 +94,7 @@ namespace Midori {
string uri = keyfile.get_string (tile, "uri"); string uri = keyfile.get_string (tile, "uri");
if (img != null && uri[0] != '\0' && uri[0] != '#') { if (img != null && uri[0] != '\0' && uri[0] != '#') {
uchar[] decoded = Base64.decode (img); uchar[] decoded = Base64.decode (img);
FileUtils.set_data (Sokoke.build_thumbnail_path (uri), decoded); FileUtils.set_data (build_thumbnail_path (uri), decoded);
} }
keyfile.remove_key (tile, "img"); keyfile.remove_key (tile, "img");
} }
@ -137,7 +136,7 @@ namespace Midori {
Katze.mkdir_with_parents (Path.build_path (Path.DIR_SEPARATOR_S, Katze.mkdir_with_parents (Path.build_path (Path.DIR_SEPARATOR_S,
Paths.get_cache_dir (), "thumbnails"), 0700); Paths.get_cache_dir (), "thumbnails"), 0700);
string filename = Sokoke.build_thumbnail_path (uri); string filename = build_thumbnail_path (uri);
try { try {
img.save (filename, "png", null, "compression", "7", null); img.save (filename, "png", null, "compression", "7", null);
} }
@ -147,6 +146,11 @@ namespace Midori {
save (); save ();
} }
string build_thumbnail_path (string filename) {
string thumbnail = Checksum.compute_for_string (ChecksumType.MD5, filename) + ".png";
return Path.build_filename (Paths.get_cache_dir (), "thumbnails", thumbnail);
}
public unowned string get_html (bool close_buttons_left, GLib.Object view) throws Error { public unowned string get_html (bool close_buttons_left, GLib.Object view) throws Error {
bool load_missing = true; bool load_missing = true;
@ -211,7 +215,7 @@ namespace Midori {
string uri = keyfile.get_string (tile, "uri"); string uri = keyfile.get_string (tile, "uri");
if (uri != null && uri.str ("://") != null && tile.has_prefix ("Dial ")) { if (uri != null && uri.str ("://") != null && tile.has_prefix ("Dial ")) {
string title = keyfile.get_string (tile, "title"); string title = keyfile.get_string (tile, "title");
string thumb_filename = Sokoke.build_thumbnail_path (uri); string thumb_filename = build_thumbnail_path (uri);
uint slot = tile.substring (5, -1).to_int (); uint slot = tile.substring (5, -1).to_int ();
string encoded; string encoded;
try { try {
@ -265,7 +269,7 @@ namespace Midori {
if (action == "delete") { if (action == "delete") {
string uri = keyfile.get_string (dial_id, "uri"); string uri = keyfile.get_string (dial_id, "uri");
string file_path = Sokoke.build_thumbnail_path (uri); string file_path = build_thumbnail_path (uri);
keyfile.remove_group (dial_id); keyfile.remove_group (dial_id);
FileUtils.unlink (file_path); FileUtils.unlink (file_path);
} }

17
midori/sokoke.c
View File

@ -1219,23 +1219,6 @@ sokoke_widget_copy_clipboard (GtkWidget* widget,
gtk_clipboard_set_text (clipboard, text ? text : "", -1); gtk_clipboard_set_text (clipboard, text ? text : "", -1);
} }
gchar*
sokoke_build_thumbnail_path (const gchar* name)
{
gchar* path = NULL;
if (name != NULL)
{
gchar* checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, name, -1);
gchar* filename = g_strdup_printf ("%s.png", checksum);
path = g_build_filename (midori_paths_get_cache_dir (), "thumbnails", filename, NULL);
g_free (filename);
g_free (checksum);
}
return path;
}
static gboolean static gboolean
sokoke_entry_has_placeholder_text (GtkEntry* entry) sokoke_entry_has_placeholder_text (GtkEntry* entry)
{ {

3
midori/sokoke.h
View File

@ -137,9 +137,6 @@ void
sokoke_widget_copy_clipboard (GtkWidget* widget, sokoke_widget_copy_clipboard (GtkWidget* widget,
const gchar* text); const gchar* text);
gchar*
sokoke_build_thumbnail_path (const gchar* name);
GtkWidget* GtkWidget*
sokoke_search_entry_new (const gchar* placeholder_text); sokoke_search_entry_new (const gchar* placeholder_text);