Mercurial > audlegacy-plugins
changeset 2220:0cb173caf393
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Eugene Zagidullin <e.asphyx@gmail.com> |
|---|---|
| date | Fri, 07 Dec 2007 21:35:28 +0300 |
| parents | d7acad3d50e8 (diff) 6907fc39b53f (current diff) |
| children | b4a2a7197c05 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/statusicon/si_ui.c Fri Dec 07 12:13:37 2007 -0600 +++ b/src/statusicon/si_ui.c Fri Dec 07 21:35:28 2007 +0300 @@ -34,7 +34,6 @@ #include <gdk/gdkx.h> #include <gtk/gtk.h> - static void si_ui_statusicon_popup_timer_start ( GtkWidget * ); static void si_ui_statusicon_popup_timer_stop ( GtkWidget * ); static void si_ui_statusicon_smallmenu_show ( gint x, gint y, guint button, guint32 time , gpointer ); @@ -139,6 +138,8 @@ } break; } + + default: ; } return FALSE; @@ -330,6 +331,8 @@ GdkPixbuf *si_pixbuf, *si_scaled_pixbuf; gint size = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(image) , "size" )); static gchar *wmname = NULL; + + AUDDBG("WM reported proposed icon size: %d\n", size); /* sometimes, KDE won't give the correct size-allocation; workaround this */ if ( wmname == NULL )
--- a/src/statusicon/si_ui.h Fri Dec 07 12:13:37 2007 -0600 +++ b/src/statusicon/si_ui.h Fri Dec 07 21:35:28 2007 +0300 @@ -21,12 +21,14 @@ #ifndef _I_SI_UI_H #define _I_SI_UI_H 1 -#include "si_ui.h" +#include <glib.h> void si_ui_statusicon_show( void ); void si_ui_statusicon_hide( void ); void si_ui_about_show( void ); +void si_ui_statusicon_enable ( gboolean ); +void si_ui_prefs_show ( void ); #endif /* !_I_SI_UI_H */