diff --git a/applets/batt/battery.vala b/applets/batt/battery.vala index b164c6f..fe9b7f9 100644 --- a/applets/batt/battery.vala +++ b/applets/batt/battery.vala @@ -36,13 +36,13 @@ private class DeviceData [DBus (name = "org.kde.StatusNotifierItem")] public class BatteryIconExporter : ItemExporter { - private static const string UPOWER_PATH = "/org/freedesktop/UPower"; - internal static const string UPOWER_NAME = "org.freedesktop.UPower"; - private static const string NOTIFY = "use-notifications"; - private static const string PERCENT = "show-percentage"; - private static const string TIME = "show-time-remaining"; - private static const string COMMAND = "pm-command"; - private static const string PATH = "display-device-path"; + private const string UPOWER_PATH = "/org/freedesktop/UPower"; + internal const string UPOWER_NAME = "org.freedesktop.UPower"; + private const string NOTIFY = "use-notifications"; + private const string PERCENT = "show-percentage"; + private const string TIME = "show-time-remaining"; + private const string COMMAND = "pm-command"; + private const string PATH = "display-device-path"; public bool use_notifications {get; internal set;} public bool show_percentage {get; internal set;} public bool show_time_remaining {get; internal set;} diff --git a/applets/gtop/gtop.vala b/applets/gtop/gtop.vala index 3a6cf52..c25d7fc 100644 --- a/applets/gtop/gtop.vala +++ b/applets/gtop/gtop.vala @@ -15,7 +15,7 @@ public static int main(string[] args) [DBus (name = "org.kde.StatusNotifierItem")] public class NetloadIconExporter : ItemExporter { - private static const string IFACE = "network-interface"; + private const string IFACE = "network-interface"; public string network_interface {get; internal set;} public bool reload {get; internal set;} private uint64 bytes_in_old; diff --git a/applets/volume/volume.vala b/applets/volume/volume.vala index 6256c37..3523e38 100644 --- a/applets/volume/volume.vala +++ b/applets/volume/volume.vala @@ -15,9 +15,9 @@ public static int main(string[] args) [DBus (name = "org.kde.StatusNotifierItem")] public class VolumeIconExporter : ItemExporter { - private static const string KEY_CHANNEL = "channel-id"; - private static const string KEY_CARD_ID = "card-id"; - private static const string KEY_MIXER = "mixer"; + private const string KEY_CHANNEL = "channel-id"; + private const string KEY_CARD_ID = "card-id"; + private const string KEY_MIXER = "mixer"; bool asound_find_element(string ename) { for ( diff --git a/applets/weather/weather.vala b/applets/weather/weather.vala index 3e62737..614cd31 100644 --- a/applets/weather/weather.vala +++ b/applets/weather/weather.vala @@ -16,10 +16,10 @@ namespace Weather [DBus (name = "org.kde.StatusNotifierItem")] public class WeatherIconExporter : ItemExporter { - internal static const string LOCATIONS = "locations"; - internal static const string CURRENT_LOC = "current-location"; - internal static const string UPDATE = "update-interval"; - internal static const string SHOW_LABEL = "show-temperature"; + internal const string LOCATIONS = "locations"; + internal const string CURRENT_LOC = "current-location"; + internal const string UPDATE = "update-interval"; + internal const string SHOW_LABEL = "show-temperature"; private uint update_source; internal GWeather.Location[] locations {get; set;} internal bool show_temperature {get; set;} diff --git a/lib/application.vala b/lib/application.vala index 9d04a44..c536a9b 100644 --- a/lib/application.vala +++ b/lib/application.vala @@ -6,15 +6,15 @@ namespace StatusNotifier { public class App: GLib.Application { - protected static const OptionEntry[] options = + protected const OptionEntry[] options = { { "version", 'v', 0, OptionArg.NONE, null, N_("Print version and exit"), null }, { null } }; [CCode (has_target = true)] public delegate Gtk.Dialog CreatePreferencesDialog(); - private static const string NAME = "options"; - private static const string PATH = "/org/vala-panel/"; + private const string NAME = "options"; + private const string PATH = "/org/vala-panel/"; public ItemExporter icon {get; construct;} public unowned CreatePreferencesDialog preferences {get; set;} public Gtk.AboutDialog? about {get; private set;}