diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-09-14 16:25:35 +0800 | 
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-09-14 16:25:35 +0800 | 
| commit | bebaa491650c48697b861ec5e76816e9af1a8803 (patch) | |
| tree | b57d38476473f8fc6e282f8c39f730c936fa10d4 /src/modules/reserve.c | |
| parent | c6d330ef91ce401660f907536b1bfd0591c14c2a (diff) | |
| parent | 180ef1eebdfbdf0220af1fb5e4bf43e348207cde (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/reserve.c')
| -rw-r--r-- | src/modules/reserve.c | 25 | 
1 files changed, 1 insertions, 24 deletions
diff --git a/src/modules/reserve.c b/src/modules/reserve.c index 5597f177..b4c168cf 100644 --- a/src/modules/reserve.c +++ b/src/modules/reserve.c @@ -291,7 +291,6 @@ static DBusHandlerResult filter_handler(  	DBusMessage *m,  	void *userdata) { -	DBusMessage *reply;  	rd_device *d;  	DBusError error; @@ -323,35 +322,13 @@ static DBusHandlerResult filter_handler(  				rd_release(d);  			} -			return DBUS_HANDLER_RESULT_HANDLED;  		}  	} -	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -  invalid: -	if (!(reply = dbus_message_new_error( -		      m, -		      DBUS_ERROR_INVALID_ARGS, -		      "Invalid arguments"))) -		goto oom; - -	if (!dbus_connection_send(c, reply, NULL)) -		goto oom; - -	dbus_message_unref(reply); - -	dbus_error_free(&error); - -	return DBUS_HANDLER_RESULT_HANDLED; - -oom: -	if (reply) -		dbus_message_unref(reply); -  	dbus_error_free(&error); -	return DBUS_HANDLER_RESULT_NEED_MEMORY; +	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;  }  | 
