method, args ,
NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
- if (!dbus_reply) {
+ if (!dbus_reply || err) {
char *err_name = NULL, *err_msg = NULL;
- debug_error("Method Call '%s.%s' Failed, %s", intf, method, err->message);
-
- if (_parse_error_msg(err->message, &err_name, &err_msg) < 0) {
- debug_error("failed to parse error message");
- g_error_free(err);
- return MM_ERROR_SOUND_INTERNAL;
+ debug_error("Method Call '%s.%s' Failed, %s", intf, method, err ? err->message : NULL);
+ ret = MM_ERROR_SOUND_INTERNAL;
+ if (err) {
+ if (_parse_error_msg(err->message, &err_name, &err_msg) < 0) {
+ debug_error("failed to parse error message");
+ g_error_free(err);
+ return MM_ERROR_SOUND_INTERNAL;
+ }
+ ret = _convert_error_name(err_name);
}
- ret = _convert_error_name(err_name);
g_error_free(err);
} else {
debug_log("Method Call '%s.%s' Success", intf, method);
debug_log("Already connected to system bus");
} else {
debug_log("Get new connection on system bus");
- if (!(conn_system = g_bus_get_sync(bustype, NULL, &err))) {
- debug_error("g_dbus_get_sync() error (%s)", err->message);
+ conn_system = g_bus_get_sync(bustype, NULL, &err);
+ if (!conn_system || err) {
+ debug_error ("g_dbus_get_sync() error (%s)", err ? err->message : NULL);
g_error_free(err);
+ return NULL;
}
}
return conn_system;
debug_log("Already connected to session bus");
} else {
debug_log("Get new connection on session bus");
- if (!(conn_session = g_bus_get_sync(bustype, NULL, &err))) {
- debug_error("g_dbus_get_sync() error (%s)", err->message);
+ conn_session = g_bus_get_sync(bustype, NULL, &err);
+ if (!conn_session || err) {
+ debug_error ("g_dbus_get_sync() error (%s)", err ? err->message : NULL);
g_error_free(err);
+ return NULL;
}
}
return conn_session;
return MM_ERROR_SOUND_INTERNAL;
}
- dbus_ret = g_dbus_connection_emit_signal(conn,
- NULL, g_paths[provider].object,
- g_paths[provider].interface, g_events[event].name,
- param, &err);
- if (!dbus_ret) {
- debug_error("g_dbus_connection_emit_signal() error (%s)", err->message);
+ dbus_ret = g_dbus_connection_emit_signal (conn,
+ NULL, g_paths[provider].object,
+ g_paths[provider].interface, g_events[event].name,
+ param, &err);
+ if (!dbus_ret || err) {
+ debug_error ("g_dbus_connection_emit_signal() error (%s)", err ? err->message : NULL);
g_error_free(err);
return MM_ERROR_SOUND_INTERNAL;
}
int i = 0;
conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
- if (!conn && err) {
- LOGE("g_bus_get_sync() error (%s)", err->message);
+ if (!conn || err) {
+ LOGE("g_bus_get_sync() error (%s)", err ? err->message : NULL);
g_error_free(err);
ret = MM_ERROR_SOUND_INTERNAL;
return ret;
2000,
NULL,
&err);
- if (!result && err) {
- debug_error("g_dbus_connection_call_sync() error (%s)", err->message);
+ if (!result || err) {
+ debug_error("g_dbus_connection_call_sync() error (%s)", err ? err->message : NULL);
+ g_error_free(err);
ret = MM_ERROR_SOUND_INTERNAL;
} else {
GVariantIter iter;
}
g_variant_unref(item);
g_variant_unref(child);
-
- g_variant_unref(result);
}
+
+ g_variant_unref(result);
g_object_unref(conn);
return ret;
subscribe_cb->user_data = user_data;
g_dbus_conn_mmsound = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
- if (!g_dbus_conn_mmsound && err) {
- debug_error ("g_bus_get_sync() error (%s) ", err->message);
+ if (!g_dbus_conn_mmsound || err) {
+ debug_error ("g_bus_get_sync() error (%s) ", err ? err->message : NULL);
g_error_free (err);
ret = MM_ERROR_SOUND_INTERNAL;
goto error;
subscribe_cb->client_pid = client_pid;
g_dbus_conn_mmsound = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
- if (!g_dbus_conn_mmsound && err) {
- debug_error ("g_bus_get_sync() error (%s) ", err->message);
+ if (!g_dbus_conn_mmsound || err) {
+ debug_error ("g_bus_get_sync() error (%s) ", err ? err->message : NULL);
g_error_free (err);
ret = MM_ERROR_SOUND_INTERNAL;
goto error;
}
conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
- if (!conn && err) {
- debug_error ("g_bus_get_sync() error (%s)", err->message);
+ if (!conn || err) {
+ debug_error ("g_bus_get_sync() error (%s)", err ? err->message : NULL);
ret = MM_ERROR_SOUND_INTERNAL;
goto error;
}
NULL, MM_SOUND_DBUS_OBJECT_PATH, MM_SOUND_DBUS_INTERFACE, dbus_signal_name_str[signal_type],
g_variant_new ("(i)", value),
&err);
- if (!dbus_ret && err) {
- debug_error ("g_dbus_connection_emit_signal() error (%s)", err->message);
+ if (!dbus_ret || err) {
+ debug_error ("g_dbus_connection_emit_signal() error (%s)", err ? err->message : NULL);
ret = MM_ERROR_SOUND_INTERNAL;
goto error;
}
dbus_ret = g_dbus_connection_flush_sync(conn, NULL, &err);
- if (!dbus_ret && err) {
- debug_error ("g_dbus_connection_flush_sync() error (%s)", err->message);
+ if (!dbus_ret || err) {
+ debug_error ("g_dbus_connection_flush_sync() error (%s)", err ? err->message : NULL);
ret = MM_ERROR_SOUND_INTERNAL;
goto error;
}
int idx = 0;
conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
- if (!conn && err) {
- debug_error("g_bus_get_sync() error (%s)", err->message);
+ if (!conn || err) {
+ debug_error("g_bus_get_sync() error (%s)", err ? err->message : NULL);
ret = MM_ERROR_SOUND_INTERNAL;
} else {
result = g_dbus_connection_call_sync (conn,
2000,
NULL,
&err);
- if (!result && err) {
- debug_error("g_dbus_connection_call_sync() for SIMPLE_PLAY error (%s)", err->message);
+ if (!result || err) {
+ debug_error("g_dbus_connection_call_sync() for SIMPLE_PLAY error (%s)", err ? err->message : NULL);
ret = MM_ERROR_SOUND_INTERNAL;
} else {
g_variant_get(result, "(i)", &idx);
}
g_object_unref(conn);
}
- if (err) {
- g_error_free(err);
- }
+ g_error_free(err);
}
return ret;
Name: libmm-sound
Summary: MMSound Package contains client lib and sound_server binary
-Version: 0.11.21
+Version: 0.11.22
Release: 0
Group: System/Libraries
License: Apache-2.0