Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

1 files changed, 43 insertions, 43 deletions

diff --git a/src/pies/pie.vala b/src/pies/pie.vala
index fa205c7..1699ada 100644
--- a/src/pies/pie.vala
+++ b/src/pies/pie.vala
@@ -1,109 +1,109 @@
-/* 
-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 {
 
-/////////////////////////////////////////////////////////////////////////    
-/// This class stores information on a pie. A pie consists of a name, an 
+/////////////////////////////////////////////////////////////////////////
+/// This class stores information on a pie. A pie consists of a name, an
 /// icon name and an unique ID. Furthermore it has an arbitrary amount
 /// of ActionGroups storing Actions.
 /////////////////////////////////////////////////////////////////////////
 
 public class Pie : GLib.Object {
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The name of this Pie. It has not to be unique.
     /////////////////////////////////////////////////////////////////////
-    
+
     public string name { get; set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The name of the icon to be used for this Pie. It should exist in
     /// the users current icon theme, else a standard icon will be used.
     /////////////////////////////////////////////////////////////////////
-    
+
     public string icon { get; set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The ID of this Pie. It has to be unique among all Pies. This ID
-    /// consists of three digits when the Pie was created by the user, 
-    /// of four digits when it was created dynamically by another class, 
+    /// consists of three digits when the Pie was created by the user,
+    /// of four digits when it was created dynamically by another class,
     /// for example by an ActionGroup.
     /////////////////////////////////////////////////////////////////////
-    
+
     public string id { get; construct; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Stores all ActionGroups of this Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public Gee.ArrayList<ActionGroup?> action_groups { get; private set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// C'tor, initializes all given members.
     /////////////////////////////////////////////////////////////////////
-    
+
     public Pie(string id, string name, string icon) {
         GLib.Object(id: id, name: name, icon:icon);
-        
+
         this.action_groups = new Gee.ArrayList<ActionGroup?>();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Should be called when this Pie is deleted, in order to clean up
     /// stuff created by contained ActionGroups.
     /////////////////////////////////////////////////////////////////////
-    
+
     public virtual void on_remove() {
         foreach (var action_group in action_groups)
             action_group.on_remove();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Adds an Action to this Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void add_action(Action action, int at_position = -1) {
         var group = new ActionGroup(this.id);
             group.add_action(action);
         this.add_group(group, at_position);
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Adds an ActionGroup to this Pie.
     /////////////////////////////////////////////////////////////////////
-    
-    public void add_group(ActionGroup group, int at_position = -1) {     
+
+    public void add_group(ActionGroup group, int at_position = -1) {
         if (group.has_quickaction()) {
             foreach (var action_group in action_groups)
                 action_group.disable_quickactions();
         }
-            
-        if (at_position < 0 || at_position >= this.action_groups.size) 
+
+        if (at_position < 0 || at_position >= this.action_groups.size)
             this.action_groups.add(group);
         else
             this.action_groups.insert(at_position, group);
     }
-    
+
     public void remove_group(int index) {
         if (this.action_groups.size > index)
             this.action_groups.remove_at(index);
     }
-    
+
     public void move_group(int from, int to) {
         if (this.action_groups.size > from && this.action_groups.size > to) {
             var tmp = this.action_groups[from];
@@ -111,7 +111,7 @@ public class Pie : GLib.Object {
             this.add_group(tmp, to);
         }
     }
-    
+
     public void update_group(ActionGroup group, int index) {
         if (this.action_groups.size > index)
             this.action_groups.set(index, group);