Updates for API changes caused by APIs becoming stable

7 files changed, 26 insertions, 25 deletions

diff --git a/docs/examples/glib_salut_ft/gnio-receiver.c b/docs/examples/glib_salut_ft/gnio-receiver.c
index 42c0e65..eb9ff52 100644
--- a/docs/examples/glib_salut_ft/gnio-receiver.c
+++ b/docs/examples/glib_salut_ft/gnio-receiver.c
@@ -54,7 +54,7 @@ accept_file_cb (TpChannel	*channel,
 	handle_error (in_error);
 
 	ftstate->address = tp_g_socket_address_from_variant (ftstate->type,
-			addressv);
+			addressv, NULL);
 }
 
 static void
diff --git a/docs/examples/glib_salut_ft/gnio-sender.c b/docs/examples/glib_salut_ft/gnio-sender.c
index 1ea68bd..b0015ff 100644
--- a/docs/examples/glib_salut_ft/gnio-sender.c
+++ b/docs/examples/glib_salut_ft/gnio-sender.c
@@ -54,7 +54,7 @@ provide_file_cb (TpChannel	*channel,
 	handle_error (in_error);
 
 	ftstate->address = tp_g_socket_address_from_variant (ftstate->type,
-			addressv);
+			addressv, NULL);
 }
 
 static void
diff --git a/docs/examples/glib_stream_tube/accept-tube.c b/docs/examples/glib_stream_tube/accept-tube.c
index 1202c68..9e94d88 100644
--- a/docs/examples/glib_stream_tube/accept-tube.c
+++ b/docs/examples/glib_stream_tube/accept-tube.c
@@ -58,7 +58,7 @@ tube_accept_cb (TpChannel	*channel,
 	g_print ("variant type = %s\n", G_VALUE_TYPE_NAME (address));
 	sockaddr = tp_g_socket_address_from_variant (
 			TP_SOCKET_ADDRESS_TYPE_IPV4,
-			address);
+			address, NULL);
 
 	/* FIXME: I _think_ the spec says you need to wait for state Open and 
 	 * this callback -- seeking spec clarification */
diff --git a/docs/examples/glib_stream_tube/offer-tube.c b/docs/examples/glib_stream_tube/offer-tube.c
index 07e72af..18c4d0d 100644
--- a/docs/examples/glib_stream_tube/offer-tube.c
+++ b/docs/examples/glib_stream_tube/offer-tube.c
@@ -72,7 +72,7 @@ channel_ready (TpChannel	*channel,
 			NULL);
 
 	GValue *value = tp_address_variant_from_g_socket_address (
-			server_sockaddr, NULL);
+			server_sockaddr, NULL, NULL);
 
 	tp_cli_channel_type_stream_tube_call_offer (channel, -1,
 			TP_SOCKET_ADDRESS_TYPE_IPV4, value,
diff --git a/docs/examples/gtk_presence_app/example.c b/docs/examples/gtk_presence_app/example.c
index a567687..5c32c81 100644
--- a/docs/examples/gtk_presence_app/example.c
+++ b/docs/examples/gtk_presence_app/example.c
@@ -29,6 +29,14 @@ dump_children (GtkWidget *widget,
 }
 
 static void
+account_removed (TpAccountManager *am,
+                 TpAccount        *acct,
+                 GtkWidget        *widget)
+{
+  gtk_widget_destroy (widget);
+}
+
+static void
 account_created (TpAccountManager *am,
                  TpAccount        *acct,
                  PresenceWindow   *window)
@@ -41,18 +49,21 @@ static void
 account_manager_ready (TpAccountManager *am,
                        PresenceWindow   *window)
 {
-  GList *l, *accounts = tp_account_manager_get_accounts (am);
+  GList *l, *accounts = tp_account_manager_get_valid_accounts (am);
   for (l = accounts; l != NULL; l = l->next)
     {
       TpAccount *acct = TP_ACCOUNT (l->data);
 
       GtkWidget *widget = presence_widget_new (acct);
       presence_window_add_widget (window, PRESENCE_WIDGET (widget));
+
+      g_signal_connect (am, "account-removed",
+          G_CALLBACK (account_removed), widget);
     }
 
   g_list_free (accounts);
 
-  g_signal_connect (am, "account-created",
+  g_signal_connect (am, "account-enabled",
       G_CALLBACK (account_created), window);
 }
 
@@ -63,7 +74,7 @@ _am_ready (GObject      *am,
 {
   GError *error = NULL;
 
-  if (!tp_account_manager_become_ready_finish (TP_ACCOUNT_MANAGER (am), res,
+  if (!tp_account_manager_prepare_finish (TP_ACCOUNT_MANAGER (am), res,
       &error))
     {
       g_error ("ERROR: %s", error->message);
@@ -88,8 +99,7 @@ main (int argc, char **argv)
 
   /* we want to request some AM features */
   GQuark features[] = { TP_ACCOUNT_MANAGER_FEATURE_CORE }; // FIXME const?
-  tp_account_manager_become_ready_async (am, features,
-      _am_ready, window);
+  tp_account_manager_prepare_async (am, features, _am_ready, window);
 
   gtk_widget_show (window);
 
diff --git a/docs/examples/gtk_presence_app/presence-chooser.c b/docs/examples/gtk_presence_app/presence-chooser.c
index d03af4c..8dceecd 100644
--- a/docs/examples/gtk_presence_app/presence-chooser.c
+++ b/docs/examples/gtk_presence_app/presence-chooser.c
@@ -189,7 +189,7 @@ presence_chooser_constructed (GObject *self)
       G_CALLBACK (_status_changed), self);
 
   _status_changed (PRESENCE_CHOOSER (self), 0,
-      tp_account_get_connection_status (priv->account),
+      tp_account_get_connection_status (priv->account, NULL),
       0, priv->account);
 }
 
diff --git a/docs/examples/gtk_presence_app/presence-widget.c b/docs/examples/gtk_presence_app/presence-widget.c
index 8736fc3..ef69eb9 100644
--- a/docs/examples/gtk_presence_app/presence-widget.c
+++ b/docs/examples/gtk_presence_app/presence-widget.c
@@ -121,7 +121,8 @@ _notify_presence (PresenceWidget *self,
                   TpAccount      *account)
 {
   PresenceWidgetPrivate *priv = GET_PRIVATE (self);
-  TpConnectionPresenceType presence = tp_account_get_presence (account);
+  TpConnectionPresenceType presence = tp_account_get_current_presence (account,
+      NULL, NULL);
 
   const char *icon_name = presence_icons[presence];
 
@@ -135,26 +136,19 @@ _notify_status_message (PresenceWidget *self,
                         TpAccount      *account)
 {
   PresenceWidgetPrivate *priv = GET_PRIVATE (self);
-  const char *msg = tp_account_get_status_message (account);
+  const char *msg;
+
+  tp_account_get_current_presence (account, NULL, &msg);
 
   if (strlen (msg) == 0)
     {
-      TpConnectionPresenceType presence = tp_account_get_presence (account);
-      msg = tp_account_get_status (account);
+      tp_account_get_current_presence (account, &msg, NULL);
     }
 
   gtk_label_set_text (GTK_LABEL (priv->status_message), msg);
 }
 
 static void
-_account_removed (PresenceWidget *self,
-                  TpAccount      *account)
-{
-  /* this account has been removed, destroy ourselves */
-  gtk_widget_destroy (GTK_WIDGET (self));
-}
-
-static void
 presence_widget_constructed (GObject *self)
 {
   PresenceWidgetPrivate *priv = GET_PRIVATE (self);
@@ -175,9 +169,6 @@ presence_widget_constructed (GObject *self)
   g_signal_connect_swapped (priv->account, "notify::status-message",
       G_CALLBACK (_notify_status_message), self);
 
-  g_signal_connect_swapped (priv->account, "removed",
-      G_CALLBACK (_account_removed), self);
-
   _notify_enabled (PRESENCE_WIDGET (self), NULL, priv->account);
   _notify_display_name (PRESENCE_WIDGET (self), NULL, priv->account);
   _notify_presence (PRESENCE_WIDGET (self), NULL, priv->account);