Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
static int connected = 0;
static char *unknown = "unknown";
static int connected = 0;
static char *unknown = "unknown";
-void fail(GError *error);
+void fail(GError *error, struct information *);
bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (bus == NULL) {
NORM_ERR("BMPx error 1: %s\n", error->message);
bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (bus == NULL) {
NORM_ERR("BMPx error 1: %s\n", error->message);
+ fail(error, current_info);
return;
}
remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
return;
}
remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
- BMP_DBUS_PATH, BMP_DBUS_INTERFACE);
+ BMP_DBUS_PATH__BMP, BMP_DBUS_INTERFACE__BMP);
if (!remote_object) {
NORM_ERR("BMPx error 2: %s\n", error->message);
if (!remote_object) {
NORM_ERR("BMPx error 2: %s\n", error->message);
+ fail(error, current_info);
G_TYPE_INVALID, G_TYPE_INT, ¤t_track, G_TYPE_INVALID)) {
} else {
NORM_ERR("BMPx error 3: %s\n", error->message);
G_TYPE_INVALID, G_TYPE_INT, ¤t_track, G_TYPE_INVALID)) {
} else {
NORM_ERR("BMPx error 3: %s\n", error->message);
+ fail(error, current_info);
g_value_get_string(g_hash_table_lookup(metadata, "location"));
} else {
NORM_ERR("BMPx error 4: %s\n", error->message);
g_value_get_string(g_hash_table_lookup(metadata, "location"));
} else {
NORM_ERR("BMPx error 4: %s\n", error->message);
+ fail(error, current_info);
return;
}
g_hash_table_destroy(metadata);
} else {
return;
}
g_hash_table_destroy(metadata);
} else {
+ fail(error, current_info);
-void fail(GError *error)
+void fail(GError *error, struct information *current_info)
{
if (error) {
g_error_free(error);
{
if (error) {
g_error_free(error);