[seahorse] gkr: Work around problems with gobject-introspection



commit 4f883014841f8b81ca661ec9437fade347003f43
Author: Stef Walter <stefw gnome org>
Date:   Thu Jun 27 15:44:29 2013 +0200

    gkr: Work around problems with gobject-introspection
    
    g-ir-scanner doesn't seem to be picking up the GCR_ICON_XXX constants
    in the Gcr library, on some versions of gobject-introspection, so use
    our own definition of that constant.

 common/icons.vala    |    1 +
 gkr/gkr-backend.vala |    2 +-
 gkr/gkr-item.vala    |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/common/icons.vala b/common/icons.vala
index d4d3284..70fc01c 100644
--- a/common/icons.vala
+++ b/common/icons.vala
@@ -32,6 +32,7 @@ namespace Seahorse {
        public const string ICON_SIGN_UNKNOWN = "seahorse-sign-unknown";
        public const string ICON_WEBBROWSER = "web-browser";
        public const string ICON_FOLDER = "folder";
+       public const string ICON_PASSWORD = "gcr-password";
        public bool _icons_inited = false;
 
        public static void icons_init() {
diff --git a/gkr/gkr-backend.vala b/gkr/gkr-backend.vala
index abc062d..2bfe38a 100644
--- a/gkr/gkr-backend.vala
+++ b/gkr/gkr-backend.vala
@@ -249,7 +249,7 @@ public class BackendActions : Seahorse.Actions {
        private static 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", Gcr.ICON_PASSWORD, N_("Stored Password"), "",
+               { "keyring-item-new", ICON_PASSWORD, N_("Stored Password"), "",
                  N_("Safely store a password or secret."), on_new_item }
        };
 
diff --git a/gkr/gkr-item.vala b/gkr/gkr-item.vala
index b179871..0698425 100644
--- a/gkr/gkr-item.vala
+++ b/gkr/gkr-item.vala
@@ -80,7 +80,7 @@ public class Item : Secret.Item, Deletable, Viewable {
        }
 
        public GLib.Icon icon {
-               owned get { return new GLib.ThemedIcon (Gcr.ICON_PASSWORD); }
+               owned get { return new GLib.ThemedIcon (ICON_PASSWORD); }
        }
 
        public new string label {


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