# HG changeset patch # User William Pitcock # Date 1192498457 18000 # Node ID 2953048bceee52e6b97c69130f3561e02b6a5d1a # Parent acb362a67c01e634b7fbdc024e7abed5c8991792# Parent bf6b1c5091d59e61324512d52ec7af0dd5a6d553 Automated merge with ssh://hg.atheme.org//hg/audacious diff -r acb362a67c01 -r 2953048bceee src/audacious/dock.c --- a/src/audacious/dock.c Mon Oct 15 20:34:07 2007 -0500 +++ b/src/audacious/dock.c Mon Oct 15 20:34:17 2007 -0500 @@ -565,3 +565,8 @@ return list; } + +GList * +get_dock_window_list() { + return dock_window_list; +} diff -r acb362a67c01 -r 2953048bceee src/audacious/dock.h --- a/src/audacious/dock.h Mon Oct 15 20:34:07 2007 -0500 +++ b/src/audacious/dock.h Mon Oct 15 20:34:17 2007 -0500 @@ -44,4 +44,6 @@ gboolean decorated); void dock_window_resize(GtkWindow * widget, gint new_w, gint new_h, gint w, gint h); +GList *get_dock_window_list(); + #endif diff -r acb362a67c01 -r 2953048bceee src/audacious/plugin.h --- a/src/audacious/plugin.h Mon Oct 15 20:34:07 2007 -0500 +++ b/src/audacious/plugin.h Mon Oct 15 20:34:17 2007 -0500 @@ -576,6 +576,16 @@ void (*effect_flow)(FlowContext *context); void (*iir_flow)(FlowContext *context); void (*volumecontrol_flow)(FlowContext *context); + + /* Dock */ + GList *(*get_dock_window_list)(void); + GList *(*dock_add_window)(GList * window_list, GtkWindow * window); + GList *(*dock_remove_window)(GList * window_list, GtkWindow * window); + void (*dock_move_press)(GList * window_list, GtkWindow * w, + GdkEventButton * event, gboolean move_list); + void (*dock_move_motion)(GtkWindow * w, GdkEventMotion * event); + void (*dock_move_release)(GtkWindow * w); + gboolean (*dock_is_moving)(GtkWindow * w); }; /* Convenience macros for accessing the public API. */ @@ -905,6 +915,14 @@ #define audacious_menu_main_show _audvt->util_menu_main_show +#define aud_get_dock_window_list _audvt->get_dock_window_list +#define aud_dock_add_window _audvt->dock_add_window +#define aud_dock_remove_window _audvt->dock_remove_window +#define aud_dock_move_press _audvt->dock_move_press +#define aud_dock_move_motion _audvt->dock_move_motion +#define aud_dock_move_release _audvt->dock_move_release +#define aud_dock_is_moving _audvt->dock_is_moving + #include "audacious/auddrct.h" /* for multi-file plugins :( */ diff -r acb362a67c01 -r 2953048bceee src/audacious/pluginenum.c --- a/src/audacious/pluginenum.c Mon Oct 15 20:34:07 2007 -0500 +++ b/src/audacious/pluginenum.c Mon Oct 15 20:34:17 2007 -0500 @@ -37,6 +37,7 @@ #include #include "main.h" +#include "dock.h" #include "ui_main.h" #include "playback.h" #include "playlist.h" @@ -373,6 +374,14 @@ .volumecontrol_flow = volumecontrol_flow, .util_menu_main_show = util_menu_main_show, + + .get_dock_window_list = get_dock_window_list, + .dock_add_window = dock_add_window, + .dock_remove_window = dock_remove_window, + .dock_move_press = dock_move_press, + .dock_move_motion = dock_move_motion, + .dock_move_release = dock_move_release, + .dock_is_moving = dock_is_moving, }; /*****************************************************************/