[seahorse/wip/nielsdg/src-port: 3/4] WIP

[Niels De Graef <nielsdg src gnome org>]

commit 6d9dc982adb7d998cb364d44f01421eb59758905
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu Feb 1 19:47:11 2018 +0100

    WIP

 gkr/meson.build      |    5 +++++
 pkcs11/meson.build   |    5 +++++
 src/application.vala |    3 ++-
 src/key-manager.vala |    4 ++--
 src/meson.build      |   14 ++++++--------
 src/sidebar.vala     |    1 -
 6 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/gkr/meson.build b/gkr/meson.build
index 10b0e11..2c61028 100644
--- a/gkr/meson.build
+++ b/gkr/meson.build
@@ -23,3 +23,8 @@ gkr_lib = static_library('seahorse-gkr',
   gkr_sources,
   dependencies: gkr_dependencies,
 )
+
+gkr_dep = declare_dependency(
+  link_with: gkr_lib,
+  include_directories: include_directories('.'),
+)
diff --git a/pkcs11/meson.build b/pkcs11/meson.build
index d5e6518..760b7bf 100644
--- a/pkcs11/meson.build
+++ b/pkcs11/meson.build
@@ -24,3 +24,8 @@ pkcs11_lib = static_library('seahorse-pkcs11',
   pkcs11_sources,
   dependencies: pkcs11_deps,
 )
+
+pkcs11_dep = declare_dependency(
+  link_with: pkcs11_lib,
+  include_directories: include_directories('.'),
+)
diff --git a/src/application.vala b/src/application.vala
index 3dbc3f3..446a7ea 100644
--- a/src/application.vala
+++ b/src/application.vala
@@ -24,7 +24,7 @@
 public class Seahorse.Application : Gtk.Application {
     /* private SearchProvider? search_provider; */
 
-    private const int INACTIVITY_TIMEOUT = 120 * 1000; /* Two minutes, in milliseconds */
+    private const int INACTIVITY_TIMEOUT = 120 * 1000; // Two minutes, in milliseconds
 
     public Application () {
         GLib.Object (
@@ -86,6 +86,7 @@ public class Seahorse.Application : Gtk.Application {
             return true;
         }
 
+        exit_status = 0;
         /* return base.local_command_line(ref arguments, out exit_status); */
         return false;
     }
diff --git a/src/key-manager.vala b/src/key-manager.vala
index 51bcbda..c22813c 100644
--- a/src/key-manager.vala
+++ b/src/key-manager.vala
@@ -292,8 +292,8 @@ public class Seahorse.KeyManager : Catalog {
         Gtk.FileChooserDialog dialog =
             new Gtk.FileChooserDialog(_("Import Key"), this.window,
                                       Gtk.FileChooserAction.OPEN,
-                                      Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                                      Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT,
+                                      _("_Cancel"), Gtk.ResponseType.CANCEL,
+                                      _("_Open"), Gtk.ResponseType.ACCEPT,
                                       null);
 
         dialog.set_default_response(Gtk.ResponseType.ACCEPT);
diff --git a/src/meson.build b/src/meson.build
index c17ef0e..5a68ba1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,36 +13,34 @@ seahorse_sources = [
   # 'search-provider.vala',
   'sidebar.vala',
 
-  resources_src,
+  # resources_src,
   # search_provider_src,
 ]
 
 seahorse_dependencies = [
   glib_deps,
   gtk,
-  gcr,
-  gcr_ui,
   libsecret,
   common_dep,
   libseahorse_dep,
+  gkr_dep,
+  ssh_dep,
 ]
 
 seahorse_linkedlibs = [
   libeggdatetime_lib,
   libtreemultidnd_lib,
-  gkr_lib,
-  ssh_lib,
 ]
 
 seahorse_vala_flags = [
 ]
 
 if with_pgp
-  seahorse_linkedlibs += pgp_lib
-  seahorse_vala_flags += ['-D', 'WITH_PGP' ]
+  seahorse_dependencies += pgp_dep
+  seahorse_vala_flags += [ '-D', 'WITH_PGP' ]
 endif
 if with_pkcs11
-  seahorse_linkedlibs += pkcs11_lib
+  seahorse_dependencies += pkcs11_dep
 endif
 
 
diff --git a/src/sidebar.vala b/src/sidebar.vala
index e7d29e6..032ef04 100644
--- a/src/sidebar.vala
+++ b/src/sidebar.vala
@@ -65,7 +65,6 @@ public class Seahorse.Sidebar : Gtk.ScrolledWindow {
     /**
      * Collection shows all objects combined
      */
-    [Notify]
     public bool combined {
         get { return this._combined; }
         set {