diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-03 13:15:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-03 13:15:00 +0200 |
| commit | bc53b714952ceb0afd02b591403cb2bc0cb1aab9 (patch) | |
| tree | 8ff57ed1a1265b2c87f37e3c8fa19876faf80990 /src/folders/Folders.vala | |
| parent | d4c476947425c12b1984fedea16f8a8c42a07ba3 (diff) | |
| parent | c43dfb815a4951b8248f4f0e98babe4f80204f03 (diff) | |
Merge tag 'upstream/0.22.0'
Upstream version 0.22.0
Diffstat (limited to 'src/folders/Folders.vala')
| -rw-r--r-- | src/folders/Folders.vala | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/folders/Folders.vala b/src/folders/Folders.vala index 1cc14b1..da6f817 100644 --- a/src/folders/Folders.vala +++ b/src/folders/Folders.vala @@ -1,4 +1,4 @@ -/* Copyright 2012-2014 Yorba Foundation +/* Copyright 2012-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. @@ -15,19 +15,16 @@ namespace Folders { -static Icon? opened_icon = null; -static Icon? closed_icon = null; -static Icon? have_photos_icon = null; +static string? icon = null; +static string? have_photos_icon = null; public void init() throws Error { - opened_icon = new ThemedIcon(Resources.ICON_FOLDER_OPEN); - closed_icon = new ThemedIcon(Resources.ICON_FOLDER_CLOSED); - have_photos_icon = new ThemedIcon(Resources.ICON_FOLDER_DOCUMENTS); + icon = Resources.ICON_FOLDER; + have_photos_icon = Resources.ICON_FOLDER_DOCUMENTS; } public void terminate() { - opened_icon = null; - closed_icon = null; + icon = null; have_photos_icon = null; } |