*** empty log message ***R0_3_2

5 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e71c86a..78cb714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ New Features:
  - Mute/Unmute button added to the gui.
  - When muted, the audio signal is overwritten with a lowvolume 440Hz signal.
  - The number of thumbnails shown are now calculated (no longer fixed to 3)
+ - Added the mplex2 library as a dependency to the server.
 
 Bug Fixes:
  - Font size of name label adjusted in mainwindow.
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index ff276cc..eaadad6 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -14,7 +14,9 @@ EXTRA_DIST = \
 	info.png \
 	error.png \
 	question.png \
-	backspace.png
+	backspace.png \
+	unmute.png \
+	mute.png
 
 pixmapdir = $(datadir)/pixmaps
 
@@ -34,5 +36,6 @@ pixmap_DATA = \
 	info.png \
 	error.png \
 	question.png \
-	backspace.png
-
+	backspace.png \
+	unmute.png \
+	mute.png
diff --git a/pixmaps/mute.png b/pixmaps/mute.png
new file mode 100644
index 0000000..c18a0bd
--- /dev/null
+++ b/pixmaps/mute.png
diff --git a/pixmaps/unmute.png b/pixmaps/unmute.png
new file mode 100644
index 0000000..620a7bf
--- /dev/null
+++ b/pixmaps/unmute.png
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 9ea5285..279fab6 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -255,7 +255,7 @@ void MainWindow::createGui()
   g1->addWidget(btn_freeze, 3, 2);
   
   btn_mute = createButton("");
-  btn_mute->setPixmap(*img_mute);
+  btn_mute->setPixmap(*img_unmute);
   QObject::connect( btn_mute, SIGNAL(clicked()), this, SLOT(mute_clicked()) );
   g1->addWidget(btn_mute, 3, 3);
   
@@ -557,8 +557,8 @@ void MainWindow::freeze_clicked()
 void MainWindow::mute_clicked()
 {
   muted = !muted;
-  if(muted) btn_mute->setPixmap(*img_unmute);
-  else btn_mute->setPixmap(*img_mute);
+  if(muted) btn_mute->setPixmap(*img_mute);
+  else btn_mute->setPixmap(*img_unmute);
 
   camera->setMute(muted);
 }