Merge tag 'upstream/0.22.0'

Upstream version 0.22.0

1 files changed, 12 insertions, 9 deletions

diff --git a/src/sidebar/Entry.vala b/src/sidebar/Entry.vala
index 4162f21..5a84f74 100644
--- a/src/sidebar/Entry.vala
+++ b/src/sidebar/Entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -7,13 +7,13 @@
 public interface Sidebar.Entry : Object {
     public signal void sidebar_tooltip_changed(string? tooltip);
     
-    public signal void sidebar_icon_changed(Icon? icon);
+    public signal void sidebar_icon_changed(string? icon);
     
     public abstract string get_sidebar_name();
     
     public abstract string? get_sidebar_tooltip();
     
-    public abstract Icon? get_sidebar_icon();
+    public abstract string? get_sidebar_icon();
     
     public abstract string to_string();
     
@@ -25,12 +25,6 @@ public interface Sidebar.Entry : Object {
 }
 
 public interface Sidebar.ExpandableEntry : Sidebar.Entry {
-    public signal void sidebar_open_closed_icons_changed(Icon? open, Icon? closed);
-    
-    public abstract Icon? get_sidebar_open_icon();
-    
-    public abstract Icon? get_sidebar_closed_icon();
-    
     public abstract bool expand_on_select();
 }
 
@@ -53,6 +47,15 @@ public interface Sidebar.RenameableEntry : Sidebar.Entry {
     public signal void sidebar_name_changed(string name);
     
     public abstract void rename(string new_name);
+    
+    // Return true to allow the user to rename the sidebar entry in the UI.
+    public abstract bool is_user_renameable();
+}
+
+public interface Sidebar.EmphasizableEntry : Sidebar.Entry {
+    public signal void is_emphasized_changed(bool emphasized);
+    
+    public abstract bool is_emphasized();
 }
 
 public interface Sidebar.DestroyableEntry : Sidebar.Entry {