aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libempathy/empathy-chandler.c11
-rw-r--r--libempathy/empathy-filter.c12
3 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f075c18f9..2ec015bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13 Xavier Claessens <xclaesse@gmail.com>
+
+ * libempathy/empathy-chandler.c:
+ * libempathy/empathy-filter.c: Do not use deprecated tp_conn_new(), use
+ tp_conn_new_without_connect() instead.
+
2007-11-12 Xavier Claessens <xclaesse@gmail.com>
* configure.ac: Bump version to 0.21.3.
diff --git a/libempathy/empathy-chandler.c b/libempathy/empathy-chandler.c
index 3586e97a4..2ebbde968 100644
--- a/libempathy/empathy-chandler.c
+++ b/libempathy/empathy-chandler.c
@@ -129,9 +129,14 @@ empathy_chandler_handle_channel (EmpathyChandler *chandler,
TpChan *tp_chan;
TpConn *tp_conn;
- tp_conn = tp_conn_new (tp_get_bus (),
- bus_name,
- connection);
+ tp_conn = tp_conn_new_without_connect (tp_get_bus (),
+ bus_name,
+ connection,
+ NULL,
+ error);
+ if (!tp_conn) {
+ return FALSE;
+ }
tp_chan = tp_chan_new (tp_get_bus(),
bus_name,
diff --git a/libempathy/empathy-filter.c b/libempathy/empathy-filter.c
index f28d182c1..700f9819b 100644
--- a/libempathy/empathy-filter.c
+++ b/libempathy/empathy-filter.c
@@ -214,9 +214,15 @@ empathy_filter_filter_channel (EmpathyFilter *filter,
priv = GET_PRIV (filter);
- tp_conn = tp_conn_new (tp_get_bus (),
- bus_name,
- connection);
+ tp_conn = tp_conn_new_without_connect (tp_get_bus (),
+ bus_name,
+ connection,
+ NULL,
+ error);
+ if (!tp_conn) {
+ return FALSE;
+ }
+
tp_chan = tp_chan_new (tp_get_bus(),
bus_name,