From 04996e2010507f98a33ab37580b8fdd6f769f72c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 14 Jan 2004 13:19:04 +0000 Subject: [PATCH] fix build on Linux/PPC machines (the only ones to use the FB-Level code) 2004-01-14 Bastien Nocera * Makefile.am: * gnome-settings-multimedia-keys.c: fix build on Linux/PPC machines (the only ones to use the FB-Level code) --- gnome-settings-daemon/ChangeLog | 6 ++++++ gnome-settings-daemon/Makefile.am | 4 ---- .../gnome-settings-multimedia-keys.c | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index f9d236ad9..2adef0d57 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,9 @@ +2004-01-14 Bastien Nocera + + * 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 * Release 2.5.2 diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am index 94472cfab..726f75810 100644 --- a/gnome-settings-daemon/Makefile.am +++ b/gnome-settings-daemon/Makefile.am @@ -1,9 +1,5 @@ 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) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DESD_SERVER="\"$(ESD_SERVER)\"" \ diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c index acf5bb5a9..7b70bc3bd 100644 --- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c +++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c @@ -32,12 +32,6 @@ #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__) #define USE_FBLEVEL #include "actions/acme-fb-level.h" @@ -45,6 +39,12 @@ #undef USE_FBLEVEL #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 these modifiers mean these are the mods whose combinations are bound by the keygrabbing code */