Remove favicon support

koyuspace · Apr 29, 2021 · a477cce · a477cce
1 parent 7877950
commit a477cce
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,6 @@ A simple GTK Gopher/Gemini client written in Vala
 - Cache
 - Works on Linux-based smartphones
 - Tries to be as themeable as possible using GTK themes and icon packs
-- Favicons
 
 ## How to build/install?
 
@@ -36,7 +35,6 @@ Note: to build Fossil you need the following dependencies:
 - valac - the Vala compiler
 - meson - the build system
 - cmake - used by meson
-- gdk-pixbuf-2.0 - to resize favicons
 - python 3.x
 - json-glib
 - gnutls

diff --git a/src/gtk_ui/legacy_widget/tab_head.vala b/src/gtk_ui/legacy_widget/tab_head.vala
@@ -5,15 +5,13 @@ public class Fossil.GtkUi.LegacyWidget.TabHead : Gtk.Box {
 	private Fossil.GtkUi.LegacyWidget.Tab tab;
 	private Gtk.Spinner spinner = new Gtk.Spinner();
 	private Gtk.Image error_icon = new Gtk.Image.from_icon_name("dialog-error", Gtk.IconSize.LARGE_TOOLBAR);
-	public static Gtk.Image favicon = new Gtk.Image.from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 	private int title_chars = 25;
 
 	public TabHead(Fossil.GtkUi.LegacyWidget.Tab tab) {
 		close_button = new Gtk.Button.from_icon_name("window-close-symbolic");
 		close_button.relief = Gtk.ReliefStyle.NONE;
 		this.orientation = Gtk.Orientation.HORIZONTAL;
 		pack_start(spinner);
-		pack_start(favicon);
 		pack_start(error_icon);
 		pack_start(title);
 		pack_end(close_button);
@@ -32,7 +30,6 @@ public class Fossil.GtkUi.LegacyWidget.TabHead : Gtk.Box {
 		spinner.active = state == LOADING;
 		spinner.visible = state == LOADING;
 		error_icon.visible = state == ERROR;
-		favicon.visible = state != ERROR;
 		if (title.char_count() > title_chars){
 			if (title == tab.uri){
 				var startcut = title.index_of_nth_char(title_chars/2);

diff --git a/src/stores/about.vala b/src/stores/about.vala
@@ -8,7 +8,6 @@ public class Fossil.Store.About : Object, Fossil.Interface.ResourceStore {
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
 		var substore = substores.get(request.uri);
-		Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		if (substore != null) {
 			substore.request(request,filepath,upload);
 		} else {

diff --git a/src/stores/cache.vala b/src/stores/cache.vala
@@ -23,7 +23,6 @@ public class Fossil.Store.Cache : Object, Fossil.Interface.ResourceStore, Fossil
 			request.finish();
 		}
 		request.setResource(resource,"cache");
-		Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 	}
 
 	//if maxage is 0 assume the age doesn't matter

diff --git a/src/stores/file.vala b/src/stores/file.vala
@@ -12,7 +12,6 @@ public class Fossil.Store.File : Object, Fossil.Interface.ResourceStore {
 	}
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-	    Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		if (upload){
 			request.setStatus("error/noupload","Uploding not supported");
 			request.finish();

diff --git a/src/stores/finger.vala b/src/stores/finger.vala
@@ -4,7 +4,6 @@ public class Fossil.Store.Finger : Object, Fossil.Interface.ResourceStore {
 	public Fossil.Util.ConnectionHelper connection_helper = new Fossil.Util.ConnectionHelper();
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-	    Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		if (filepath == null){
 			request.setStatus("error/internal","Filepath required!");
 			request.finish();
@@ -86,18 +85,6 @@ private class Fossil.FingerResourceFetcher : Object {
 			var message = @"$query\r\n";
 			conn.output_stream.write (message.data);
 			print ("[finger] Wrote request\n");
-
-            try {
-                var file_from_http = File.new_for_uri(@"https://$host/favicon.ico");
-                File local_file = File.new_for_path("/tmp/fossil-favicon.ico");
-                file_from_http.copy(local_file, FileCopyFlags.OVERWRITE);
-                Gdk.Pixbuf pixbuf = new Gdk.Pixbuf.from_file("/tmp/fossil-favicon.ico");
-                var pxb = pixbuf.scale_simple(16, 16, Gdk.InterpType.BILINEAR);
-                Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_pixbuf(pxb);
-            } catch (Error e) {
-                Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
-            }
-
 			// Receive response
 			var input_stream = new DataInputStream (conn.input_stream);
 			var helper = new Fossil.Util.ResourceFileWriteHelper(request,resource.filepath,0);

diff --git a/src/stores/gemini.vala b/src/stores/gemini.vala
@@ -91,18 +91,6 @@ private class Fossil.GeminiResourceFetcher : Object {
 
 			bool beyond_header = false;
 			Fossil.Util.ResourceFileWriteHelper? helper = null;
-
-            try {
-                var file_from_http = File.new_for_uri(@"https://$host/favicon.ico");
-                File local_file = File.new_for_path("/tmp/fossil-favicon.ico");
-                file_from_http.copy(local_file, FileCopyFlags.OVERWRITE);
-                Gdk.Pixbuf pixbuf = new Gdk.Pixbuf.from_file("/tmp/fossil-favicon.ico");
-                var pxb = pixbuf.scale_simple(16, 16, Gdk.InterpType.BILINEAR);
-                Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_pixbuf(pxb);
-            } catch (Error e) {
-                Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
-            }
-
 			try{
 				var statusline = input_stream.read_line(null);
 				beyond_header = true;

diff --git a/src/stores/geminiupload.vala b/src/stores/geminiupload.vala
@@ -4,7 +4,6 @@ public class Fossil.Store.GeminiUpload : Object, Fossil.Interface.ResourceStore
 	public Fossil.Util.ConnectionHelper connection_helper = new Fossil.Util.ConnectionHelper();
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-		Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		// parse uri
 		var parsed_uri = new Fossil.Util.ParsedUri(request.uri,false);
 		if(!(parsed_uri.scheme == "gemini+upload")){

diff --git a/src/stores/geminiwrite.vala b/src/stores/geminiwrite.vala
@@ -4,7 +4,6 @@ public class Fossil.Store.GeminiWrite : Object, Fossil.Interface.ResourceStore {
 	public Fossil.Util.ConnectionHelper connection_helper = new Fossil.Util.ConnectionHelper();
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-	    Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		// parse uri
 		var parsed_uri = new Fossil.Util.ParsedUri(request.uri,false);
 		if(!(parsed_uri.scheme == "gemini+write")){

diff --git a/src/stores/gopher.vala b/src/stores/gopher.vala
@@ -125,17 +125,6 @@ public class Fossil.Gopher.ResourceFetcher : Object {
 
 		request.setStatus("loading");
 
-        try {
-            var file_from_http = File.new_for_uri(@"https://$host/favicon.ico");
-            File local_file = File.new_for_path("/tmp/fossil-favicon.ico");
-            file_from_http.copy(local_file, FileCopyFlags.OVERWRITE);
-            Gdk.Pixbuf pixbuf = new Gdk.Pixbuf.from_file("/tmp/fossil-favicon.ico");
-            var pxb = pixbuf.scale_simple(16, 16, Gdk.InterpType.BILINEAR);
-            Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_pixbuf(pxb);
-        } catch (Error e) {
-            Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
-        }
-
 		try {
 			//send gopher request
 			var message = @"$query\r\n";

diff --git a/src/stores/gopherwrite.vala b/src/stores/gopherwrite.vala
@@ -9,7 +9,6 @@ public class Fossil.Store.GopherWrite : Object, Fossil.Interface.ResourceStore {
 	//gopher+write(t|f)://<server>[:<port>]/<encoded_selector>
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-        Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		// parse uri
 		var parsed_uri = new Fossil.Util.ParsedUri(request.uri,false);
 		if(!(parsed_uri.scheme == "gopher+writet" || parsed_uri.scheme == "gopher+writef")){
@@ -206,8 +205,8 @@ public class Fossil.gopherwriteGopher.ResourceUploader : Object {
 			return true;
 		} catch (GLib.Error e) {
 				request.setStatus("error/internal","Error while reading file:\n"+e.message);
-		    print("[gopherwrite][error] Error while reading file:\n"+e.message);
-		    return false;
+			print("[gopherwrite][error] Error while reading file:\n"+e.message);
+			return false;
 		}
 	}
 

diff --git a/src/stores/internal.vala b/src/stores/internal.vala
@@ -1,7 +1,6 @@
 public class Fossil.Store.Internal : Object, Fossil.Interface.ResourceStore {
 
 	public void request(Fossil.Request request,string? filepath = null, bool upload = false){
-	    Fossil.GtkUi.LegacyWidget.TabHead.favicon.set_from_icon_name("text-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
 		if (filepath == null){
 			request.setStatus("error/internal","Filepath required!");
 			request.finish();
@@ -87,8 +86,8 @@ Praesent metus quam, accumsan eget nunc a, pellentesque sodales velit. Aliquam u
 			resource.add_metadata("text/plain","Hello World");
 			request.setResource(resource,"fossil");
 		} else if (request.uri == "fossil://about") {
-		    var helper = new Fossil.Util.ResourceFileWriteHelper(request,filepath,0);
-            helper.appendString("# About
+			var helper = new Fossil.Util.ResourceFileWriteHelper(request,filepath,0);
+			helper.appendString("# About
 Fossil version 1.0
 
 A gemini/gopher client originally written by Baschdel as Dragonstone, now forked and maintained by koyu.space under the name Fossil