diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-08-16 08:41:31 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-08-16 08:41:31 +0200 |
| commit | fa7f6fd4b75d3cd9320bc9ce5c763a976eddb08e (patch) | |
| tree | de1b753928d6ba25ad800819e81f4dd3ff3e1904 | |
| parent | f59e4cb645689dcf0ddab9fbdf17f742b011d7fa (diff) | |
| parent | 0eadc83ce4c3714fb1d2bcb270127ab72cb68c0a (diff) | |
Merge branch 'devel' of ssh://deadbeef.git.sourceforge.net/gitroot/deadbeef/deadbeef into devel
Conflicts:
plugins/gtkui/callbacks.c
| -rw-r--r-- | plugins/gtkui/deadbeef.glade | 1 | ||||
| -rw-r--r-- | plugins/gtkui/interface.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index be214120..9f99cdca 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -882,6 +882,7 @@ <widget class="GtkStatusbar" id="statusbar"> <property name="visible">True</property> <property name="has_resize_grip">True</property> + <signal name="button_press_event" handler="on_statusbar_button_press_event" last_modification_time="Sun, 15 Aug 2010 20:30:35 GMT"/> </widget> <packing> <property name="padding">0</property> diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index 61521323..a4ba9d50 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -692,6 +692,9 @@ create_mainwin (void) g_signal_connect ((gpointer) nextbtn, "clicked", G_CALLBACK (on_nextbtn_clicked), NULL); + g_signal_connect ((gpointer) statusbar, "button_press_event", + G_CALLBACK (on_statusbar_button_press_event), + NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (mainwin, mainwin, "mainwin"); |