Fix the make files.
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Thu, 17 Apr 2008 16:55:45 +0000 (16:55 +0000)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Thu, 17 Apr 2008 16:55:45 +0000 (16:55 +0000)
Version 0.3.5 (branch lxpanel-multiple-panels) is ready for merge.

git-svn-id: https://lxde.svn.sourceforge.net/svnroot/lxde/branches/lxpanel-multiple-panels@543 3baf7735-d320-0410-8b56-b11ef3703fae

Makefile.am
data/Makefile.am
src/panel.c

index 1fc52ef..4a924d8 100644 (file)
@@ -16,10 +16,6 @@ EXTRA_DIST = \
 ## icondir = $(datadir)/pixmaps
 ## icon_DATA = data/pcmanfm.png
 
-uidir=$(datadir)/lxpanel/ui
-ui_DATA= \
-       data/ui/panel-pref.glade
-
 install-data-local:
        @$(NORMAL_INSTALL)
        if test -d $(srcdir)/pixmaps; then \
index 655ca35..39ec210 100644 (file)
@@ -6,6 +6,10 @@ default_config_panel_DATA = \
         default/panels/panel
 default_config_paneldir = $(datadir)/lxpanel/profile/default/panels
 
+uidir=$(datadir)/lxpanel/ui
+ui_DATA= \
+        ui/panel-pref.glade
+
 lxpanel_images_DATA = \
        images/my-computer.svg \
        images/redhat-internet.svg \
@@ -54,5 +58,7 @@ lxpanel_imagesdir = $(datadir)/lxpanel/images
 EXTRA_DIST = \
        default/panels/panel.in \
        $(lxpanel_DATA) \
-       $(lxpanel_images_DATA)
+       $(lxpanel_images_DATA) \
+       $(ui_DATA) \
+       $(default_config_DATA)
 
index 4713a8f..518980a 100644 (file)
@@ -357,8 +357,9 @@ static gboolean delay_update_background( Panel* p )
 static void
 panel_style_set(GtkWidget *widget, GtkStyle* prev, Panel *p)
 {
+    /* FIXME: This dirty hack is used to fix the background of systray... */
     if( GTK_WIDGET_REALIZED( widget ) )
-        g_idle_add( delay_update_background, p );
+        g_timeout_add( 1000, delay_update_background, p );
 }
 
 static gint