/*
* ga-service-resolver.c - Source for GaServiceResolver
- * Copyright (C) 2005 Collabora Ltd.
+ * Copyright (C) 2006-2007 Collabora Ltd.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include "ga-service-resolver.h"
#include "signals-marshal.h"
-#include "ga-errors.h"
+#include "ga-error.h"
#include "ga-enums.h"
#include "ga-enums-enumtypes.h"
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_STRING_POINTER_INT_POINTER_INT,
+ _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_STRING_POINTER_INT_POINTER_INT,
G_TYPE_NONE, 10,
G_TYPE_INT,
GA_TYPE_PROTOCOL,
param_spec = g_param_spec_enum("flags", "Lookup flags for the resolver",
"Resolver lookup flags",
- GA_TYPE_PROTOCOL,
+ GA_TYPE_LOOKUP_FLAGS,
GA_LOOKUP_NO_FLAGS,
G_PARAM_READWRITE |
G_PARAM_STATIC_NAME |
case AVAHI_RESOLVER_FAILURE:{
GError *error;
int aerrno = avahi_client_errno(priv->client->avahi_client);
- error = g_error_new(GA_ERRORS, aerrno,
+ error = g_error_new(GA_ERROR, aerrno,
"Resolving failed: %s",
avahi_strerror(aerrno));
g_signal_emit(self, signals[FAILURE], 0, error);
if (priv->resolver == NULL) {
if (error != NULL) {
int aerrno = avahi_client_errno(client->avahi_client);
- *error = g_error_new(GA_ERRORS, aerrno,
+ *error = g_error_new(GA_ERROR, aerrno,
"Attaching group failed: %s",
avahi_strerror(aerrno));
}