Permalink
Browse files

Fix the background of systray, again.

Remove some unnecessary debug messages.
Remove xkb plugin from default since it's totally broken.
  • Loading branch information...
1 parent 52edcf6 commit 9088628c45ecf0319fceeb3c8e98e36f24fad927 @PCMan PCMan committed Apr 6, 2008
Showing with 20 additions and 6 deletions.
  1. +2 −2 configure.ac
  2. +1 −1 src/ev.c
  3. +0 −1 src/plugin.c
  4. +3 −0 src/plugins/taskbar.c
  5. +14 −2 src/systray/tray.c
View
4 configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(lxpanel, 0.2.9.8, http://lxde.sourceforge.net/)
+AC_INIT(lxpanel, 0.2.9.9, http://lxde.sourceforge.net/)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/bg.c])
AC_CONFIG_HEADER([config.h])
@@ -178,7 +178,7 @@ dnl done
plugin_cpu=cpu
plugin_deskno=deskno
plugin_batt=batt
- plugin_xkb=xkb
+ plugin_xkb=
AC_MSG_RESULT(all)
else
View
2 src/ev.c
@@ -217,7 +217,7 @@ fb_ev_emit(FbEv *ev, int signal)
win = (Window*)get_xaproperty (GDK_ROOT_WINDOW(), a_NET_ACTIVE_WINDOW, XA_WINDOW, 0);
if (win) {
ev->active_window = *win;
- g_debug( "WIN: %p", *win );
+ /* g_debug( "WIN: %p", *win ); */
XFree (win);
}
}
View
1 src/plugin.c
@@ -399,7 +399,6 @@ plugin_widget_set_background( GtkWidget* w, Panel* p )
if( GTK_IS_CONTAINER( w ) )
{
-
is_tray = ( strcmp( gtk_widget_get_name( w ), "tray" ) == 0 );
if( is_tray )
in_tray = TRUE;
View
3 src/plugins/taskbar.c
@@ -835,10 +835,13 @@ tk_build_gui(taskbar *tb, task *tk)
G_CALLBACK(tk_callback_button_press_event), (gpointer)tk);
g_signal_connect(G_OBJECT(tk->button), "button_release_event",
G_CALLBACK(tk_callback_button_release_event), (gpointer)tk);
+/*
g_signal_connect_after (G_OBJECT (tk->button), "leave",
G_CALLBACK (tk_callback_leave), (gpointer) tk);
g_signal_connect_after (G_OBJECT (tk->button), "enter",
G_CALLBACK (tk_callback_enter), (gpointer) tk);
+*/
+
#if 0
g_signal_connect_after (G_OBJECT (tk->button), "expose-event",
G_CALLBACK (tk_callback_expose), (gpointer) tk);
View
16 src/systray/tray.c
@@ -108,8 +108,17 @@ tray_destructor(Plugin *p)
RET();
}
+/* Dirty hacks used to handle background of systray */
+static gboolean delay_update_bg( Plugin* p )
+{
+ plugin_widget_set_background( p->pwid, p->panel );
+ return FALSE;
+}
-
+static void tray_realized( GtkWidget* widget, Plugin* p )
+{
+ g_idle_add( delay_update_bg, p );
+}
static int
tray_constructor(Plugin *p, char** fp)
@@ -123,7 +132,7 @@ tray_constructor(Plugin *p, char** fp)
if( fp )
{
while ( lxpanel_get_line(fp, &s) != LINE_BLOCK_END) {
- g_debug("s.str = \'%s\'", s.str);
+ /* g_debug("s.str = \'%s\'", s.str); */
ERR("tray: illegal in this context %s\n", s.str);
RET(0);
}
@@ -157,10 +166,13 @@ tray_constructor(Plugin *p, char** fp)
p->pwid = gtk_event_box_new();
GTK_WIDGET_SET_FLAGS( p->pwid, GTK_NO_WINDOW );
+ gtk_widget_set_name( p->pwid, "tray" ); /* this hack is requierd for plugin_widget_set_background() */
gtk_container_add( (GtkContainer*)p->pwid, tr->box );
gtk_container_set_border_width(GTK_CONTAINER(p->pwid), 1);
+ g_signal_connect( p->pwid, "realize", G_CALLBACK( tray_realized ), p );
+
RET(1);
}

0 comments on commit 9088628

Please sign in to comment.