empathy r914 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr 11 14:11:20 2008
New Revision: 914
URL: http://svn.gnome.org/viewvc/empathy?rev=914&view=rev

Log:
TpChannel is not a DBusGProxy


Modified:
   trunk/libempathy/empathy-tp-call.c

Modified: trunk/libempathy/empathy-tp-call.c
==============================================================================
--- trunk/libempathy/empathy-tp-call.c	(original)
+++ trunk/libempathy/empathy-tp-call.c	Fri Apr 11 14:11:20 2008
@@ -19,7 +19,6 @@
  */
 
 #include <string.h>
-#include <dbus/dbus-glib.h>
 
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/dbus.h>
@@ -761,7 +760,7 @@
       output_video_socket_id);
 
   emp_cli_stream_engine_call_set_output_window (priv->stream_engine, -1,
-      dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
+      TP_PROXY (priv->channel)->object_path,
       priv->video->id, output_video_socket_id,
       tp_call_async_cb,
       "setting output window", NULL,
@@ -780,7 +779,7 @@
   empathy_debug (DEBUG_DOMAIN, "Setting output volume: %d", volume);
 
   emp_cli_stream_engine_call_set_output_volume (priv->stream_engine, -1,
-      dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
+      TP_PROXY (priv->channel)->object_path,
       priv->audio->id, volume,
       tp_call_async_cb,
       "setting output volume", NULL,
@@ -799,7 +798,7 @@
   empathy_debug (DEBUG_DOMAIN, "Setting output mute: %d", is_muted);
 
   emp_cli_stream_engine_call_mute_output (priv->stream_engine, -1,
-      dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
+      TP_PROXY (priv->channel)->object_path,
       priv->audio->id, is_muted,
       tp_call_async_cb,
       "muting output", NULL,
@@ -818,7 +817,7 @@
   empathy_debug (DEBUG_DOMAIN, "Setting input mute: %d", is_muted);
 
   emp_cli_stream_engine_call_mute_input (priv->stream_engine, -1,
-      dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
+      TP_PROXY (priv->channel)->object_path,
       priv->audio->id, is_muted,
       tp_call_async_cb,
       "muting input", NULL,