From 7a7c1fc7f2a94fea91c66e9be35e8d6d81c0c7fe Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Wed, 17 Jun 2009 22:25:19 +0100
Subject: Hide the terminate button.

The terminate button is a last resort and shouldn't be promoted in the UI.

This commit hides it behind a right click menu instead.
This also hides the 'Set as Fallback' label in the glade file.
---
 src/streamwidget.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/streamwidget.cc')

diff --git a/src/streamwidget.cc b/src/streamwidget.cc
index fd737fd..256e56a 100644
--- a/src/streamwidget.cc
+++ b/src/streamwidget.cc
@@ -31,12 +31,11 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
 
     x->get_widget("lockToggleButton", lockToggleButton);
     x->get_widget("muteToggleButton", muteToggleButton);
-    x->get_widget("terminateButton", terminateButton);
     x->get_widget("directionLabel", directionLabel);
     x->get_widget("deviceButton", deviceButton);
     x->get_widget("deviceLabel", deviceLabel);
-    
-    terminateButton->signal_clicked().connect(sigc::mem_fun(*this, &StreamWidget::onKill));
+
+    this->signal_button_press_event().connect(sigc::mem_fun(*this, &StreamWidget::onWidgetButtonEvent));
     muteToggleButton->signal_clicked().connect(sigc::mem_fun(*this, &StreamWidget::onMuteToggleButton));
     deviceButton->signal_button_press_event().connect(sigc::mem_fun(*this, &StreamWidget::onDeviceChangePopup));
 
@@ -44,7 +43,9 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
         channelWidgets[i] = NULL;
 }
 
-void StreamWidget::onKill() {
+
+bool StreamWidget::onWidgetButtonEvent(GdkEventButton*) {
+    return false;
 }
 
 void StreamWidget::setChannelMap(const pa_channel_map &m, bool can_decibel) {
-- 
cgit