Changed 'muted' to 'audio' flag in chime-meeting.c

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/chime/chime-meeting.c b/chime/chime-meeting.c
index 47e91e5b7e336b312312dfa36b4624751265ba7a..fba2c8858c98223cbede1c6c61b139ddaba2a243 100644 (file)
--- a/chime/chime-meeting.c
+++ b/chime/chime-meeting.c
@@ -783,8 +783,8 @@ static void chime_connection_open_meeting(ChimeConnection *cxn, ChimeMeeting *me
 {
        if (!meeting->opens++) {
                meeting->cxn = cxn;
-               gboolean muted = !!g_object_get_data(G_OBJECT(task), "call-muted");
-               chime_connection_open_call(cxn, meeting->call, muted);
+               gboolean audio = !!g_object_get_data(G_OBJECT(task), "audio-on");
+               chime_connection_open_call(cxn, meeting->call, !audio);
        }
 
        g_task_return_pointer(task, g_object_ref(meeting), g_object_unref);
@@ -806,7 +806,7 @@ static void join_got_room(GObject *source, GAsyncResult *result, gpointer user_d
 
 void chime_connection_join_meeting_async(ChimeConnection *cxn,
                                         ChimeMeeting *meeting,
-                                        gboolean muted,
+                                        gboolean audio,
                                         GCancellable *cancellable,
                                         GAsyncReadyCallback callback,
                                         gpointer user_data)
@@ -815,8 +815,8 @@ void chime_connection_join_meeting_async(ChimeConnection *cxn,
 
        GTask *task = g_task_new(cxn, cancellable, callback, user_data);
        g_task_set_task_data(task, g_object_ref(meeting), g_object_unref);
-       if (muted)
-               g_object_set_data(G_OBJECT(task), "call-muted", GUINT_TO_POINTER(1));
+       if (audio)
+               g_object_set_data(G_OBJECT(task), "audio-on", GUINT_TO_POINTER(1));
 
        if (meeting->chat_room_id) {
                ChimeRoom *room = chime_connection_room_by_id(cxn, meeting->chat_room_id);

diff --git a/chime/chime-meeting.h b/chime/chime-meeting.h
index 6edb90ef50065ed00cfbc2a642494727f36b88cc..c2a4ae3badbfb653d945ef6981c31ee9b908f9a8 100644 (file)
--- a/chime/chime-meeting.h
+++ b/chime/chime-meeting.h
@@ -132,7 +132,7 @@ ChimeMeeting *chime_connection_lookup_meeting_by_pin_finish(ChimeConnection *sel
 
 void chime_connection_join_meeting_async(ChimeConnection *cxn,
                                         ChimeMeeting *meeting,
-                                        gboolean muted,
+                                        gboolean audio,
                                         GCancellable *cancellable,
                                         GAsyncReadyCallback callback,
                                         gpointer user_data);

diff --git a/prpl/meeting.c b/prpl/meeting.c
index 1204188c6101a172103acb8d9229df82c5c7f37f..515887be58030b37f2180a2668af3596c33640b0 100644 (file)
--- a/prpl/meeting.c
+++ b/prpl/meeting.c
@@ -228,7 +228,7 @@ static void pin_join_done(GObject *source, GAsyncResult *result, gpointer _pjd)
                                    _("Unable to lookup meeting"),
                                    error->message);
        } else {
-               chime_connection_join_meeting_async(cxn, mtg, !pjd->audio,
+               chime_connection_join_meeting_async(cxn, mtg, pjd->audio,
                                                    NULL, join_mtg_done,
                                                    pjd->conn);
                g_object_unref(mtg);
@@ -329,7 +329,7 @@ static void do_join_joinable(PurpleConnection *conn, GList *row, gboolean audio)
                                }
                        }
                }
-               chime_connection_join_meeting_async(cxn, mtg, !audio, NULL,
+               chime_connection_join_meeting_async(cxn, mtg, audio, NULL,
                                                    join_mtg_done, conn);
        }
 }
@@ -532,7 +532,7 @@ static void media_initiated_cb(GObject *source, GAsyncResult *result, gpointer _
                return;
        }
 
-       chime_connection_join_meeting_async(cxn, mtg, FALSE, NULL, join_mtg_done, conn);
+       chime_connection_join_meeting_async(cxn, mtg, TRUE, NULL, join_mtg_done, conn);
        g_object_unref(mtg);
 }