[seahorse] Some vala code build fixes



commit 4bd89996d24837bade64f2b9858929890f6bd8a4
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 3 09:06:42 2014 +0100

    Some vala code build fixes

 common/place.vala    |    2 +-
 gkr/gkr-keyring.vala |    2 +-
 pgp/Makefile.am      |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/common/place.vala b/common/place.vala
index 3448b0e..b807f52 100644
--- a/common/place.vala
+++ b/common/place.vala
@@ -25,7 +25,7 @@ public interface Place : Gcr.Collection {
        public abstract string description { owned get; }
        public abstract string uri { owned get; }
        public abstract GLib.Icon icon { owned get; }
-       public abstract Gtk.ActionGroup actions { owned get; }
+       public abstract Gtk.ActionGroup? actions { owned get; }
 
        public abstract async bool load(GLib.Cancellable? cancellable) throws GLib.Error;
 }
diff --git a/gkr/gkr-keyring.vala b/gkr/gkr-keyring.vala
index 2d0f3ba..3545b54 100644
--- a/gkr/gkr-keyring.vala
+++ b/gkr/gkr-keyring.vala
@@ -40,7 +40,7 @@ public class Keyring : Secret.Collection, Gcr.Collection, Place, Deletable, Lock
        public GLib.Icon icon {
                owned get { return new GLib.ThemedIcon("folder"); }
        }
-       public Gtk.ActionGroup actions {
+       public Gtk.ActionGroup? actions {
                owned get {
                        if (this._actions == null)
                                this._actions = create_actions();
diff --git a/pgp/Makefile.am b/pgp/Makefile.am
index 4256ecf..220a7a4 100644
--- a/pgp/Makefile.am
+++ b/pgp/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/libegg \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libseahorse \
        $(SEAHORSE_CFLAGS) \
        -DSEAHORSE_UIDIR=\""$(uidir)"\" \


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