Merge branch 'master' of git.lxde.org:/lxde/lxpanel
authorLXDE Pootle <pootle@pootle.lxde.org>
Mon, 15 Sep 2014 22:31:41 +0000 (22:31 +0000)
committerLXDE Pootle <pootle@pootle.lxde.org>
Mon, 15 Sep 2014 22:31:41 +0000 (22:31 +0000)
21 files changed:
ChangeLog
configure.ac
data/Makefile.am
lxpanel.pc.in
plugins/Makefile.am
plugins/batt/Makefile.am [deleted file]
plugins/cpu/Makefile.am [deleted file]
plugins/cpufreq/Makefile.am [deleted file]
plugins/deskno/Makefile.am [deleted file]
plugins/indicator/Makefile.am [deleted file]
plugins/kbled/Makefile.am [deleted file]
plugins/monitors/Makefile.am [deleted file]
plugins/netstat/Makefile.am [deleted file]
plugins/netstatus/Makefile.am [deleted file]
plugins/thermal/Makefile.am [deleted file]
plugins/thermal/thermal.c
plugins/volume/Makefile.am [deleted file]
plugins/volumealsa/Makefile.am [deleted file]
plugins/weather/Makefile.am [deleted file]
plugins/weather/weather.c
plugins/xkb/Makefile.am [deleted file]

index f4704c2..cdafab9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+* Fixed search for the gtkrc file.
+* Fixed search path for configuration - it should be not compilation time
+    path but paths using $XDG_CONFIG_DIRS.
+* Fixed incorrect flag for 'launchbar' plugin which marks him expandable.
+* Fixed dragging of task buttons.
+* Corrected using $XDG_MENU_PREFIX to work the same way as libfm does.
+* Fixed using font description, font in gtkrc file was ignored.
+* Improved search for hw sensors in /sys/class/hwmon/ hierarchy.
+* Improved check for critical temperatures in 'termal' plugin, now each
+    individual hardware setting (if available) is also taken into
+    consideration.
+* Fixed parsing alias name in 'weather' plugin settings.
+* Got rid of all individual plugins/*/Makefile - those rules more easily
+    can be contained in the plugins/Makefile.am. Adding a simple plugin
+    basically would mean to add three lines into that file instead of
+    writing whole Makefile.am.
+
 0.7.0
 -------------------------------------------------------------------------
 * New plugin 'launchtaskbar' with combined functionality from 'launchbar'
index 4a08f98..4288e15 100644 (file)
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 AC_INIT(lxpanel, 0.7.0, http://lxde.org/)
-AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -259,7 +259,7 @@ if test "$plugins" != "none"; then
             all)
                 for name in $ALL_PLUGINS_LIST
                 do
-                    export plugin_$name="$name"
+                    export plugin_$name="$name.la"
                 done
                 ;;
             -*)
@@ -268,7 +268,7 @@ if test "$plugins" != "none"; then
                 ;;
             *)
                 check_plugin_name([$plugin])
-                export plugin_$plugin=$plugin
+                export plugin_$plugin=$plugin.la
                 ;;
         esac
     done
@@ -416,20 +416,6 @@ AC_CONFIG_FILES([
     Makefile
     src/Makefile
     plugins/Makefile
-    plugins/netstatus/Makefile
-    plugins/netstat/Makefile
-    plugins/volume/Makefile
-    plugins/volumealsa/Makefile
-    plugins/cpu/Makefile
-    plugins/deskno/Makefile
-    plugins/batt/Makefile
-    plugins/kbled/Makefile
-    plugins/xkb/Makefile
-    plugins/thermal/Makefile
-    plugins/cpufreq/Makefile
-    plugins/monitors/Makefile
-    plugins/indicator/Makefile
-    plugins/weather/Makefile
     po/Makefile.in
     data/Makefile
     data/default/panels/panel
index 1d87f35..1837a4f 100644 (file)
@@ -35,6 +35,7 @@ lxpanel_images_DATA = \
        images/my-computer.png \
        images/stock_volume.png \
        images/file-manager.png \
+       images/gnome-fs-desktop.png \
        images/gnome-logout.png \
        images/gnome-netstatus-0-24.png \
        images/gnome-netstatus-25-49.png \
@@ -47,6 +48,7 @@ lxpanel_images_DATA = \
        images/gnome-netstatus-txrx.png \
        images/gnome-netstatus-tx.png \
        images/background.png \
+       images/volume.png \
        images/volume-low.png \
        images/volume-medium.png \
        images/volume-high.png \
index f2276e1..f023721 100644 (file)
@@ -6,5 +6,5 @@ datadir=@datadir@
 
 Name: lxpanel
 Description: A lightweight X11 desktop panel
-Requires: glib-2.0 libmenu-cache libfm-gtk
+Requires: glib-2.0 libfm-gtk
 Version: @VERSION@
index 5de6426..a904e1b 100644 (file)
@@ -1,24 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 
-DIST_SUBDIRS=$(ALL_PLUGINS_LIST)
+## common flags for all plugins
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/src \
+       $(PACKAGE_CFLAGS) \
+       $(G_CAST_CHECKS)
 
-if BUILD_PLUGIN_LOADER
-DYNAMIC_PLUGINS = \
-       $(PLUGINS_LIST)
-endif
+AM_LDFLAGS = \
+       $(PACKAGE_LIBS)
 
-SUBDIRS = $(DYNAMIC_PLUGINS)
 
+## built-in plugins
 noinst_LIBRARIES = libbuiltin_plugins.a
 
 libbuiltin_plugins_a_CFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/src \
        -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
        -DPACKAGE_UI_DIR=\""$(datadir)/lxpanel/ui"\" \
-       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
+       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 if ENABLE_MENU_CACHE
 MENU_SOURCES = \
@@ -41,7 +40,301 @@ libbuiltin_plugins_a_SOURCES = \
 
 libbuiltin_plugins_a_LIBADD =
 
+
+## loadable plugins
+if BUILD_PLUGIN_LOADER
+DYNAMIC_PLUGINS = \
+       $(PLUGINS_LIST)
+endif
+
+pkglib_LTLIBRARIES = $(DYNAMIC_PLUGINS)
+
+EXTRA_LTLIBRARIES = \
+       batt.la \
+       cpu.la \
+       cpufreq.la \
+       deskno.la \
+       indicator.la \
+       kbled.la \
+       monitors.la \
+       netstat.la \
+       netstatus.la \
+       thermal.la \
+       volume.la \
+       volumealsa.la \
+       weather.la \
+       xkb.la
+
+pkglibdir = $(libdir)/lxpanel/plugins
+
+# batt
+batt_la_SOURCES = \
+       batt/batt.c \
+       batt/batt_sys.c
+batt_la_CFLAGS = -I$(srcdir)/batt
+batt_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# cpu
+cpu_la_SOURCES = cpu/cpu.c
+cpu_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# cpufreq
+cpufreq_la_SOURCES = cpufreq/cpufreq.c
+cpufreq_la_CFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\"
+cpufreq_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# deskno
+deskno_la_SOURCES = deskno/deskno.c
+deskno_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# indicator
+indicator_la_SOURCES = indicator/indicator.c
+indicator_la_CFLAGS = \
+       -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
+       -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
+       $(APPLET_CFLAGS)
+indicator_la_LDFLAGS = -module @LXPANEL_MODULE@ $(APPLET_LIBS)
+
+# kbled
+kbled_la_SOURCES = kbled/kbled.c
+kbled_la_CFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\"
+kbled_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# monitors
+monitors_la_SOURCES = monitors/monitors.c
+monitors_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# netstat
+netstat_la_SOURCES = \
+       netstat/netstat.c \
+       netstat/devproc.c \
+       netstat/statusicon.c \
+       netstat/wireless.c \
+       netstat/lxnm_client.c \
+       netstat/passwd_gui.c
+netstat_la_CFLAGS = \
+       -I$(srcdir)/netstat \
+       -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\"
+netstat_la_LDFLAGS = -module @LXPANEL_MODULE@ -liw
+
+# netstatus
+netstatus_la_SOURCES = \
+       netstatus/netstatus.c \
+       netstatus/netstatus-dialog.c \
+       netstatus/netstatus-enums.c \
+       netstatus/netstatus-icon.c \
+       netstatus/netstatus-iface.c \
+       netstatus/netstatus-sysdeps.c \
+       netstatus/netstatus-util.c
+netstatus_la_CFLAGS = \
+       -I$(srcdir)/netstatus \
+       -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
+       -DPACKAGE_UI_DIR=\""$(datadir)/lxpanel/ui"\"
+netstatus_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# thermal
+thermal_la_SOURCES = thermal/thermal.c
+thermal_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# volume (OSS)
+volume_la_SOURCES = \
+       volume/volume-impl.c \
+       volume/volume.c
+volume_la_CFLAGS = -I$(srcdir)/volume
+volume_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+# volumealsa
+volumealsa_la_SOURCES = volumealsa/volumealsa.c
+volumealsa_la_CFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\"
+volumealsa_la_LDFLAGS = -module @LXPANEL_MODULE@ -lasound
+
+# weather
+weather_la_SOURCES = \
+       weather/logutil.c          \
+       weather/httputil.c         \
+       weather/yahooutil.c        \
+       weather/location.c         \
+       weather/forecast.c         \
+       weather/weatherwidget.c    \
+       weather/weather.c
+weather_la_CFLAGS = \
+       -I$(srcdir)/weather \
+       $(LIBXML2_CFLAGS)
+weather_la_LDFLAGS = -module @LXPANEL_MODULE@ $(LIBXML2_LIBS)
+
+# xkb
+xkb_la_CFLAGS = \
+       -I$(srcdir)/xkb \
+       -DFLAGSDIR=\"$(datadir)/lxpanel/images/xkb-flags\" \
+       -DFLAGSCUSTDIR=\"$(datadir)/lxpanel/images/xkb-flags-cust\" \
+       -DXKBCONFDIR=\"$(datadir)/lxpanel/xkeyboardconfig\"
+xkb_la_SOURCES = \
+       xkb/xkb-plugin.c \
+       xkb/xkb.c
+xkb_la_LDFLAGS = -module @LXPANEL_MODULE@
+
+xkeyboardconfigdir=$(datadir)/lxpanel/xkeyboardconfig
+xkeyboardconfig_DATA = \
+       xkb/xkeyboardconfig/models.cfg \
+       xkb/xkeyboardconfig/layouts.cfg \
+       xkb/xkeyboardconfig/toggle.cfg
+
+flagsdir=$(datadir)/lxpanel/images/xkb-flags
+flags_DATA= \
+       xkb/flags/ad.png \
+       xkb/flags/ae.png \
+       xkb/flags/af.png \
+       xkb/flags/al.png \
+       xkb/flags/am.png \
+       xkb/flags/ar.png \
+       xkb/flags/ara.png \
+       xkb/flags/at.png \
+       xkb/flags/az.png \
+       xkb/flags/ba.png \
+       xkb/flags/bd.png \
+       xkb/flags/be.png \
+       xkb/flags/ben.png \
+       xkb/flags/bg.png \
+       xkb/flags/bh.png \
+       xkb/flags/br.png \
+       xkb/flags/brai.png \
+       xkb/flags/bt.png \
+       xkb/flags/bw.png \
+       xkb/flags/by.png \
+       xkb/flags/ca.png \
+       xkb/flags/cd.png \
+       xkb/flags/ch.png \
+       xkb/flags/cm.png \
+       xkb/flags/cn.png \
+       xkb/flags/cu.png \
+       xkb/flags/cz.png \
+       xkb/flags/de.png \
+       xkb/flags/dev.png \
+       xkb/flags/dj.png \
+       xkb/flags/dk.png \
+       xkb/flags/dvorak.png \
+       xkb/flags/dz.png \
+       xkb/flags/ee.png \
+       xkb/flags/eg.png \
+       xkb/flags/epo.png \
+       xkb/flags/es.png \
+       xkb/flags/et.png \
+       xkb/flags/eu.png \
+       xkb/flags/fi.png \
+       xkb/flags/fo.png \
+       xkb/flags/fr.png \
+       xkb/flags/gb.png \
+       xkb/flags/ge.png \
+       xkb/flags/gh.png \
+       xkb/flags/gn.png \
+       xkb/flags/gr.png \
+       xkb/flags/hr.png \
+       xkb/flags/hu.png \
+       xkb/flags/ie.png \
+       xkb/flags/il.png \
+       xkb/flags/in.png \
+       xkb/flags/iq.png \
+       xkb/flags/ir.png \
+       xkb/flags/is.png \
+       xkb/flags/it.png \
+       xkb/flags/jo.png \
+       xkb/flags/jp.png \
+       xkb/flags/ke.png \
+       xkb/flags/kg.png \
+       xkb/flags/kh.png \
+       xkb/flags/km.png \
+       xkb/flags/kp.png \
+       xkb/flags/kr.png \
+       xkb/flags/kw.png \
+       xkb/flags/kz.png \
+       xkb/flags/la.png \
+       xkb/flags/latam.png \
+       xkb/flags/lb.png \
+       xkb/flags/lk.png \
+       xkb/flags/lt.png \
+       xkb/flags/lv.png \
+       xkb/flags/ly.png \
+       xkb/flags/ma.png \
+       xkb/flags/mao.png \
+       xkb/flags/me.png \
+       xkb/flags/mk.png \
+       xkb/flags/ml.png \
+       xkb/flags/mm.png \
+       xkb/flags/mn.png \
+       xkb/flags/mt.png \
+       xkb/flags/mv.png \
+       xkb/flags/mx.png \
+       xkb/flags/nec_vndr-jp.png \
+       xkb/flags/ng.png \
+       xkb/flags/nl.png \
+       xkb/flags/no.png \
+       xkb/flags/np.png \
+       xkb/flags/om.png \
+       xkb/flags/ph.png \
+       xkb/flags/pk.png \
+       xkb/flags/pl.png \
+       xkb/flags/ps.png \
+       xkb/flags/pt.png \
+       xkb/flags/qa.png \
+       xkb/flags/qc.png \
+       xkb/flags/ro.png \
+       xkb/flags/rs.png \
+       xkb/flags/ru.png \
+       xkb/flags/sa.png \
+       xkb/flags/sd.png \
+       xkb/flags/se.png \
+       xkb/flags/si.png \
+       xkb/flags/sk.png \
+       xkb/flags/sn.png \
+       xkb/flags/so.png \
+       xkb/flags/sr.png \
+       xkb/flags/sy.png \
+       xkb/flags/th.png \
+       xkb/flags/tj.png \
+       xkb/flags/tm.png \
+       xkb/flags/tn.png \
+       xkb/flags/tr.png \
+       xkb/flags/tw.png \
+       xkb/flags/tz.png \
+       xkb/flags/ua.png \
+       xkb/flags/uk.png \
+       xkb/flags/us.png \
+       xkb/flags/un.png \
+       xkb/flags/uy.png \
+       xkb/flags/uz.png \
+       xkb/flags/vn.png \
+       xkb/flags/ye.png \
+       xkb/flags/yu.png \
+       xkb/flags/za.png
+
 EXTRA_DIST = \
+       batt/batt_sys.h \
+       netstat/netstat.h \
+       netstat/nsconfig.h \
+       netstat/devproc.h \
+       netstat/statusicon.h \
+       netstat/wireless.h \
+       netstat/lxnm_client.h \
+       netstat/passwd_gui.h \
+       netstatus/COPYING \
+       netstatus/netstatus-dialog.h \
+       netstatus/netstatus-enums.h \
+       netstatus/netstatus-fallback-pixbuf.h \
+       netstatus/netstatus-icon.h \
+       netstatus/netstatus-iface.h \
+       netstatus/netstatus-sysdeps.h \
+       netstatus/netstatus-util.h \
+       volume/volume_xpm.h \
+       volume/volume-impl.h \
+       weather/logutil.h \
+       weather/httputil.h \
+       weather/yahooutil.h \
+       weather/location.h \
+       weather/forecast.h \
+       weather/weatherwidget.h \
+       xkb/xkb.h \
+       $(flags_DATA) \
+       $(xkeyboardconfig_DATA) \
        icon.xpm
 
 install-exec-hook:
diff --git a/plugins/batt/Makefile.am b/plugins/batt/Makefile.am
deleted file mode 100644 (file)
index 5c8b544..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-batt_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = batt.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-batt_la_SOURCES = \
-       batt.c \
-       batt_sys.h \
-       batt_sys.c
-
-
-batt_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-batt_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/cpu/Makefile.am b/plugins/cpu/Makefile.am
deleted file mode 100644 (file)
index 38f54cd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-cpu_la_CFLAGS = \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = cpu.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-cpu_la_SOURCES = \
-       cpu.c
-
-cpu_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-cpu_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/cpufreq/Makefile.am b/plugins/cpufreq/Makefile.am
deleted file mode 100644 (file)
index 593c69b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-cpufreq_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = cpufreq.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-cpufreq_la_SOURCES = \
-       cpufreq.c
-
-cpufreq_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-cpufreq_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/deskno/Makefile.am b/plugins/deskno/Makefile.am
deleted file mode 100644 (file)
index 36ab3b7..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-deskno_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = deskno.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-deskno_la_SOURCES = \
-       deskno.c
-
-deskno_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-deskno_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/indicator/Makefile.am b/plugins/indicator/Makefile.am
deleted file mode 100644 (file)
index 07ffb5c..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-indicator_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-       -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-       $(PACKAGE_CFLAGS) \
-       $(APPLET_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = indicator.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-indicator_la_SOURCES = \
-       indicator.c
-
-indicator_la_LIBADD = \
-       $(PACKAGE_LIBS) \
-       $(APPLET_LIBS)
-
-indicator_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/kbled/Makefile.am b/plugins/kbled/Makefile.am
deleted file mode 100644 (file)
index c752cf7..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-kbled_la_CFLAGS = \
-    -I. \
-    -I$(top_srcdir)/src \
-    -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
-    $(PACKAGE_CFLAGS) \
-    $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = kbled.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-kbled_la_SOURCES = kbled.c
-
-kbled_la_LIBADD = $(PACKAGE_LIBS)
-
-kbled_la_LDFLAGS = \
-    -module \
-    @LXPANEL_MODULE@
diff --git a/plugins/monitors/Makefile.am b/plugins/monitors/Makefile.am
deleted file mode 100644 (file)
index b5d6fd6..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-monitors_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = monitors.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-monitors_la_SOURCES = \
-       monitors.c
-
-monitors_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-monitors_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
diff --git a/plugins/netstat/Makefile.am b/plugins/netstat/Makefile.am
deleted file mode 100644 (file)
index 739460e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-netstat_la_CFLAGS = \
-    -I. \
-    -I$(top_srcdir)/src \
-    -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
-    $(PACKAGE_CFLAGS) \
-    $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = netstat.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-netstat_la_SOURCES = \
-        netstat.c \
-        netstat.h \
-        nsconfig.h \
-        devproc.c \
-        devproc.h \
-        statusicon.c \
-        statusicon.h \
-        wireless.c \
-        wireless.h \
-        lxnm_client.c \
-        lxnm_client.h \
-        passwd_gui.c \
-        passwd_gui.h
-
-netstat_la_LIBADD = \
-        -liw \
-        $(PACKAGE_LIBS)
-
-netstat_la_LDFLAGS = \
-    -module \
-    @LXPANEL_MODULE@
-
-install-exec-hook:
-       rm -f "$(moduledir)\*.la" *.a
diff --git a/plugins/netstatus/Makefile.am b/plugins/netstatus/Makefile.am
deleted file mode 100644 (file)
index fc5bddb..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-netstatus_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
-       -DPACKAGE_UI_DIR=\""$(datadir)/lxpanel/ui"\" \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = netstatus.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-netstatus_la_SOURCES = \
-       netstatus.c \
-       netstatus-dialog.c \
-       netstatus-dialog.h \
-       netstatus-enums.c \
-       netstatus-enums.h \
-       netstatus-fallback-pixbuf.h \
-       netstatus-icon.c \
-       netstatus-icon.h \
-       netstatus-iface.c \
-       netstatus-iface.h \
-       netstatus-sysdeps.c \
-       netstatus-sysdeps.h \
-       netstatus-util.c \
-       netstatus-util.h
-
-netstatus_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-netstatus_la_LDFLAGS = \
-       -module \
-       $(LXPANEL_MODULE)
-
-install-exec-hook:
-       rm -f "$(moduledir)\*.la" *.a
diff --git a/plugins/thermal/Makefile.am b/plugins/thermal/Makefile.am
deleted file mode 100644 (file)
index e0b8959..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-thermal_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = thermal.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-thermal_la_SOURCES = \
-       thermal.c
-
-thermal_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-thermal_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
index b9db67d..905ea9f 100644 (file)
@@ -462,7 +462,9 @@ static gboolean applyConfig(gpointer p)
     config_group_set_string(th->settings, "NormalColor", th->str_cl_normal);
     config_group_set_string(th->settings, "Warning1Color", th->str_cl_warning1);
     config_group_set_string(th->settings, "Warning2Color", th->str_cl_warning2);
-    config_group_set_int(th->settings, "CustomLevels", th->not_custom_levels);
+    config_group_set_int(th->settings, "AutomaticLevels", th->not_custom_levels);
+    /* TODO: clean obsolete setting
+    config_setting_remove(th->settings, "CustomLevels"); */
     config_group_set_int(th->settings, "Warning1Temp", th->warning1);
     config_group_set_int(th->settings, "Warning2Temp", th->warning2);
     config_group_set_int(th->settings, "AutomaticSensor", th->auto_sensor);
@@ -521,7 +523,9 @@ thermal_constructor(LXPanel *panel, config_setting_t *settings)
     if (config_setting_lookup_string(settings, "Warning2Color", &tmp))
         th->str_cl_warning2 = g_strdup(tmp);
     config_setting_lookup_int(settings, "AutomaticSensor", &th->auto_sensor);
+    /* backward compatibility for wrong variable */
     config_setting_lookup_int(settings, "CustomLevels", &th->not_custom_levels);
+    config_setting_lookup_int(settings, "AutomaticLevels", &th->not_custom_levels);
     if (config_setting_lookup_string(settings, "Sensor", &tmp))
         th->sensor = g_strdup(tmp);
     config_setting_lookup_int(settings, "Warning1Temp", &th->warning1);
diff --git a/plugins/volume/Makefile.am b/plugins/volume/Makefile.am
deleted file mode 100644 (file)
index b3da061..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-if BUILD_OSS_PLUGINS
-
-volume_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = volume.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-volume_la_SOURCES = \
-       volume_xpm.h \
-       volume-impl.h \
-       volume-impl.c \
-       volume.c
-
-volume_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-volume_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
-
-endif
diff --git a/plugins/volumealsa/Makefile.am b/plugins/volumealsa/Makefile.am
deleted file mode 100644 (file)
index c3c0d9b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-if BUILD_ALSA_PLUGINS
-
-volumealsa_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" \
-       $(PACKAGE_CFLAGS) \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = volumealsa.la
-
-moduledir = $(libdir)/lxpanel/plugins
-
-volumealsa_la_SOURCES = volumealsa.c
-
-volumealsa_la_LIBADD = -lasound $(PACKAGE_LIBS)
-
-volumealsa_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
-
-endif
diff --git a/plugins/weather/Makefile.am b/plugins/weather/Makefile.am
deleted file mode 100644 (file)
index 64d9122..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-module_LTLIBRARIES= weather.la
-
-moduledir= $(libdir)/lxpanel/plugins
-
-weather_la_SOURCES= \
- logutil.c          \
- httputil.c         \
- yahooutil.c        \
- location.c         \
- forecast.c         \
- weatherwidget.c    \
- weather.c
-
-weather_la_CFLAGS= \
- -I.               \
- -I$(top_builddir)/src \
- $(PACKAGE_CFLAGS) \
- $(LIBXML2_CFLAGS)
-
-weather_la_LDFLAGS= \
- -module            \
- @LXPANEL_MODULE@   \
- $(LIBXML2_LIBS)
-
-EXTRA_DIST = \
-       logutil.h \
-       httputil.h \
-       yahooutil.h \
-       location.h \
-       forecast.h \
-       weatherwidget.h
-
-install-exec-hook:
-       find . -name "*.{la,a}" -delete
\ No newline at end of file
index c9c72da..3306552 100644 (file)
@@ -118,6 +118,10 @@ weather_constructor(LXPanel *pPanel, config_setting_t *pConfig)
     {
       pLocation->pcAlias_ = g_strndup(pczDummy, (pczDummy) ? strlen(pczDummy) : 0);
     }
+  else if (config_setting_lookup_int(pConfig, "alias", &iDummyVal))
+    {
+      pLocation->pcAlias_ = g_strdup_printf("%d", iDummyVal);
+    }
   else
     {
       LXW_LOG(LXW_ERROR, "Weather: could not lookup alias in config.");
@@ -149,7 +153,7 @@ weather_constructor(LXPanel *pPanel, config_setting_t *pConfig)
     {
       LXW_LOG(LXW_ERROR, "Weather: could not lookup country in config.");
     }
-    
+
   if (config_setting_lookup_string(pConfig, "woeid", &pczDummy))
     {
       pLocation->pcWOEID_ = g_strndup(pczDummy, (pczDummy) ? strlen(pczDummy) : 0);
@@ -180,7 +184,7 @@ weather_constructor(LXPanel *pPanel, config_setting_t *pConfig)
     {
       LXW_LOG(LXW_ERROR, "Weather: could not lookup interval in config.");
     }
-  
+
   iDummyVal = 0;
   if (config_setting_lookup_int(pConfig, "enabled", &iDummyVal))
     {
@@ -191,16 +195,15 @@ weather_constructor(LXPanel *pPanel, config_setting_t *pConfig)
       LXW_LOG(LXW_ERROR, "Weather: could not lookup enabled flag in config.");
     }
 
-  
   if (pLocation->pcAlias_ && pLocation->pcWOEID_)
     {
       GValue locationValue = G_VALUE_INIT;
 
       g_value_init(&locationValue, G_TYPE_POINTER);
-              
+
       /* location is copied by the widget */
       g_value_set_pointer(&locationValue, pLocation);
-              
+
       g_object_set_property(G_OBJECT(pWidg),
                             "location",
                             &locationValue);
diff --git a/plugins/xkb/Makefile.am b/plugins/xkb/Makefile.am
deleted file mode 100644 (file)
index 05ec388..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-xkb_la_CFLAGS = \
-       -I. \
-       -I$(top_srcdir)/src \
-       $(PACKAGE_CFLAGS) \
-       -DFLAGSDIR=\"$(datadir)/lxpanel/images/xkb-flags\" \
-       -DFLAGSCUSTDIR=\"$(datadir)/lxpanel/images/xkb-flags-cust\" \
-       -DXKBCONFDIR=\"$(datadir)/lxpanel/xkeyboardconfig\" \
-       $(G_CAST_CHECKS)
-
-module_LTLIBRARIES = xkb.la
-moduledir = $(libdir)/lxpanel/plugins
-
-xkb_la_SOURCES = \
-       xkb-plugin.c \
-       xkb.c \
-       xkb.h
-
-xkb_la_LIBADD = \
-       $(PACKAGE_LIBS)
-
-xkb_la_LDFLAGS = \
-       -module \
-       @LXPANEL_MODULE@
-
-xkeyboardconfigdir=$(datadir)/lxpanel/xkeyboardconfig
-xkeyboardconfig_DATA=xkeyboardconfig/models.cfg \
-       xkeyboardconfig/layouts.cfg \
-       xkeyboardconfig/toggle.cfg
-
-flagsdir=$(datadir)/lxpanel/images/xkb-flags
-flags_DATA= \
-       flags/ad.png \
-       flags/ae.png \
-       flags/af.png \
-       flags/al.png \
-       flags/am.png \
-       flags/ar.png \
-       flags/ara.png \
-       flags/at.png \
-       flags/az.png \
-       flags/ba.png \
-       flags/bd.png \
-       flags/be.png \
-       flags/ben.png \
-       flags/bg.png \
-       flags/bh.png \
-       flags/br.png \
-       flags/brai.png \
-       flags/bt.png \
-       flags/bw.png \
-       flags/by.png \
-       flags/ca.png \
-       flags/cd.png \
-       flags/ch.png \
-       flags/cm.png \
-       flags/cn.png \
-       flags/cu.png \
-       flags/cz.png \
-       flags/de.png \
-       flags/dev.png \
-       flags/dj.png \
-       flags/dk.png \
-       flags/dvorak.png \
-       flags/dz.png \
-       flags/ee.png \
-       flags/eg.png \
-       flags/epo.png \
-       flags/es.png \
-       flags/et.png \
-       flags/fi.png \
-       flags/fo.png \
-       flags/fr.png \
-       flags/gb.png \
-       flags/ge.png \
-       flags/gh.png \
-       flags/gn.png \
-       flags/gr.png \
-       flags/hr.png \
-       flags/hu.png \
-       flags/ie.png \
-       flags/il.png \
-       flags/in.png \
-       flags/iq.png \
-       flags/ir.png \
-       flags/is.png \
-       flags/it.png \
-       flags/jo.png \
-       flags/jp.png \
-       flags/ke.png \
-       flags/kg.png \
-       flags/kh.png \
-       flags/km.png \
-       flags/kp.png \
-       flags/kr.png \
-       flags/kw.png \
-       flags/kz.png \
-       flags/la.png \
-       flags/latam.png \
-       flags/lb.png \
-       flags/lk.png \
-       flags/lt.png \
-       flags/lv.png \
-       flags/ly.png \
-       flags/ma.png \
-       flags/mao.png \
-       flags/me.png \
-       flags/mk.png \
-       flags/ml.png \
-       flags/mm.png \
-       flags/mn.png \
-       flags/mt.png \
-       flags/mv.png \
-       flags/mx.png \
-       flags/nec_vndr-jp.png \
-       flags/ng.png \
-       flags/nl.png \
-       flags/no.png \
-       flags/np.png \
-       flags/om.png \
-       flags/ph.png \
-       flags/pk.png \
-       flags/pl.png \
-       flags/pt.png \
-       flags/qa.png \
-       flags/ro.png \
-       flags/rs.png \
-       flags/ru.png \
-       flags/sa.png \
-       flags/sd.png \
-       flags/se.png \
-       flags/si.png \
-       flags/sk.png \
-       flags/sn.png \
-       flags/so.png \
-       flags/sr.png \
-       flags/sy.png \
-       flags/th.png \
-       flags/tj.png \
-       flags/tm.png \
-       flags/tn.png \
-       flags/tr.png \
-       flags/tw.png \
-       flags/tz.png \
-       flags/ua.png \
-       flags/us.png \
-       flags/uy.png \
-       flags/uz.png \
-       flags/vn.png \
-       flags/ye.png \
-       flags/za.png
-
-EXTRA_DIST = \
-       $(flags_DATA) \
-       $(xkeyboardconfig_DATA)