applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build on Linux/PPC machines (the only ones to use the FB-Level code)

Browse source 
2004-01-14  Bastien Nocera  <hadess@hadess.net>

	* Makefile.am:
	* gnome-settings-multimedia-keys.c: fix build on Linux/PPC machines
	(the only ones to use the FB-Level code)
This commit is contained in:
Bastien Nocera 2004-01-14 13:19:04 +00:00 • committed by Bastien Nocera
parent f4cf3de5ba
commit 04996e2010
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,9 @@
2004-01-14 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* gnome-settings-multimedia-keys.c: fix build on Linux/PPC machines
(the only ones to use the FB-Level code)
2004-01-14 Jody Goldberg <jody@gnome.org> 2004-01-14 Jody Goldberg <jody@gnome.org>
* Release 2.5.2 * Release 2.5.2

4
gnome-settings-daemon/Makefile.am
View file

@ -1,9 +1,5 @@
SUBDIRS = xrdb actions SUBDIRS = xrdb actions
if HAVE_FB
FB_CFLAGS = -DHAVE_FB
endif
INCLUDES=$(LIBXKLAVIER_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \ INCLUDES=$(LIBXKLAVIER_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DESD_SERVER="\"$(ESD_SERVER)\"" \ -DESD_SERVER="\"$(ESD_SERVER)\"" \

12
gnome-settings-daemon/gnome-settings-multimedia-keys.c
View file

@ -32,12 +32,6 @@
#include "eggaccelerators.h" #include "eggaccelerators.h"
#include "actions/acme.h"
#include "actions/acme-volume.h"
#define DIALOG_TIMEOUT 1000 /* dialog timeout in ms */
#define VOLUME_STEP 6 /* percents for one volume button press */
#if defined(__powerpc__) && defined (__linux__) #if defined(__powerpc__) && defined (__linux__)
#define USE_FBLEVEL #define USE_FBLEVEL
#include "actions/acme-fb-level.h" #include "actions/acme-fb-level.h"
@ -45,6 +39,12 @@
#undef USE_FBLEVEL #undef USE_FBLEVEL
#endif #endif
#include "actions/acme.h"
#include "actions/acme-volume.h"
#define DIALOG_TIMEOUT 1000 /* dialog timeout in ms */
#define VOLUME_STEP 6 /* percents for one volume button press */
/* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what /* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
these modifiers mean these modifiers mean
these are the mods whose combinations are bound by the keygrabbing code */ these are the mods whose combinations are bound by the keygrabbing code */