From: Evan Nemerson <evan@coeus-group.com>
Date: Sat, 5 Oct 2013 20:09:58 +0000 (-0700)
Subject: avahi-client: remove deprecated methods which throw errors.
X-Git-Tag: 0.22.1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdbc2d8261df192f66c385b87b643834081c842;p=thirdparty%2Fvala.git

avahi-client: remove deprecated methods which throw errors.

They were wrapper methods which caused a dependency on avahi-gobject
which should not exist.  They were deprecated several years ago with
the goal of removing them at some point, and I think that time has
come.
---

diff --git a/vapi/avahi-client.vapi b/vapi/avahi-client.vapi
index 24a7c508f..43c9724bd 100644
--- a/vapi/avahi-client.vapi
+++ b/vapi/avahi-client.vapi
@@ -124,20 +124,6 @@ namespace Avahi {
 
 		[CCode(cname="avahi_string_list_parse")]
 		public static int deserialize (char[] data, out StringList dest);
-		[Deprecated (since = "vala-0.16", replacement = "deserialize")]
-		[CCode (cname = "avahi_string_list_parse_dup")]
-		public static StringList parse(char[] data) throws Error {
-			StringList dest;
-
-			int errno = deserialize (data, out dest);
-			if (errno < 0) {
-				var err = new Error.FAILURE(strerror(errno));
-				err.code = errno;
-				throw err;
-			}
-
-			return dest;
-		}
 	}
 
 
@@ -176,21 +162,6 @@ namespace Avahi {
 			return errno;
 		}
 
-		[Deprecated (since = "vala-0.16", replacement = "join_service_name")]
-		[CCode (cname = "_vala_avahi_service_name_join")]
-		public string service_name_join (string name, string type, string domain) throws Error {
-			uint8[] dest = new uint8[DOMAIN_NAME_MAX];
-
-			int errno = _service_name_join(dest, name, type, domain);
-			if (errno < 0) {
-				var err = new Error.FAILURE(strerror(errno));
-				err.code = errno;
-				throw err;
-			}
-
-			return (string) dest;
-		}
-
 		[CCode (cname = "avahi_service_name_split")]
 		public int _service_name_split(string src, [CCode (array_length_type = "size_t")] uint8[] name, [CCode (array_length_type = "size_t")] uint8[] type, [CCode (array_length_type = "size_t")] uint8[] domain);
 
@@ -211,26 +182,6 @@ namespace Avahi {
 			return errno;
 		}
 
-		[Deprecated (since = "vala-0.16", replacement = "split_service_name")]
-		[CCode (cname = "avahi_service_name_split_dup")]
-		public void service_name_split(string src, out string name, out string type, out string domain) throws Error {
-			uint8[] name_data = new uint8[LABEL_MAX];
-			uint8[] type_data = new uint8[DOMAIN_NAME_MAX];
-			uint8[] domain_data = new uint8[DOMAIN_NAME_MAX];
-
-			int errno = _service_name_split (src, name_data, type_data, domain_data);
-
-			if (errno < 0) {
-				var err = new Error.FAILURE(strerror(errno));
-				err.code = errno;
-				throw err;
-			}
-
-			name = (string) name_data;
-			type = (string) type_data;
-			domain = (string) domain_data;
-		}
-
 		public bool is_valid_service_type_generic(string s);
 		public bool is_valid_service_type_strict(string s);
 		public bool is_valid_service_subtype(string s);