* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Authors: Xavier Claessens <xclaesse@gmail.com>
* Elliot Fairweather <elliot.fairweather@collabora.co.uk>
*/
#include <extensions/extensions.h>
-#include "empathy-tp-tube.h"
#include "empathy-tube-handler.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
gchar *channel;
guint handle_type;
guint handle;
- EmpathyTpTube *tube;
+ TpChannel *tube;
} IdleData;
-static void
-tube_ready_cb (EmpathyTpTube *tube,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- IdleData *idle_data = user_data;
-
- g_signal_emit (idle_data->thandler, signals[NEW_TUBE], 0, tube);
-}
-
static void
tube_ready_destroy_notify (gpointer data)
{
static void
channel_ready_cb (TpChannel *channel,
- const GError *error,
- gpointer data)
+ const GError *error,
+ gpointer data)
{
IdleData *idle_data = data;
return;
}
- idle_data->tube = empathy_tp_tube_new (channel);
- empathy_tp_tube_call_when_ready (idle_data->tube, tube_ready_cb, idle_data,
- tube_ready_destroy_notify, NULL);
+ g_signal_emit (idle_data->thandler, signals[NEW_TUBE], 0, idle_data->tube);
g_object_unref (channel);
}
static void
connection_ready_cb (TpConnection *connection,
- const GError *error,
- gpointer data)
+ const GError *error,
+ gpointer data)
{
TpChannel *channel;
IdleData *idle_data = data;
static void
tube_handler_handle_tube (EmpSvcTubeHandler *self,
- const gchar *bus_name,
- const gchar *connection,
- const gchar *channel,
- guint handle_type,
- guint handle,
- DBusGMethodInvocation *context)
+ const gchar *bus_name,
+ const gchar *connection,
+ const gchar *channel,
+ guint handle_type,
+ guint handle,
+ DBusGMethodInvocation *context)
{
EmpathyTubeHandler *thandler = EMPATHY_TUBE_HANDLER (self);
IdleData *data;
signals[NEW_TUBE] =
g_signal_new ("new-tube", G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, EMPATHY_TYPE_TP_TUBE);
+ G_TYPE_NONE, 1, TP_TYPE_CHANNEL);
}
static void
}
EmpathyTubeHandler *
-empathy_tube_handler_new (TpTubeType type, const gchar *service)
+empathy_tube_handler_new (TpTubeType type,
+ const gchar *service)
{
EmpathyTubeHandler *thandler = NULL;
DBusGProxy *proxy;
return str;
}
-