From 8a0f7135ee461503453e3e865403734932db30a7 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Mon, 3 Jun 2013 11:15:59 +0000 Subject: [PATCH] Load system wide battery applet installation. Also added explicit linkage for libdl... --- ede-panel/Jamfile | 1 + ede-panel/Panel.cpp | 2 ++ ede-panel/ede-panel.cpp | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ede-panel/Jamfile b/ede-panel/Jamfile index 6e93da9..4829c1b 100644 --- a/ede-panel/Jamfile +++ b/ede-panel/Jamfile @@ -11,6 +11,7 @@ SubDir TOP ede-panel ; EdeProgram ede-panel : Hider.cpp Panel.cpp AppletManager.cpp ede-panel.cpp ; +LinkAgainst ede-panel : -ldl ; #ObjectC++Flags Panel.cpp : -DEDE_PANEL_LOCAL_APPLETS ; if $(OS) != "SOLARIS" { diff --git a/ede-panel/Panel.cpp b/ede-panel/Panel.cpp index 3e2fd9b..4884b3f 100644 --- a/ede-panel/Panel.cpp +++ b/ede-panel/Panel.cpp @@ -528,6 +528,7 @@ void Panel::load_applets(void) { "clock.so", "taskbar.so", "keyboard_layout.so", + "battery_monitor.so", "cpu_monitor.so", #ifdef __linux__ "mem_monitor.so", @@ -554,6 +555,7 @@ void Panel::load_applets(void) { mgr.load("./applets/clock/clock.so"); mgr.load("./applets/taskbar/taskbar.so"); mgr.load("./applets/keyboard-layout/keyboard_layout.so"); + mgr.load("./applets/battery-monitor/battery_monitor.so"); mgr.load("./applets/cpu-monitor/cpu_monitor.so"); mgr.load("./applets/mem-monitor/mem_monitor.so"); mgr.load("./applets/system-tray/system_tray.so"); diff --git a/ede-panel/ede-panel.cpp b/ede-panel/ede-panel.cpp index 00baaa6..c701d32 100644 --- a/ede-panel/ede-panel.cpp +++ b/ede-panel/ede-panel.cpp @@ -24,12 +24,9 @@ #include #include -#include -#include #include #include "Panel.h" -#include "AppletManager.h" static Panel *panel;