From 255defb371182e10a90b2d5d6f891a742bc7d0cd Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Mon, 16 Mar 2009 20:31:45 +0000
Subject: Remove the kill menu item now we have a dedicated button

---
 src/sinkinputwidget.cc    | 4 ----
 src/sinkinputwidget.h     | 2 +-
 src/sourceoutputwidget.cc | 4 ----
 src/sourceoutputwidget.h  | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc
index 1d60ea4..7bdba79 100644
--- a/src/sinkinputwidget.cc
+++ b/src/sinkinputwidget.cc
@@ -31,7 +31,6 @@
 SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
     StreamWidget(cobject, x),
     titleMenuItem(_("_Move Stream..."), true),
-    killMenuItem(_("_Terminate Stream"), true),
     mpMainWindow(NULL) {
 
     directionLabel->set_label(_("<i>Playing on </i> "));
@@ -40,9 +39,6 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gno
 
     menu.append(titleMenuItem);
     titleMenuItem.set_submenu(submenu);
-
-    menu.append(killMenuItem);
-    killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SinkInputWidget::onKill));
 }
 
 void SinkInputWidget::init(MainWindow* mainWindow) {
diff --git a/src/sinkinputwidget.h b/src/sinkinputwidget.h
index 6cb91a8..5eb431e 100644
--- a/src/sinkinputwidget.h
+++ b/src/sinkinputwidget.h
@@ -45,7 +45,7 @@ public:
     virtual void prepareMenu();
 
     Gtk::Menu submenu;
-    Gtk::MenuItem titleMenuItem, killMenuItem;
+    Gtk::MenuItem titleMenuItem;
 
     struct SinkMenuItem {
         SinkMenuItem(SinkInputWidget *w, const char *label, uint32_t i, bool active) :
diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc
index d4f0430..9076578 100644
--- a/src/sourceoutputwidget.cc
+++ b/src/sourceoutputwidget.cc
@@ -31,7 +31,6 @@
 SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
     StreamWidget(cobject, x),
     titleMenuItem(_("_Move Stream..."), true),
-    killMenuItem(_("_Terminate Stream"), true),
     mpMainWindow(NULL) {
 
     directionLabel->set_label(_("<i>Recording from </i> "));
@@ -40,9 +39,6 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP
 
     menu.append(titleMenuItem);
     titleMenuItem.set_submenu(submenu);
-
-    menu.append(killMenuItem);
-    killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SourceOutputWidget::onKill));
 }
 
 void SourceOutputWidget::init(MainWindow* mainWindow) {
diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h
index 055acb4..8c4b995 100644
--- a/src/sourceoutputwidget.h
+++ b/src/sourceoutputwidget.h
@@ -42,7 +42,7 @@ public:
     virtual void onKill();
 
     Gtk::Menu submenu;
-    Gtk::MenuItem titleMenuItem, killMenuItem;
+    Gtk::MenuItem titleMenuItem;
 
     struct SourceMenuItem {
         SourceMenuItem(SourceOutputWidget *w, const char *label, uint32_t i, bool active) :
-- 
cgit