mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Load system wide battery applet installation. Also added explicit linkage for libdl...

Browse Source
This commit is contained in:
Sanel Zukan 2013-06-03 11:15:59 +00:00
parent a2a6f6034d
commit 8a0f7135ee
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ede-panel/Jamfile
View File

@ -11,6 +11,7 @@
SubDir TOP ede-panel ; SubDir TOP ede-panel ;
EdeProgram ede-panel : Hider.cpp Panel.cpp AppletManager.cpp ede-panel.cpp ; EdeProgram ede-panel : Hider.cpp Panel.cpp AppletManager.cpp ede-panel.cpp ;
LinkAgainst ede-panel : -ldl ;
#ObjectC++Flags Panel.cpp : -DEDE_PANEL_LOCAL_APPLETS ; #ObjectC++Flags Panel.cpp : -DEDE_PANEL_LOCAL_APPLETS ;
if $(OS) != "SOLARIS" { if $(OS) != "SOLARIS" {

2
ede-panel/Panel.cpp
View File

@ -528,6 +528,7 @@ void Panel::load_applets(void) {
"clock.so", "clock.so",
"taskbar.so", "taskbar.so",
"keyboard_layout.so", "keyboard_layout.so",
"battery_monitor.so",
"cpu_monitor.so", "cpu_monitor.so",
#ifdef __linux__ #ifdef __linux__
"mem_monitor.so", "mem_monitor.so",
@ -554,6 +555,7 @@ void Panel::load_applets(void) {
mgr.load("./applets/clock/clock.so"); mgr.load("./applets/clock/clock.so");
mgr.load("./applets/taskbar/taskbar.so"); mgr.load("./applets/taskbar/taskbar.so");
mgr.load("./applets/keyboard-layout/keyboard_layout.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/cpu-monitor/cpu_monitor.so");
mgr.load("./applets/mem-monitor/mem_monitor.so"); mgr.load("./applets/mem-monitor/mem_monitor.so");
mgr.load("./applets/system-tray/system_tray.so"); mgr.load("./applets/system-tray/system_tray.so");

3
ede-panel/ede-panel.cpp
View File

@ -24,12 +24,9 @@
#include <signal.h> #include <signal.h>
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Button.H>
#include <edelib/Ede.h> #include <edelib/Ede.h>
#include "Panel.h" #include "Panel.h"
#include "AppletManager.h"
static Panel *panel; static Panel *panel;