[seahorse] gkr: Lay down infrastructure for implementing gkr stuff in vala
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] gkr: Lay down infrastructure for implementing gkr stuff in vala
- Date: Wed, 26 Jun 2013 10:18:14 +0000 (UTC)
commit 236a8554885bb578bc1cc8eff4ecce5b29b3d627
Author: Stef Walter <stefw gnome org>
Date: Thu May 2 16:35:32 2013 +0200
gkr: Lay down infrastructure for implementing gkr stuff in vala
gkr/.gitignore | 3 +++
gkr/Makefile.am | 28 ++++++++++++++++++++++++----
gkr/gkr-module.vala | 28 ++++++++++++++++++++++++++++
gkr/seahorse-gkr-backend.c | 2 ++
gkr/seahorse-gkr-item-properties.c | 2 ++
gkr/seahorse-gkr.c | 23 -----------------------
gkr/seahorse-gkr.h | 30 ++++++------------------------
libseahorse/seahorse-application.c | 3 ++-
8 files changed, 67 insertions(+), 52 deletions(-)
---
diff --git a/gkr/.gitignore b/gkr/.gitignore
index 8f680a8..0e768ef 100644
--- a/gkr/.gitignore
+++ b/gkr/.gitignore
@@ -1,3 +1,6 @@
/.*
/Makefile
/Makefile.in
+/*.c
+!/seahorse-*.c
+/seahorse-gkr.h
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 14fb07e..11d82b2 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -15,10 +15,29 @@ INCLUDES = -I$(top_builddir) \
-DGETTEXT_PACKAGE=\""seahorse\"" \
-DSECRET_API_SUBJECT_TO_CHANGE
-noinst_LTLIBRARIES = libseahorse-gkr.la
+noinst_LTLIBRARIES = \
+ libvala-code.la \
+ libseahorse-gkr.la
+
+AM_VALAFLAGS = \
+ $(VALA_FLAGS) \
+ --use-header \
+ --header=seahorse-gkr.h \
+ --vapidir $(top_builddir)/common \
+ --pkg common \
+ --pkg gtk+-3.0 \
+ --pkg libsecret-1 \
+ $(NULL)
+
+libvala_code_la_SOURCES = \
+ gkr-module.vala \
+ $(NULL)
+
+libvala_code_la_CFLAGS = \
+ -include config.h -w \
+ $(NULL)
libseahorse_gkr_la_SOURCES = \
- seahorse-gkr.c seahorse-gkr.h \
seahorse-gkr-actions.c seahorse-gkr-actions.h \
seahorse-gkr-add-item.c \
seahorse-gkr-add-keyring.c \
@@ -42,5 +61,6 @@ ui_DATA = \
seahorse-gkr-keyring.xml
EXTRA_DIST = \
- $(ui_DATA)
-
+ $(ui_DATA) \
+ seahorse-gkr.h \
+ $(NULL)
diff --git a/gkr/gkr-module.vala b/gkr/gkr-module.vala
new file mode 100644
index 0000000..6f3ed1e
--- /dev/null
+++ b/gkr/gkr-module.vala
@@ -0,0 +1,28 @@
+/*
+ * Seahorse
+ *
+ * Copyright (C) 2013 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Exporter, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Stef Walter <stefw gnome org>
+ */
+
+namespace Seahorse {
+
+public const string GKR_NAME = "gkr";
+
+}
\ No newline at end of file
diff --git a/gkr/seahorse-gkr-backend.c b/gkr/seahorse-gkr-backend.c
index 2b208de..d70e8b6 100644
--- a/gkr/seahorse-gkr-backend.c
+++ b/gkr/seahorse-gkr-backend.c
@@ -75,6 +75,8 @@ struct _SeahorseGkrBackendClass {
GObjectClass parent_class;
};
+void seahorse_gkr_backend_initialize (void);
+
static void seahorse_gkr_backend_iface (SeahorseBackendIface *iface);
static void seahorse_gkr_backend_collection_init (GcrCollectionIface *iface);
diff --git a/gkr/seahorse-gkr-item-properties.c b/gkr/seahorse-gkr-item-properties.c
index 7a138da..8adfee2 100644
--- a/gkr/seahorse-gkr-item-properties.c
+++ b/gkr/seahorse-gkr-item-properties.c
@@ -23,6 +23,8 @@
#include <glib/gi18n.h>
+#include <gcr/gcr.h>
+
#include "seahorse-gkr-dialogs.h"
#include "seahorse-gkr-item.h"
diff --git a/gkr/seahorse-gkr.h b/gkr/seahorse-gkr.h
index 73c332a..77427a2 100644
--- a/gkr/seahorse-gkr.h
+++ b/gkr/seahorse-gkr.h
@@ -1,37 +1,19 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
+/* seahorse-gkr.h generated by valac 0.18.1, the Vala compiler, do not modify */
+
#ifndef __SEAHORSE_GKR_H__
#define __SEAHORSE_GKR_H__
#include <glib.h>
-#include <glib-object.h>
-
-#include <gcr/gcr.h>
+#include <stdlib.h>
+#include <string.h>
G_BEGIN_DECLS
+
+
#define SEAHORSE_GKR_NAME "gkr"
-void seahorse_gkr_backend_initialize (void);
G_END_DECLS
diff --git a/libseahorse/seahorse-application.c b/libseahorse/seahorse-application.c
index e76a171..a36a81e 100644
--- a/libseahorse/seahorse-application.c
+++ b/libseahorse/seahorse-application.c
@@ -27,7 +27,6 @@
#include "seahorse-application.h"
#include "seahorse-icons.h"
-#include "gkr/seahorse-gkr.h"
#include "pgp/seahorse-pgp.h"
#include "ssh/seahorse-ssh.h"
@@ -94,6 +93,8 @@ seahorse_application_finalize (GObject *gobject)
void seahorse_pkcs11_backend_initialize (void);
#endif
+void seahorse_gkr_backend_initialize (void);
+
static void
seahorse_application_startup (GApplication *application)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]