Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-12 19:06:36 +00:00
Code Issues Releases Activity

Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi).

Browse Source
This commit is contained in:
Lassi Selander 2009-06-14 12:03:50 -06:00 committed by Brenden Matthews
parent c001f73f72
commit b4f88ff319
6 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-06-14
* Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi)
2009-06-13
* Added support for $blink
* Added support for $to_bytes

22
doc/config_settings.xml
View File

@ -577,17 +577,17 @@
<option>own_window_type</option>
</command>
</term>
<listitem>if own_window is yes, you may specify type normal,
desktop, dock, panel or override (default: normal). Desktop
windows are special windows that have no window decorations;
are always visible on your desktop; do not appear in your
pager or taskbar; and are sticky across all workspaces. Panel
windows reserve space along a desktop edge, just like panels
and taskbars, preventing maximized windows from overlapping
them. The edge is chosen based on the alignment
option. Override windows are not under the control of the
window manager. Hints are ignored. This type of window can be
useful for certain situations.
<listitem>if own_window is yes, you may specify type
normal, desktop, dock, panel or override (default: normal).
Desktop windows are special windows that have no window
decorations; are always visible on your desktop; do not
appear in your pager or taskbar; and are sticky across all
workspaces. Panel windows reserve space along a desktop
edge, just like panels and taskbars, preventing maximized
windows from overlapping them. The edge is chosen based on
the alignment option. Override windows are not under the
control of the window manager. Hints are ignored. This type
of window can be useful for certain situations.
<para /></listitem>
</varlistentry>
<varlistentry>

1
doc/variables.xml
View File

@ -458,6 +458,7 @@
<option>text_and_other_conky_vars</option>
</term>
<listitem>Let 'text_and_other_conky_vars' blink on and off.
<para /></listitem>
</varlistentry>
<varlistentry>

4
src/conky.c
View File

@ -5199,10 +5199,6 @@ static void generate_text_internal(char *p, int p_max_size,
#undef mpd_printf
#endif
#ifdef XMMS2
free_xmms2();
#endif
#ifdef MOC
#define MOC_PRINT(t, a) \
snprintf(p, p_max_size, "%s", (moc.t ? moc.t : a))

20
src/xmms2.c
View File

@ -249,7 +249,7 @@ int handle_playlist_loaded(xmmsv_t *value, void *p)
return TRUE;
}
void update_xmms2()
void update_xmms2(void)
{
struct information *current_info = &info;
@ -318,21 +318,3 @@ void update_xmms2()
}
void free_xmms2()
{
struct information *current_info = &info;
current_info->xmms2.conn_state = -1;
free(current_info->xmms2.artist);
free(current_info->xmms2.album);
free(current_info->xmms2.title);
free(current_info->xmms2.genre);
free(current_info->xmms2.comment);
free(current_info->xmms2.url);
free(current_info->xmms2.date);
free(current_info->xmms2.playlist);
free(current_info->xmms2.status);
}

1
src/xmms2.h
View File

@ -52,6 +52,5 @@ struct xmms2_s {
};
void update_xmms2(void);
void free_xmms2(void);
#endif /*XMMS2_H_*/