diff --git a/tools/helper.c b/tools/helper.c index 2011899..e8d8314 100644 --- a/tools/helper.c +++ b/tools/helper.c @@ -77,7 +77,6 @@ static int _panel_init(Panel * panel, PanelWindowPosition position, static void _panel_destroy(Panel * panel); /* accessors */ -static uint32_t _panel_get_xid(Panel * panel); static void _panel_set_title(Panel * panel, char const * title); /* useful */ @@ -202,13 +201,6 @@ static void _panel_destroy(Panel * panel) /* accessors */ -/* panel_get_xid */ -static uint32_t _panel_get_xid(Panel * panel) -{ - return panel_window_get_xid(panel->windows[PANEL_POSITION_TOP]); -} - - /* panel_set_title */ static void _panel_set_title(Panel * panel, char const * title) { @@ -297,6 +289,7 @@ static void _helper_init(PanelAppletHelper * helper, Panel * panel, { char const * p; (void) panel; + (void) type; (void) iconsize; memset(helper, 0, sizeof(*helper)); diff --git a/tools/notify.c b/tools/notify.c index 08fe9f6..c93c903 100644 --- a/tools/notify.c +++ b/tools/notify.c @@ -57,6 +57,8 @@ /* prototypes */ static int _notify(int embed, GtkIconSize iconsize, int timeout, char * applets[]); +/* accessors */ +static uint32_t _notify_get_xid(Panel * panel); /* callbacks */ static gboolean _notify_on_timeout(gpointer data); @@ -86,7 +88,7 @@ static int _notify_embed(GtkIconSize iconsize, int timeout, char * applets[]) for(i = 0; applets[i] != NULL; i++) if(_panel_append(&panel, PANEL_POSITION_TOP, applets[i]) != 0) error_print(PROGNAME_PANEL_NOTIFY); - if((xid = _panel_get_xid(&panel)) == 0) + if((xid = _notify_get_xid(&panel)) == 0) /* XXX report error */ return -1; desktop_message_send(PANEL_CLIENT_MESSAGE, PANEL_MESSAGE_EMBED, xid, 0); @@ -117,6 +119,14 @@ static int _notify_panel(GtkIconSize iconsize, int timeout, char * applets[]) } +/* accessors */ +/* notify_get_xid */ +static uint32_t _notify_get_xid(Panel * panel) +{ + return panel_window_get_xid(panel->windows[PANEL_POSITION_TOP]); +} + + /* callbacks */ /* notify_on_timeout */ static gboolean _notify_on_timeout(gpointer data)