[folks] Move BuildConf into the Folks namespace



commit dcc02edc23b877e0dc289e6448987d3a72fd8e47
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Tue Sep 14 15:04:02 2010 +0100

    Move BuildConf into the Folks namespace
    
    This fixes the libfolks build against Vala master.

 folks/backend-store.vala         |    1 -
 folks/backend.vala               |    3 +--
 folks/build-conf.vapi            |    3 ++-
 folks/individual-aggregator.vala |    1 -
 folks/individual.vala            |    1 -
 folks/persona-store.vala         |    1 -
 folks/persona.vala               |    1 -
 7 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/folks/backend-store.vala b/folks/backend-store.vala
index b6aff32..837544c 100644
--- a/folks/backend-store.vala
+++ b/folks/backend-store.vala
@@ -22,7 +22,6 @@
  * This file was originally part of Rygel.
  */
 
-using BuildConf;
 using Gee;
 using GLib;
 
diff --git a/folks/backend.vala b/folks/backend.vala
index ca68d17..5565b48 100644
--- a/folks/backend.vala
+++ b/folks/backend.vala
@@ -18,8 +18,7 @@
  *       Travis Reitter <travis reitter collabora co uk>
  */
 
-using BuildConf;
-using Folks;
+using GLib;
 
 /**
  * A single backend to libfolks, such as Telepathy or evolution-data-server.
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index 40a5d50..41793c7 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -21,7 +21,8 @@
  * This file was originally part of Rygel.
  */
 
-public class BuildConf
+[CCode (cheader_filename = "config.h")]
+public class Folks.BuildConf
 {
   [CCode (cname = "DATA_DIR")]
   public static const string DATA_DIR;
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 49c0bc7..bff7b94 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -18,7 +18,6 @@
  *       Travis Reitter <travis reitter collabora co uk>
  */
 
-using Folks;
 using Gee;
 using GLib;
 
diff --git a/folks/individual.vala b/folks/individual.vala
index 396f64c..de7f4d4 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -20,7 +20,6 @@
 
 using Gee;
 using GLib;
-using Folks;
 
 /**
  * Trust level for an { link Individual} for use in the UI.
diff --git a/folks/persona-store.vala b/folks/persona-store.vala
index 738bb9c..fa5a2d8 100644
--- a/folks/persona-store.vala
+++ b/folks/persona-store.vala
@@ -19,7 +19,6 @@
  */
 
 using GLib;
-using Folks;
 
 /**
  * Trust level for a { link PersonaStore}'s { link Persona}s for linking
diff --git a/folks/persona.vala b/folks/persona.vala
index b74c3da..bcce582 100644
--- a/folks/persona.vala
+++ b/folks/persona.vala
@@ -19,7 +19,6 @@
  */
 
 using GLib;
-using Folks;
 
 /**
  * Represents a "shard" of a person from a single source (a single



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