Fixing code to use config.h as default config incude file

ede-panel/Jamfile

@@ -0,0 +1,27 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2009 EDE Authors.
+#
+# This program is licensed under terms of the 
+# GNU General Public License version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP ede-panel ;
+
+SOURCE = aboutdialog.cpp 
+         logoutdialog.cpp 
+         panelbutton.cpp
+         keyboardchooser.cpp
+         taskbutton.cpp
+         workpanel.cpp
+         item.cpp
+         cpumonitor.cpp
+         batterymonitor.cpp
+         dock.cpp
+         mainmenu.cpp
+         mainmenu_scan.cpp ;
+
+EfltkProgram ede-panel : $(SOURCE) ;
+TranslationStrings locale : $(SOURCE) ;

ede-panel/Makefile

@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Part of Equinox Desktop Environment (EDE).
-# Copyright (c) 2000-2006 EDE Authors.
-#
-# This program is licenced under terms of the 
-# GNU General Public Licence version 2 or newer.
-# See COPYING for details.
-
-CPPFILES = aboutdialog.cpp\
-		   logoutdialog.cpp\
-		   panelbutton.cpp\
-		   keyboardchooser.cpp\
-		   taskbutton.cpp\
-		   workpanel.cpp\
-		   item.cpp\
-		   cpumonitor.cpp\
-		   batterymonitor.cpp\
-		   dock.cpp\
-		   mainmenu.cpp\
-		   mainmenu_scan.cpp
-
-TARGET   = eworkpanel
-
-POFILES = locale/ru.po\
-			locale/sr.po\
-			locale/sk.po\
-			locale/hu.po\
-			locale/de.po\
-			locale/fr.po
-
-include ../makeinclude
-
-install:
-	$(INSTALL_PROGRAM) $(TARGET) $(bindir)
-	$(INSTALL_LOCALE)
-
-uninstall:
-	$(RM) $(bindir)/$(TARGET)
-
-clean:
-	$(RM) $(TARGET)
-	$(RM) *.o
-

ede-panel/aboutdialog.cpp

@@ -10,6 +10,10 @@
  * See COPYING for details.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <efltk/Fl.h>
 #include <efltk/Fl_Window.h>
 #include <efltk/Fl_Box.h>
@@ -18,7 +22,6 @@
 #include <efltk/Fl_Locale.h>
 #include <efltk/Fl_Image.h>
 #include <efltk/Fl_Text_Buffer.h>
-#include <edeconf.h>
 
 #include "aboutdialog.h"
 #include "icons/ede.xpm"

ede-panel/batterymonitor.cpp

@@ -346,15 +346,15 @@ void battery_check(void)
 
 typedef struct apm_info {
    char driver_version[10];
-   int        apm_version_major;
+   int          apm_version_major;
-   int        apm_version_minor;
+   int          apm_version_minor;
-   int        apm_flags;
+   unsigned int apm_flags;
-   int        ac_line_status;
+   unsigned int ac_line_status;
-   int        battery_status;
+   unsigned int battery_status;
-   int        battery_flags;
+   unsigned int battery_flags;
-   int        battery_percentage;
+   int          battery_percentage;
-   int        battery_time;
+   int          battery_time;
-   int        using_minutes;
+   int          using_minutes;
 } apm_info;
 
 

ede-panel/batterymonitor.h

@@ -1,7 +1,9 @@
 #ifndef _batterymonitor_h_
 #define _batterymonitor_h_
 
-#include <edeconf.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <efltk/Fl_Widget.h>
 #include <efltk/Fl_Locale.h>

ede-panel/cpumonitor.h

@@ -1,7 +1,9 @@
 #ifndef _CPUMONITOR_H_
 #define _CPUMONITOR_H_
 
-#include <edeconf.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef HAVE_KSTAT_H
 #include <kstat.h>

ede-panel/keyboardchooser.cpp

@@ -4,6 +4,7 @@
 // See COPYING for details.
 
 #include "keyboardchooser.h"
+#include "icons/keyboard.xpm"
 
 #define MAX_KEYBOARDS 5
 

ede-panel/keyboardchooser.h

@@ -21,9 +21,6 @@
 #include <efltk/fl_draw.h>
 #include <efltk/Fl_Locale.h>
 
-#include "icons/keyboard.xpm"
-
-
 class KeyboardChooser : public Fl_Menu_Button 
 {
 public:

ede-panel/mainmenu.cpp

@@ -1,7 +1,10 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "mainmenu.h"
 #include "menu.h"
 
-#include <edeconf.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <locale.h>

ede-panel/menu.h

@@ -1,4 +1,7 @@
-#include <edeconf.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 static const char default_menu[] =
 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n\
 <Menu>\n\

ede-panel/workpanel.cpp

@@ -415,7 +415,6 @@ void FL_WM_handler(Fl_Widget *w, void *d)
 	}
 }
 
-#define DEBUG
 void terminationHandler(int signum)
 {
 #ifndef DEBUG

edewm/Frame.h

@@ -89,7 +89,7 @@ enum {
 // values for state_flags:
 // These change over time
 enum {
-    IGNORE_UNMAP	= 0x01,	// we did something that echos an UnmapNotify
+    IGNORE_UNMAP	= 0x01 	// we did something that echos an UnmapNotify
 };
 
 class Icon;

edewm/Icccm.cpp

@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Icccm.h"
 #include "Frame.h"
 #include "Winhints.h"
 #include "Windowmanager.h"
 
-#include <edeconf.h>
-
 static void icccm_send_state(Window wid, long state)
 {
     long data[2];

edewm/Jamfile

@@ -0,0 +1,31 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2009 EDE Authors.
+#
+# This program is licensed under terms of the 
+# GNU General Public License version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP edewm ;
+
+SOURCE = WMWindow.cpp
+         Theme.cpp
+         Netwm.cpp
+         Mwm.cpp
+         Icccm.cpp
+         Icon.cpp
+         Cursor.cpp
+         Desktop.cpp
+         Events.cpp
+         Frame.cpp
+         Hotkeys.cpp
+         Tabmenu.cpp
+         Titlebar.cpp
+         Windowmanager.cpp
+         Winhints.cpp
+         main.cpp ;
+
+EfltkProgram edewm : $(SOURCE) ;
+TranslationStrings locale : $(SOURCE) ;

edewm/Makefile

@@ -1,49 +0,0 @@
-#
-# $Id: Makefile 1957 2007-06-25 19:42:47Z vljubovic $
-#
-# Part of Equinox Desktop Environment (EDE).
-# Copyright (c) 2000-2006 EDE Authors.
-#
-# This program is licenced under terms of the 
-# GNU General Public Licence version 2 or newer.
-# See COPYING for details.
-
-CPPFILES = WMWindow.cpp\
-			Theme.cpp\
-			Netwm.cpp\
-			Mwm.cpp\
-			Icccm.cpp\
-			Icon.cpp\
-			Cursor.cpp\
-			Desktop.cpp\
-			Events.cpp\
-			Frame.cpp\
-			Hotkeys.cpp\
-			Tabmenu.cpp\
-			Titlebar.cpp\
-			Windowmanager.cpp\
-			Winhints.cpp\
-			main.cpp
-
-TARGET   = edewm
-
-POFILES = locale/ru.po\
-			locale/sr.po\
-			locale/sk.po\
-			locale/hu.po\
-			locale/de.po\
-			locale/fr.po
-
-include ../makeinclude
-
-install:
-	$(INSTALL_PROGRAM) $(TARGET) $(bindir)
-	$(INSTALL_LOCALE)
-
-uninstall:
-	$(RM) $(bindir)/$(TARGET)
-
-clean:
-	$(RM) $(TARGET)
-	$(RM) *.o
-

edewm/Theme.cpp

@@ -113,5 +113,5 @@ Fl_Color frame_color()
     return _frame_color;
 }
 
-}; /* namespace Theme */
+}  /* namespace Theme */
 

edewm/Theme.h

@@ -26,6 +26,6 @@ extern void unload_theme();
 extern Fl_Image *image(int which);
 extern Fl_Color frame_color();
 
-};
+}
 
 #endif

edewm/main.cpp

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Frame.h"
 #include "Desktop.h"
 #include "Windowmanager.h"
@@ -11,7 +15,6 @@
 
 #include "config.h"
 #include "debug.h"
-#include <edeconf.h>
 
 #include <signal.h>