Merged in dwmw2/pidgin-trac17273/release-2.x.y (pull request #302) release-2.x.y

Tue, 26 Dec 2017 06:08:28 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Tue, 26 Dec 2017 06:08:28 +0000
branch
release-2.x.y
changeset 38819
c48fb1079d43
parent 38812
449bef735ed5 (current diff)
parent 38818
87ae8821ef63 (diff)
child 38820
b7d87d36bb29

Merged in dwmw2/pidgin-trac17273/release-2.x.y (pull request #302)

Pidgin: Indicate mute/unmute status when changed remotely.

Approved-by: Gary Kramlich <grim@reaperworld.com>

--- a/pidgin/gtkmedia.c	Thu Dec 14 22:31:36 2017 -0600
+++ b/pidgin/gtkmedia.c	Tue Dec 26 06:08:28 2017 +0000
@@ -1112,6 +1112,10 @@
 		gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
 				0, _("Call in progress."));
 		gtk_widget_show(GTK_WIDGET(gtkmedia));
+	} else if (type == PURPLE_MEDIA_INFO_MUTE && !local) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkmedia->priv->mute), TRUE);
+	} else if (type == PURPLE_MEDIA_INFO_UNMUTE && !local) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkmedia->priv->mute), FALSE);
 	}
 }
 

mercurial