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

Reduced warnings on gcc 4.4.1.

Browse Source 
Let panel applet use GLOBALFLAGS.
Check for XKBrules from XKB extension and conditionally compile code using it.
This commit is contained in:
Sanel Zukan
2009-11-20 17:08:29 +00:00
parent 7bb1048773
commit 037196c9be
26 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ede-keyboard-conf/Jamfile
View File

@@ -13,6 +13,6 @@ SubDir TOP ede-keyboard-conf ;
SRC = ede-keyboard-conf.cpp ;
EdeProgram ede-keyboard-conf : $(SRC) ;
LinkAgainst ede-keyboard-conf : $(X_LIBS) -lxkbfile ;
LinkAgainst ede-keyboard-conf : $(XKB_LIBS) ;
TranslationStrings locale : $(SRC) ;

13
ede-keyboard-conf/ede-keyboard-conf.cpp
View File

@@ -14,6 +14,11 @@
#include <config.h>
#endif
#include <edelib/MessageBox.h>
#include <edelib/Nls.h>
EDELIB_NS_USING(alert)
#ifdef HAVE_XKBRULES
#include <stdio.h>
#include <string.h>
#include <FL/Fl.H>
@@ -29,7 +34,6 @@
#include <X11/extensions/XKBrules.h>
#include <edelib/Window.h>
#include <edelib/Nls.h>
#include <edelib/Debug.h>
#include <edelib/String.h>
#include <edelib/Resource.h>
@@ -47,7 +51,6 @@ EDELIB_NS_USING(String)
EDELIB_NS_USING(Resource)
EDELIB_NS_USING(file_path)
EDELIB_NS_USING(run_sync)
EDELIB_NS_USING(alert)
EDELIB_NS_USING(foreign_callback_call)
static AppWindow *win;
@@ -213,8 +216,10 @@ static void apply_chages_from_config(void) {
/* TODO: this should be validated somehow */
apply_changes_on_x(buf, NULL);
}
#endif /* HAVE_XKBRULES */
int main(int argc, char **argv) {
#ifdef HAVE_XKBRULES
/* must be opened first */
fl_open_display();
@@ -294,5 +299,9 @@ int main(int argc, char **argv) {
if(xkb_rules)
XkbRF_Free(xkb_rules, True);
#else
alert(_("ede-keyboard-conf was compiled without XKB extension. Please recompile it again"));
#endif /* HAVE_XKBRULES */
return 0;
}