diff options
| author |  waker <wakeroid@gmail.com> | 2011-10-23 11:50:41 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-10-23 11:50:41 +0200 |
| commit | a9c813ddbda28a2d0beff104fe8cf80299292533 (patch) | |
| tree | 5630dfd20c5e4484148dc4fde06fdb2a0e9aeefa /plugins/gtkui/callbacks.h | |
| parent | 2f2937a5554d4cdca177eb546a0e0c449b16c700 (diff) | |
| parent | 50208fdf54d7afaf8b42abc511ddc675b9475184 (diff) | |
Merge branch 'master' into devel
Conflicts:
deadbeef.h
metacache.c
playlist.c
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddbcellrenderertextmultiline.h
plugins/gtkui/ddbequalizer.c
plugins/gtkui/ddbequalizer.h
plugins/gtkui/ddbseekbar.c
plugins/gtkui/ddbseekbar.h
plugins/gtkui/ddbtabstrip.c
plugins/gtkui/fileman.c
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/gtkui/trkproperties.c
Diffstat (limited to 'plugins/gtkui/callbacks.h')
| -rw-r--r-- | plugins/gtkui/callbacks.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index 1c407678..9af9a4bf 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -277,10 +277,6 @@ on_volumebar_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data); -void -on_main_quit (GtkObject *object, - gpointer user_data); - gboolean on_mainwin_delete_event (GtkWidget *widget, GdkEvent *event, @@ -1105,6 +1101,10 @@ on_replaygain_preamp_value_changed (GtkRange *range, gpointer user_data); void +on_global_preamp_value_changed (GtkRange *range, + gpointer user_data); + +void on_tabstrip_text_color_set (GtkColorButton *colorbutton, gpointer user_data); |