Imported Upstream version 0.6.0upstream/0.6.0

1 files changed, 41 insertions, 41 deletions

diff --git a/src/images/icon.vala b/src/images/icon.vala
index 6dfb53b..9cfccf8 100644
--- a/src/images/icon.vala
+++ b/src/images/icon.vala
@@ -1,23 +1,23 @@
-/* 
-Copyright (c) 2011 by Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
+/////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2011-2015 by Simon Schneegans
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 ///  A class representing a square-shaped icon, loaded from the users
 /// icon theme.
 /////////////////////////////////////////////////////////////////////////
@@ -30,34 +30,34 @@ public class Icon : Image {
     /////////////////////////////////////////////////////////////////////
 
     private static Gee.HashMap<string, Cairo.ImageSurface?> cache { private get; private set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Initializes the cache.
     /////////////////////////////////////////////////////////////////////
-    
+
     public static void init() {
         clear_cache();
-        
+
         Gtk.IconTheme.get_default().changed.connect(() => {
             clear_cache();
         });
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Clears the cache.
     /////////////////////////////////////////////////////////////////////
-    
+
     public static void clear_cache() {
         cache = new Gee.HashMap<string, Cairo.ImageSurface?>();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Loads an icon from the current icon theme of the user.
     /////////////////////////////////////////////////////////////////////
-    
+
     public Icon(string icon_name, int size) {
         var cached = Icon.cache.get("%s@%u".printf(icon_name, size));
-        
+
         if (cached == null) {
             this.load_file_at_size(Icon.get_icon_file(icon_name, size), size, size);
             Icon.cache.set("%s@%u".printf(icon_name, size), this.surface);
@@ -65,56 +65,56 @@ public class Icon : Image {
             this.surface = cached;
         }
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Returns the size of the icon in pixels. Greetings to Liskov.
     /////////////////////////////////////////////////////////////////////
-    
+
     public int size() {
         return base.width();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Returns the icon name for a given GLib.Icon.
     /////////////////////////////////////////////////////////////////////
-    
+
     public static string get_icon_name(GLib.Icon? icon) {
         if (icon != null) {
             var icon_names = icon.to_string().split(" ");
-            
+
             foreach (var icon_name in icon_names) {
                 if (Gtk.IconTheme.get_default().has_icon(icon_name)) {
                     return icon_name;
                 }
             }
         }
-        
+
         return "";
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Returns the filename for a given system icon.
     /////////////////////////////////////////////////////////////////////
-    
+
     public static string get_icon_file(string icon_name, int size) {
         string result = "";
-        
+
         if (icon_name.contains("/")) {
             var file = GLib.File.new_for_path(icon_name);
             if(file.query_exists())
                 return icon_name;
-            
+
             warning("Icon \"" + icon_name + "\" not found! Using default icon...");
         }
-            
-        
+
+
         var icon_theme = Gtk.IconTheme.get_default();
         var file = icon_theme.lookup_icon(icon_name, size, 0);
         if (file != null) result = file.get_filename();
-        
+
         if (result == "") {
             warning("Icon \"" + icon_name + "\" not found! Using default icon...");
-        
+
             string[] default_icons = {"application-default-icon", "stock_unknown"};
             foreach (var icon in default_icons) {
                 file = icon_theme.lookup_icon(icon, size, 0);
@@ -123,11 +123,11 @@ public class Icon : Image {
                     break;
                 }
             }
-            
+
             if (result == "")
                 warning("No default icon found! Will be ugly...");
         }
-         
+
         return result;
     }
 }