[pkg-fso-commits] [SCM] GSM user space multiplexer branch, master, updated. 0.9.2.2-9-gabcbcd7

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 275fb011af783f94e22632bd6648d3c72b3d6753
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Jan 21 14:47:54 2009 +0100

    return error message, if all channels are allocated

diff --git a/src/muxercontrol.c b/src/muxercontrol.c
index fee4d84..9e8400f 100644
--- a/src/muxercontrol.c
+++ b/src/muxercontrol.c
@@ -53,14 +53,16 @@ gboolean muxer_control_get_power (MuxerControl* self, const char* origin, gboole
 }
 
 
-gboolean muxer_control_alloc_channel (MuxerControl* self, const char* origin, const char* channel) {
+gboolean muxer_control_alloc_channel (MuxerControl* self, const char* origin, const char* channel, GError** error) {
 	g_return_val_if_fail (IS_MUXER_CONTROL (self), FALSE);
 	g_return_val_if_fail (origin != NULL, FALSE);
 	g_return_val_if_fail (channel != NULL, FALSE);
-	return c_alloc_channel (origin, channel);
+	gboolean success = c_alloc_channel (origin, channel);
+	if (!success)
+		g_set_error( error, DBUS_GERROR, 0xdeadbeef, "org.freesmartphone.GSM.MUX.NoChannel", "All channels are used" );
+	return success;
 }
 
-
 MuxerControl* muxer_control_gen (void) {
 	return muxer_control_new ();
 }
diff --git a/src/muxercontrol.h b/src/muxercontrol.h
index 37d3f8d..6804f1d 100644
--- a/src/muxercontrol.h
+++ b/src/muxercontrol.h
@@ -40,7 +40,7 @@ void muxer_control_run (MuxerControl* self);
 gboolean muxer_control_reset_modem (MuxerControl* self, const char* origin);
 gboolean muxer_control_set_power (MuxerControl* self, const char* origin, gboolean on);
 gboolean muxer_control_get_power (MuxerControl* self, const char* origin, gboolean on);
-gboolean muxer_control_alloc_channel (MuxerControl* self, const char* origin, const char* channel);
+gboolean muxer_control_alloc_channel (MuxerControl* self, const char* origin, const char* channel, GError** error);
 MuxerControl* muxer_control_gen (void);
 MuxerControl* muxer_control_new (void);
 GType muxer_control_get_type (void);

-- 
GSM user space multiplexer