summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2009-06-28 16:00:35 +0100
committerColin Guthrie <cguthrie@mandriva.org>2009-06-28 16:00:35 +0100
commitac052e1a30d1aeb7c514f9dd4eb8e6fb50382185 (patch)
tree2be1d4a793974e9168d7482381916b14b57a73cb
parent61cae8cd403ab6ff5e75d51edd0158e9335865fb (diff)
Rename event method to be more indicative of what it does.
-rw-r--r--src/sinkinputwidget.cc2
-rw-r--r--src/sinkinputwidget.h2
-rw-r--r--src/sourceoutputwidget.cc2
-rw-r--r--src/sourceoutputwidget.h2
-rw-r--r--src/streamwidget.cc4
-rw-r--r--src/streamwidget.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc
index 36f368a..f956885 100644
--- a/src/sinkinputwidget.cc
+++ b/src/sinkinputwidget.cc
@@ -99,7 +99,7 @@ void SinkInputWidget::onMuteToggleButton() {
pa_operation_unref(o);
}
-bool SinkInputWidget::onWidgetButtonEvent(GdkEventButton* event) {
+bool SinkInputWidget::onContextTriggerEvent(GdkEventButton* event) {
if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
contextMenu.popup(event->button, event->time);
return true;
diff --git a/src/sinkinputwidget.h b/src/sinkinputwidget.h
index 36141da..bab7f4b 100644
--- a/src/sinkinputwidget.h
+++ b/src/sinkinputwidget.h
@@ -42,7 +42,7 @@ public:
uint32_t sinkIndex();
virtual void executeVolumeUpdate();
virtual void onDeviceChangePopup();
- virtual bool onWidgetButtonEvent(GdkEventButton*);
+ virtual bool onContextTriggerEvent(GdkEventButton*);
virtual void onMuteToggleButton();
virtual void onKill();
diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc
index 450e339..19290f0 100644
--- a/src/sourceoutputwidget.cc
+++ b/src/sourceoutputwidget.cc
@@ -73,7 +73,7 @@ uint32_t SourceOutputWidget::sourceIndex() {
return mSourceIndex;
}
-bool SourceOutputWidget::onWidgetButtonEvent(GdkEventButton* event) {
+bool SourceOutputWidget::onContextTriggerEvent(GdkEventButton* event) {
if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
contextMenu.popup(event->button, event->time);
return true;
diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h
index 36c4cc6..162551f 100644
--- a/src/sourceoutputwidget.h
+++ b/src/sourceoutputwidget.h
@@ -41,7 +41,7 @@ public:
void setSourceIndex(uint32_t idx);
uint32_t sourceIndex();
virtual void onDeviceChangePopup();
- virtual bool onWidgetButtonEvent(GdkEventButton*);
+ virtual bool onContextTriggerEvent(GdkEventButton*);
virtual void onKill();
private:
diff --git a/src/streamwidget.cc b/src/streamwidget.cc
index 2b47f1b..3a76d1a 100644
--- a/src/streamwidget.cc
+++ b/src/streamwidget.cc
@@ -34,7 +34,7 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
x->get_widget("directionLabel", directionLabel);
x->get_widget("deviceButton", deviceButton);
- this->signal_button_press_event().connect(sigc::mem_fun(*this, &StreamWidget::onWidgetButtonEvent));
+ this->signal_button_press_event().connect(sigc::mem_fun(*this, &StreamWidget::onContextTriggerEvent));
muteToggleButton->signal_clicked().connect(sigc::mem_fun(*this, &StreamWidget::onMuteToggleButton));
deviceButton->signal_clicked().connect(sigc::mem_fun(*this, &StreamWidget::onDeviceChangePopup));
@@ -43,7 +43,7 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
}
-bool StreamWidget::onWidgetButtonEvent(GdkEventButton*) {
+bool StreamWidget::onContextTriggerEvent(GdkEventButton*) {
return false;
}
diff --git a/src/streamwidget.h b/src/streamwidget.h
index 7fe13ee..7c052ad 100644
--- a/src/streamwidget.h
+++ b/src/streamwidget.h
@@ -46,7 +46,7 @@ public:
virtual void onMuteToggleButton();
virtual void onDeviceChangePopup();
- virtual bool onWidgetButtonEvent(GdkEventButton*);
+ virtual bool onContextTriggerEvent(GdkEventButton*);
sigc::connection timeoutConnection;