[folks] eds: Fix ambiguous references to HashTable
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] eds: Fix ambiguous references to HashTable
- Date: Tue, 12 Feb 2013 08:34:38 +0000 (UTC)
commit ef9d16ec39e1c479083ecb7f8e85de3dbac64488
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue Feb 12 08:30:35 2013 +0000
eds: Fix ambiguous references to HashTable
Could have been GLib.HashTable or Xml.HashTable. Caught by Jenkins:
https://jenkins.qa.ubuntu.com/view/Raring/view/JHBuild%20Gnome/job/jhbuild-amd64-folks/113/
backends/eds/lib/edsf-persona.vala | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 1a55b20..02c68e6 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2011 Collabora Ltd.
+ * Copyright (C) 2013 Philip Withnall
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -150,7 +151,7 @@ public class Edsf.Persona : Folks.Persona,
"local-ids",
"web-service-addresses" };
- private static HashTable<string, E.ContactField>? _im_eds_map = null;
+ private static GLib.HashTable<string, E.ContactField>? _im_eds_map = null;
private E.Contact _contact; /* should be set on construct */
@@ -1886,16 +1887,17 @@ public class Edsf.Persona : Folks.Persona,
/**
* build a table of im protocols / im protocol aliases
*/
- internal static HashTable<string, E.ContactField> _get_im_eds_map ()
+ internal static GLib.HashTable<string, E.ContactField> _get_im_eds_map ()
{
- HashTable<string, E.ContactField> retval;
+ GLib.HashTable<string, E.ContactField> retval;
lock (Edsf.Persona._im_eds_map)
{
if (Edsf.Persona._im_eds_map == null)
{
var table =
- new HashTable<string, E.ContactField> (str_hash, str_equal);
+ new GLib.HashTable<string, E.ContactField> (str_hash,
+ str_equal);
table.insert ("aim", ContactField.IM_AIM);
table.insert ("yahoo", ContactField.IM_YAHOO);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]