[seahorse] Fix "static const" vala warnings



commit 753631ec3191321b6abbf26692f94706648b7ac0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Mar 12 18:10:53 2017 +0100

    Fix "static const" vala warnings

 common/catalog.vala           |   10 +++++-----
 gkr/gkr-backend.vala          |    6 +++---
 gkr/gkr-keyring.vala          |    2 +-
 pkcs11/pkcs11-properties.vala |    4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/common/catalog.vala b/common/catalog.vala
index 044d740..ddfb6df 100644
--- a/common/catalog.vala
+++ b/common/catalog.vala
@@ -21,7 +21,7 @@
 namespace Seahorse {
 
 public abstract class Catalog : Gtk.Window {
-       public static const string MENU_OBJECT = "ObjectPopup";
+       public const string MENU_OBJECT = "ObjectPopup";
 
        /* For compatibility with old code */
        public Gtk.Window window {
@@ -247,7 +247,7 @@ public abstract class Catalog : Gtk.Window {
                Prefs.show(this, null);
        }
 
-       private static const string[] AUTHORS = {
+       private const string[] AUTHORS = {
                "Jacob Perkins <jap1 users sourceforge net>",
                "Jose Carlos Garcia Sogo <jsogo users sourceforge net>",
                "Jean Schurger <yshark schurger org>",
@@ -260,14 +260,14 @@ public abstract class Catalog : Gtk.Window {
                null
        };
 
-       private static const string[] DOCUMENTERS = {
+       private const string[] DOCUMENTERS = {
                "Jacob Perkins <jap1 users sourceforge net>",
                "Adam Schreiber <sadam clemson edu>",
                "Milo Casagrande <milo_casagrande yahoo it>",
                null
        };
 
-       private static const string[] ARTISTS = {
+       private const string[] ARTISTS = {
                "Jacob Perkins <jap1 users sourceforge net>",
                "Stef Walter <stef memberwebs com>",
                null
@@ -359,7 +359,7 @@ public abstract class Catalog : Gtk.Window {
                }
        }
 
-       private static const Gtk.ActionEntry[] UI_ENTRIES = {
+       private const Gtk.ActionEntry[] UI_ENTRIES = {
                /* Top menu items */
                { "file-menu", null, N_("_File") },
                { "file-export", Gtk.Stock.SAVE_AS, N_("E_xport…"), null,
diff --git a/gkr/gkr-backend.vala b/gkr/gkr-backend.vala
index 0f719fe..722d402 100644
--- a/gkr/gkr-backend.vala
+++ b/gkr/gkr-backend.vala
@@ -247,21 +247,21 @@ public class BackendActions : Seahorse.Actions {
                new ItemAdd(Action.get_window(action));
        }
 
-       private static const Gtk.ActionEntry[] BACKEND_ACTIONS = {
+       private const Gtk.ActionEntry[] BACKEND_ACTIONS = {
                { "keyring-new", null, N_("New password keyring"), "",
                  N_("Used to store application and network passwords"), on_new_keyring },
                { "keyring-item-new", null, N_("New password…"), "",
                  N_("Safely store a password or secret."), on_new_item },
        };
 
-       private static const Gtk.ActionEntry[] ENTRIES_NEW = {
+       private const Gtk.ActionEntry[] ENTRIES_NEW = {
                { "keyring-new", "folder", N_("Password Keyring"), "",
                  N_("Used to store application and network passwords"), on_new_keyring },
                { "keyring-item-new", ICON_PASSWORD, N_("Stored Password"), "",
                  N_("Safely store a password or secret."), on_new_item }
        };
 
-       private static const string BACKEND_UI =
+       private const string BACKEND_UI =
                """"<ui>
                        <popup name='SeahorseGkrBackend'>
                                <menuitem action='keyring-new'/>
diff --git a/gkr/gkr-keyring.vala b/gkr/gkr-keyring.vala
index c14b7b4..c82dbbf 100644
--- a/gkr/gkr-keyring.vala
+++ b/gkr/gkr-keyring.vala
@@ -205,7 +205,7 @@ public class Keyring : Secret.Collection, Gcr.Collection, Place, Deletable, Lock
                });
        }
 
-       private static const Gtk.ActionEntry[] KEYRING_ACTIONS = {
+       private const Gtk.ActionEntry[] KEYRING_ACTIONS = {
                { "keyring-default", null, N_("_Set as default"), null,
                  N_("Applications usually store new passwords in the default keyring."), on_keyring_default 
},
                { "keyring-password", null, N_("Change _Password"), null,
diff --git a/pkcs11/pkcs11-properties.vala b/pkcs11/pkcs11-properties.vala
index 57c0b09..a1b4328 100644
--- a/pkcs11/pkcs11-properties.vala
+++ b/pkcs11/pkcs11-properties.vala
@@ -28,7 +28,7 @@ namespace Pkcs11 {
 public class Properties : Gtk.Window {
        public Gck.Object object { construct; get; }
 
-       private static string UI_STRING =
+       private string UI_STRING =
                """<ui>
                        <toolbar name='Toolbar'>
                                <toolitem action='export-object'/>
@@ -195,7 +195,7 @@ public class Properties : Gtk.Window {
                Request.prompt(this, this._request_key);
        }
 
-       private static const Gtk.ActionEntry[] UI_ACTIONS = {
+       private const Gtk.ActionEntry[] UI_ACTIONS = {
                { "export-object", Gtk.Stock.SAVE_AS, N_("_Export"), "",
                  N_("Export the certificate"), on_export_certificate },
                { "delete-object", Gtk.Stock.DELETE, N_("_Delete"), "<Ctrl>Delete",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]