session: rename new to new_with_connection

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

7 files changed, 11 insertions, 11 deletions

diff --git a/tests/wocky-pubsub-node-test.c b/tests/wocky-pubsub-node-test.c
index 945028c..fb53370 100644
--- a/tests/wocky-pubsub-node-test.c
+++ b/tests/wocky-pubsub-node-test.c
@@ -25,7 +25,7 @@ test_instantiation (void)
 
   stream = g_object_new (WOCKY_TYPE_TEST_STREAM, NULL);
   connection = wocky_xmpp_connection_new (stream->stream0);
-  session = wocky_session_new (connection, "example.com");
+  session = wocky_session_new_with_connection (connection, "example.com");
 
   pubsub = wocky_pubsub_service_new (session, "pubsub.localhost");
   g_assert (pubsub != NULL);
@@ -56,7 +56,7 @@ test_make_publish_stanza (void)
 
   stream = g_object_new (WOCKY_TYPE_TEST_STREAM, NULL);
   connection = wocky_xmpp_connection_new (stream->stream0);
-  session = wocky_session_new (connection, "example.com");
+  session = wocky_session_new_with_connection (connection, "example.com");
   pubsub = wocky_pubsub_service_new (session, "pubsub.localhost");
   node = wocky_pubsub_service_ensure_node (pubsub, "track1");
 
diff --git a/tests/wocky-pubsub-service-test.c b/tests/wocky-pubsub-service-test.c
index eba765e..ab1009f 100644
--- a/tests/wocky-pubsub-service-test.c
+++ b/tests/wocky-pubsub-service-test.c
@@ -24,7 +24,7 @@ create_session (void)
 
   stream = g_object_new (WOCKY_TYPE_TEST_STREAM, NULL);
   connection = wocky_xmpp_connection_new (stream->stream0);
-  session = wocky_session_new (connection, "example.com");
+  session = wocky_session_new_with_connection (connection, "example.com");
 
   g_object_unref (connection);
   g_object_unref (stream);
diff --git a/tests/wocky-roster-test.c b/tests/wocky-roster-test.c
index a8fd45d..49a0efc 100644
--- a/tests/wocky-roster-test.c
+++ b/tests/wocky-roster-test.c
@@ -26,7 +26,7 @@ test_instantiation (void)
 
   stream = g_object_new (WOCKY_TYPE_TEST_STREAM, NULL);
   connection = wocky_xmpp_connection_new (stream->stream0);
-  session = wocky_session_new (connection, "example.com");
+  session = wocky_session_new_with_connection (connection, "example.com");
 
   roster = wocky_roster_new (session);
 
diff --git a/tests/wocky-session-test.c b/tests/wocky-session-test.c
index f6846b7..8cca2a5 100644
--- a/tests/wocky-session-test.c
+++ b/tests/wocky-session-test.c
@@ -19,7 +19,7 @@ test_instantiation (void)
   stream = g_object_new (WOCKY_TYPE_TEST_STREAM, NULL);
   connection = wocky_xmpp_connection_new (stream->stream0);
 
-  session = wocky_session_new (connection, "example.com");
+  session = wocky_session_new_with_connection (connection, "example.com");
   g_assert (session != NULL);
   g_assert (WOCKY_IS_SESSION (session));
 
@@ -35,7 +35,7 @@ test_get_porter (void)
   WockySession *session;
   WockyPorter *porter;
 
-  session = wocky_session_new (test->in, "example.com");
+  session = wocky_session_new_with_connection (test->in, "example.com");
 
   porter = wocky_session_get_porter (session);
   g_assert (WOCKY_IS_PORTER (porter));
@@ -51,7 +51,7 @@ test_get_contact_factory (void)
   WockySession *session;
   WockyContactFactory *factory;
 
-  session = wocky_session_new (test->in, "example.com");
+  session = wocky_session_new_with_connection (test->in, "example.com");
 
   factory = wocky_session_get_contact_factory (session);
   g_assert (WOCKY_IS_CONTACT_FACTORY (factory));
diff --git a/tests/wocky-test-helper.c b/tests/wocky-test-helper.c
index ee5e754..3bf7496 100644
--- a/tests/wocky-test-helper.c
+++ b/tests/wocky-test-helper.c
@@ -30,8 +30,8 @@ setup_test_full (guint timeout,
   data->in = wocky_xmpp_connection_new (data->stream->stream0);
   data->out = wocky_xmpp_connection_new (data->stream->stream1);
 
-  data->session_in = wocky_session_new (data->in, in_jid);
-  data->session_out = wocky_session_new (data->out, out_jid);
+  data->session_in = wocky_session_new_with_connection (data->in, in_jid);
+  data->session_out = wocky_session_new_with_connection (data->out, out_jid);
 
   data->sched_in = wocky_session_get_porter (data->session_in);
   data->sched_out = wocky_session_get_porter (data->session_out);
diff --git a/wocky/wocky-session.c b/wocky/wocky-session.c
index 6e99e6e..baf50d2 100644
--- a/wocky/wocky-session.c
+++ b/wocky/wocky-session.c
@@ -226,7 +226,7 @@ wocky_session_class_init (WockySessionClass *wocky_session_class)
 }
 
 WockySession *
-wocky_session_new (WockyXmppConnection *conn,
+wocky_session_new_with_connection (WockyXmppConnection *conn,
     const gchar *full_jid)
 {
   return g_object_new (WOCKY_TYPE_SESSION,
diff --git a/wocky/wocky-session.h b/wocky/wocky-session.h
index 98b2094..d307cb0 100644
--- a/wocky/wocky-session.h
+++ b/wocky/wocky-session.h
@@ -62,7 +62,7 @@ GType wocky_session_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_SESSION, \
    WockySessionClass))
 
-WockySession * wocky_session_new (WockyXmppConnection *conn,
+WockySession * wocky_session_new_with_connection (WockyXmppConnection *conn,
     const gchar *full_jid);
 
 void wocky_session_start (WockySession *session);