dcowan/webpin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed some warnings

Browse source
This commit is contained in:
Artem Anufrij 2018-02-05 19:58:04 +01:00
parent fbe9192d11
commit 16adac925a
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Widgets/Views/Editor.vala
View file

@ -213,7 +213,7 @@ namespace Webpin.Widgets.Views {
grab_timer = Timeout.add ( grab_timer = Timeout.add (
500, 500,
() => { () => {
if (tmp_icon_file != "" ){ if (tmp_icon_file != "" ) {
FileUtils.remove (tmp_icon_file); FileUtils.remove (tmp_icon_file);
tmp_icon_file = ""; tmp_icon_file = "";
} }
@ -343,17 +343,27 @@ namespace Webpin.Widgets.Views {
tmp_icon_ext = ".svg"; tmp_icon_ext = ".svg";
} }
tmp_icon_file = GLib.Path.build_filename (WebpinApp.instance.CACHE_FOLDER, Random.next_int ().to_string () + tmp_icon_ext); tmp_icon_file = GLib.Path.build_filename (Environment.get_tmp_dir (), Random.next_int ().to_string () + tmp_icon_ext);
var s_file = File.new_for_uri (url); var s_file = File.new_for_uri (url);
var d_file = File.new_for_path (tmp_icon_file); var d_file = File.new_for_path (tmp_icon_file);
if (s_file.copy (d_file, FileCopyFlags.OVERWRITE) && tmp_icon_ext != ".svg") { bool copy_done = false;
var pixbuf = new Gdk.Pixbuf.from_file (tmp_icon_file); try {
if (pixbuf.width < 48 || pixbuf.height < 48) { copy_done = s_file.copy (d_file, FileCopyFlags.OVERWRITE);
FileUtils.remove (tmp_icon_file); } catch (Error err) {
tmp_icon_file = ""; warning (err.message);
tmp_icon_ext = ""; }
if (copy_done && tmp_icon_ext != ".svg") {
try {
var pixbuf = new Gdk.Pixbuf.from_file (tmp_icon_file);
if (pixbuf.width < 48 || pixbuf.height < 48) {
FileUtils.remove (tmp_icon_file);
tmp_icon_file = "";
tmp_icon_ext = "";
}
} catch (Error err) {
warning (err.message);
} }
} }
} }