empathy r980 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r980 - trunk/libempathy
- Date: Sat, 19 Apr 2008 22:04:17 +0100 (BST)
Author: xclaesse
Date: Sat Apr 19 21:04:16 2008
New Revision: 980
URL: http://svn.gnome.org/viewvc/empathy?rev=980&view=rev
Log:
Add empathy_offer_ipv4_stream_tube().
Modified:
trunk/libempathy/empathy-tp-tube.c
trunk/libempathy/empathy-tp-tube.h
trunk/libempathy/empathy-tube-handler.c
Modified: trunk/libempathy/empathy-tp-tube.c
==============================================================================
--- trunk/libempathy/empathy-tp-tube.c (original)
+++ trunk/libempathy/empathy-tp-tube.c Sat Apr 19 21:04:16 2008
@@ -23,7 +23,6 @@
#include <telepathy-glib/connection.h>
-#include "empathy-contact.h"
#include "empathy-contact-factory.h"
#include "empathy-debug.h"
#include "empathy-enum-types.h"
@@ -487,6 +486,7 @@
empathy_debug (DEBUG_DOMAIN, "Getting stream tube socket address");
+ /* FIXME: Same than for empathy_tp_tube_get_unix_socket() */
if (!tp_cli_channel_type_tubes_run_get_stream_tube_socket_address (priv->channel,
-1, priv->id, &address_type, &address, &error, NULL))
{
@@ -501,3 +501,77 @@
g_free (address);
}
+void
+empathy_offer_ipv4_stream_tube (EmpathyContact *contact,
+ const gchar *hostname,
+ guint port,
+ const gchar *service)
+{
+ MissionControl *mc;
+ McAccount *account;
+ TpConnection *connection;
+ TpChannel *channel;
+ gchar *object_path;
+ guint id;
+ GHashTable *params;
+ GValue *address;
+ GValue *control_param;
+ GError *error = NULL;
+
+ mc = empathy_mission_control_new ();
+ account = empathy_contact_get_account (contact);
+ connection = mission_control_get_tpconnection (mc, account, NULL);
+
+ if (!tp_cli_connection_run_request_channel (connection, -1,
+ TP_IFACE_CHANNEL_TYPE_TUBES, TP_HANDLE_TYPE_CONTACT,
+ empathy_contact_get_handle (contact), FALSE, &object_path, &error, NULL))
+ {
+ g_clear_error (&error);
+ g_object_unref (mc);
+ g_object_unref (account);
+ g_object_unref (connection);
+ return;
+ }
+
+ empathy_debug (DEBUG_DOMAIN, "Offering a new stream tube");
+
+ channel = tp_channel_new (connection, object_path,
+ TP_IFACE_CHANNEL_TYPE_TUBES, TP_HANDLE_TYPE_CONTACT,
+ empathy_contact_get_handle (contact), NULL);
+
+ params = g_hash_table_new (g_str_hash, g_str_equal);
+ address = g_new0 (GValue, 1);
+ g_value_init (address,
+ dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT,
+ G_TYPE_INVALID));
+ g_value_take_boxed (address,
+ dbus_g_type_specialized_construct (dbus_g_type_get_struct ("GValueArray",
+ G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID)));
+ dbus_g_type_struct_set (address, 0, hostname, 1, port, G_MAXUINT);
+
+ /* localhost access control, variant is ignored */
+ control_param = g_new0 (GValue, 1);
+ g_value_init (control_param, G_TYPE_STRING);
+
+ if (!tp_cli_channel_type_tubes_run_offer_stream_tube (channel, -1,
+ service, params, TP_SOCKET_ADDRESS_TYPE_IPV4, address,
+ TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, &id, &error, NULL))
+ {
+ empathy_debug (DEBUG_DOMAIN, "Couldn't offer tube: %s", error->message);
+ g_clear_error (&error);
+ }
+
+ empathy_debug (DEBUG_DOMAIN, "Stream tube id=%d offered", id);
+
+ g_object_unref (channel);
+ g_free (object_path);
+ g_hash_table_destroy (params);
+ g_value_reset (address);
+ g_value_reset (control_param);
+ g_free (address);
+ g_free (control_param);
+ g_object_unref (mc);
+ g_object_unref (account);
+ g_object_unref (connection);
+}
+
Modified: trunk/libempathy/empathy-tp-tube.h
==============================================================================
--- trunk/libempathy/empathy-tp-tube.h (original)
+++ trunk/libempathy/empathy-tp-tube.h Sat Apr 19 21:04:16 2008
@@ -26,6 +26,8 @@
#include <telepathy-glib/channel.h>
+#include "empathy-contact.h"
+
G_BEGIN_DECLS
#define EMPATHY_TYPE_TP_TUBE (empathy_tp_tube_get_type ())
@@ -59,6 +61,9 @@
guint *port);
gchar * empathy_tp_tube_get_unix_socket (EmpathyTpTube *tube);
+void empathy_offer_ipv4_stream_tube (EmpathyContact *contact,
+ const gchar *hostname, guint port, const gchar *service);
+
G_END_DECLS
#endif /* __EMPATHY_TP_TUBE_H__ */
Modified: trunk/libempathy/empathy-tube-handler.c
==============================================================================
--- trunk/libempathy/empathy-tube-handler.c (original)
+++ trunk/libempathy/empathy-tube-handler.c Sat Apr 19 21:04:16 2008
@@ -70,7 +70,7 @@
EmpathyTpTube *tube;
static TpDBusDaemon *daemon = NULL;
- empathy_debug (DEBUG_DOMAIN, "New tube to be handled");
+ empathy_debug (DEBUG_DOMAIN, "New tube to be handled id=%d", idle_data->id);
if (!daemon)
daemon = tp_dbus_daemon_new (tp_get_bus ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]