[folks] Remove support for building with Vala < 0.11
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Remove support for building with Vala < 0.11
- Date: Mon, 14 Feb 2011 23:30:16 +0000 (UTC)
commit 969a9328b8faac443be22e2f97215f455c985d6c
Author: Philip Withnall <philip withnall collabora co uk>
Date: Mon Feb 14 23:29:24 2011 +0000
Remove support for building with Vala < 0.11
backends/key-file/kf-persona-store.vala | 8 +-------
configure.ac | 1 -
folks/backend-store.vala | 10 ----------
folks/individual-aggregator.vala | 4 ----
4 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/backends/key-file/kf-persona-store.vala b/backends/key-file/kf-persona-store.vala
index 4a3d1a4..11aa5c4 100644
--- a/backends/key-file/kf-persona-store.vala
+++ b/backends/key-file/kf-persona-store.vala
@@ -228,7 +228,7 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
var groups = this._key_file.get_groups ();
foreach (var persona_id in groups)
{
- if (persona_id.to_int () == this._first_unused_id)
+ if (int.parse (persona_id) == this._first_unused_id)
this._first_unused_id++;
Persona persona = new Kf.Persona (this._key_file, persona_id,
@@ -362,15 +362,9 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
* Vala <= 0.10, it returned the character length). FIXME: We need to
* take this into account until we depend explicitly on
* Vala >= 0.11. */
-#if VALA_0_12
yield this._file.replace_contents_async (key_file_data,
key_file_data.length, null, false, FileCreateFlags.PRIVATE,
cancellable);
-#else
- yield this._file.replace_contents_async (key_file_data,
- key_file_data.size (), null, false, FileCreateFlags.PRIVATE,
- cancellable);
-#endif
}
catch (Error e)
{
diff --git a/configure.ac b/configure.ac
index 42bf9aa..b1d9e55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,6 @@ AC_SUBST([FOLKS_MAJOR_MINOR_VERSION])
GLIB_REQUIRED=2.24.0
TP_GLIB_REQUIRED=0.13.1
-# XXX: once we bump this to 0.12.x, remove all the #if VALA_0_12 conditionals
VALA_REQUIRED=0.11.6
PKG_CHECK_MODULES([GLIB],
diff --git a/folks/backend-store.vala b/folks/backend-store.vala
index 1b1ae8c..a5ae50d 100644
--- a/folks/backend-store.vala
+++ b/folks/backend-store.vala
@@ -437,11 +437,7 @@ public class Folks.BackendStore : Object {
* aliases */
var is_symlink = info.get_is_symlink ();
-#if VALA_0_12
string mime = ContentType.get_mime_type (content_type);
-#else
- string mime = g_content_type_get_mime_type (content_type);
-#endif
if (file_type == FileType.DIRECTORY)
{
@@ -618,15 +614,9 @@ public class Folks.BackendStore : Object {
* Vala <= 0.10, it returned the character length). FIXME: We need to
* take this into account until we depend explicitly on
* Vala >= 0.11. */
-#if VALA_0_12
yield this._config_file.replace_contents_async (key_file_data,
key_file_data.length, null, false, FileCreateFlags.PRIVATE,
null);
-#else
- yield this._config_file.replace_contents_async (key_file_data,
- key_file_data.size (), null, false, FileCreateFlags.PRIVATE,
- null);
-#endif
}
catch (Error e)
{
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 9bc5a27..f3006d9 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -778,11 +778,7 @@ public class Folks.IndividualAggregator : Object
asv.foreach ((k, v) =>
{
-#if VALA_0_12
retval.insert ((string) k, v);
-#else
- retval.insert ((string) k, (Value?) v);
-#endif
});
return retval;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]