regenerate gobject stubs with Channel.Interface.IceSignalling from spec 0.13.3

20060822144558-418b8-73484f608d1764ebccf174798c1446f59a1852aa.gz

6 files changed, 70 insertions, 29 deletions

diff --git a/generate/src/gabble-media-channel-signals-marshal.list b/generate/src/gabble-media-channel-signals-marshal.list
index e7dc1e2a9..4491ccebb 100644
--- a/generate/src/gabble-media-channel-signals-marshal.list
+++ b/generate/src/gabble-media-channel-signals-marshal.list
@@ -1,5 +1,7 @@
 VOID:VOID
 VOID:INT,INT
 VOID:STRING,BOXED,BOXED,BOXED,BOXED,INT,INT
-VOID:INT,STRING,STRING
+VOID:STRING,STRING
 VOID:INT,INT,INT
+VOID:INT
+VOID:INT,INT
diff --git a/generate/src/gabble-media-channel.c b/generate/src/gabble-media-channel.c
index c08269e7b..47406e994 100644
--- a/generate/src/gabble-media-channel.c
+++ b/generate/src/gabble-media-channel.c
@@ -35,7 +35,9 @@ enum
     CLOSED,
     GROUP_FLAGS_CHANGED,
     MEMBERS_CHANGED,
-    NEW_MEDIA_SESSION_HANDLER,
+    NEW_ICE_SESSION_HANDLER,
+    STREAM_ADDED,
+    STREAM_REMOVED,
     STREAM_STATE_CHANGED,
     LAST_SIGNAL
 };
@@ -100,17 +102,17 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
                   gabble_media_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_INT_INT,
                   G_TYPE_NONE, 7, G_TYPE_STRING, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, G_TYPE_UINT, G_TYPE_UINT);
 
-  signals[NEW_MEDIA_SESSION_HANDLER] =
-    g_signal_new ("new-media-session-handler",
+  signals[NEW_ICE_SESSION_HANDLER] =
+    g_signal_new ("new-ice-session-handler",
                   G_OBJECT_CLASS_TYPE (gabble_media_channel_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
                   NULL, NULL,
-                  gabble_media_channel_marshal_VOID__INT_STRING_STRING,
-                  G_TYPE_NONE, 3, G_TYPE_UINT, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING);
+                  gabble_media_channel_marshal_VOID__STRING_STRING,
+                  G_TYPE_NONE, 2, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING);
 
-  signals[STREAM_STATE_CHANGED] =
-    g_signal_new ("stream-state-changed",
+  signals[STREAM_ADDED] =
+    g_signal_new ("stream-added",
                   G_OBJECT_CLASS_TYPE (gabble_media_channel_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -118,6 +120,24 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
                   gabble_media_channel_marshal_VOID__INT_INT_INT,
                   G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 
+  signals[STREAM_REMOVED] =
+    g_signal_new ("stream-removed",
+                  G_OBJECT_CLASS_TYPE (gabble_media_channel_class),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+                  0,
+                  NULL, NULL,
+                  gabble_media_channel_marshal_VOID__INT,
+                  G_TYPE_NONE, 1, G_TYPE_UINT);
+
+  signals[STREAM_STATE_CHANGED] =
+    g_signal_new ("stream-state-changed",
+                  G_OBJECT_CLASS_TYPE (gabble_media_channel_class),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+                  0,
+                  NULL, NULL,
+                  gabble_media_channel_marshal_VOID__INT_INT,
+                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+
   dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_media_channel_class), &dbus_glib_gabble_media_channel_object_info);
 }
 
@@ -371,7 +391,7 @@ gboolean gabble_media_channel_get_self_handle (GabbleMediaChannel *obj, guint* r
  * gabble_media_channel_get_session_handlers
  *
  * Implements DBus method GetSessionHandlers
- * on interface org.freedesktop.Telepathy.Channel.Type.StreamedMedia
+ * on interface org.freedesktop.Telepathy.Channel.Interface.IceSignalling
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -386,9 +406,9 @@ gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPt
 
 
 /**
- * gabble_media_channel_get_streams
+ * gabble_media_channel_list_streams
  *
- * Implements DBus method GetStreams
+ * Implements DBus method ListStreams
  * on interface org.freedesktop.Telepathy.Channel.Type.StreamedMedia
  *
  * @error: Used to return a pointer to a GError detailing any error
@@ -397,7 +417,7 @@ gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPt
  *
  * Returns: TRUE if successful, FALSE if an error was thrown.
  */
-gboolean gabble_media_channel_get_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error)
+gboolean gabble_media_channel_list_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error)
 {
   return TRUE;
 }
@@ -420,3 +440,21 @@ gboolean gabble_media_channel_remove_members (GabbleMediaChannel *obj, const GAr
   return TRUE;
 }
 
+
+/**
+ * gabble_media_channel_request_streams
+ *
+ * Implements DBus method RequestStreams
+ * on interface org.freedesktop.Telepathy.Channel.Type.StreamedMedia
+ *
+ * @error: Used to return a pointer to a GError detailing any error
+ *         that occured, DBus will throw the error only if this
+ *         function returns false.
+ *
+ * Returns: TRUE if successful, FALSE if an error was thrown.
+ */
+gboolean gabble_media_channel_request_streams (GabbleMediaChannel *obj, guint contact_handle, const GArray * types, GArray ** ret, GError **error)
+{
+  return TRUE;
+}
+
diff --git a/generate/src/gabble-media-channel.h b/generate/src/gabble-media-channel.h
index e03a3ed43..5c6d5e131 100644
--- a/generate/src/gabble-media-channel.h
+++ b/generate/src/gabble-media-channel.h
@@ -66,8 +66,9 @@ gboolean gabble_media_channel_get_members (GabbleMediaChannel *obj, GArray ** re
 gboolean gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *obj, GArray ** ret, GError **error);
 gboolean gabble_media_channel_get_self_handle (GabbleMediaChannel *obj, guint* ret, GError **error);
 gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error);
-gboolean gabble_media_channel_get_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error);
+gboolean gabble_media_channel_list_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error);
 gboolean gabble_media_channel_remove_members (GabbleMediaChannel *obj, const GArray * contacts, const gchar * message, GError **error);
+gboolean gabble_media_channel_request_streams (GabbleMediaChannel *obj, guint contact_handle, const GArray * types, GArray ** ret, GError **error);
 
 
 G_END_DECLS
diff --git a/generate/src/gabble-media-session-signals-marshal.list b/generate/src/gabble-media-session-signals-marshal.list
index a73684af1..598b9168e 100644
--- a/generate/src/gabble-media-session-signals-marshal.list
+++ b/generate/src/gabble-media-session-signals-marshal.list
@@ -1 +1 @@
-VOID:STRING,INT,INT
+VOID:STRING,INT,INT,INT
diff --git a/generate/src/gabble-media-session.c b/generate/src/gabble-media-session.c
index b2aa5e2eb..dda683d43 100644
--- a/generate/src/gabble-media-session.c
+++ b/generate/src/gabble-media-session.c
@@ -32,7 +32,7 @@ G_DEFINE_TYPE(GabbleMediaSession, gabble_media_session, G_TYPE_OBJECT)
 /* signal enum */
 enum
 {
-    NEW_MEDIA_STREAM_HANDLER,
+    NEW_ICE_STREAM_HANDLER,
     LAST_SIGNAL
 };
 
@@ -69,14 +69,14 @@ gabble_media_session_class_init (GabbleMediaSessionClass *gabble_media_session_c
   object_class->dispose = gabble_media_session_dispose;
   object_class->finalize = gabble_media_session_finalize;
 
-  signals[NEW_MEDIA_STREAM_HANDLER] =
-    g_signal_new ("new-media-stream-handler",
+  signals[NEW_ICE_STREAM_HANDLER] =
+    g_signal_new ("new-ice-stream-handler",
                   G_OBJECT_CLASS_TYPE (gabble_media_session_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
                   NULL, NULL,
-                  gabble_media_session_marshal_VOID__STRING_INT_INT,
-                  G_TYPE_NONE, 3, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_UINT, G_TYPE_UINT);
+                  gabble_media_session_marshal_VOID__STRING_INT_INT_INT,
+                  G_TYPE_NONE, 4, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 
   dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_media_session_class), &dbus_glib_gabble_media_session_object_info);
 }
@@ -115,7 +115,7 @@ gabble_media_session_finalize (GObject *object)
  * gabble_media_session_error
  *
  * Implements DBus method Error
- * on interface org.freedesktop.Telepathy.Media.SessionHandler
+ * on interface org.freedesktop.Telepathy.Ice.SessionHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -133,7 +133,7 @@ gboolean gabble_media_session_error (GabbleMediaSession *obj, guint errno, const
  * gabble_media_session_ready
  *
  * Implements DBus method Ready
- * on interface org.freedesktop.Telepathy.Media.SessionHandler
+ * on interface org.freedesktop.Telepathy.Ice.SessionHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
diff --git a/generate/src/gabble-media-stream.c b/generate/src/gabble-media-stream.c
index c4050f306..ae7d19f41 100644
--- a/generate/src/gabble-media-stream.c
+++ b/generate/src/gabble-media-stream.c
@@ -165,7 +165,7 @@ gabble_media_stream_finalize (GObject *object)
  * gabble_media_stream_codec_choice
  *
  * Implements DBus method CodecChoice
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -183,7 +183,7 @@ gboolean gabble_media_stream_codec_choice (GabbleMediaStream *obj, guint codec_i
  * gabble_media_stream_error
  *
  * Implements DBus method Error
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -201,7 +201,7 @@ gboolean gabble_media_stream_error (GabbleMediaStream *obj, guint errno, const g
  * gabble_media_stream_native_candidates_prepared
  *
  * Implements DBus method NativeCandidatesPrepared
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -219,7 +219,7 @@ gboolean gabble_media_stream_native_candidates_prepared (GabbleMediaStream *obj,
  * gabble_media_stream_new_active_candidate_pair
  *
  * Implements DBus method NewActiveCandidatePair
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -237,7 +237,7 @@ gboolean gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *obj,
  * gabble_media_stream_new_native_candidate
  *
  * Implements DBus method NewNativeCandidate
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -255,7 +255,7 @@ gboolean gabble_media_stream_new_native_candidate (GabbleMediaStream *obj, const
  * gabble_media_stream_ready
  *
  * Implements DBus method Ready
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -273,7 +273,7 @@ gboolean gabble_media_stream_ready (GabbleMediaStream *obj, const GPtrArray * co
  * gabble_media_stream_stream_state
  *
  * Implements DBus method StreamState
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this
@@ -291,7 +291,7 @@ gboolean gabble_media_stream_stream_state (GabbleMediaStream *obj, guint state,
  * gabble_media_stream_supported_codecs
  *
  * Implements DBus method SupportedCodecs
- * on interface org.freedesktop.Telepathy.Media.StreamHandler
+ * on interface org.freedesktop.Telepathy.Ice.StreamHandler
  *
  * @error: Used to return a pointer to a GError detailing any error
  *         that occured, DBus will throw the error only if this