[gnome-applets/gtk3: 23/23] cpufreq: Fix the build with gtk3

[Christian Persch <chpe src gnome org>]

commit 51a15d36d719da963f070a6c6781340f6a0f384a
Author: Christian Persch <chpe gnome org>
Date:   Thu Oct 28 15:07:35 2010 +0200

    cpufreq: Fix the build with gtk3

 cpufreq/Makefile.am          |    2 +-
 cpufreq/src/Makefile.am      |    2 +-
 cpufreq/src/cpufreq-applet.c |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 70f1e9c..c72ab79 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -29,7 +29,7 @@ org.gnome.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
 
 builder_DATA = cpufreq-preferences.ui
 
-uidir = $(datadir)/gnome-2.0/ui
+uidir = $(pkgdatadir)/ui
 ui_DATA = cpufreq-applet-menu.xml
 
 if GCONF_SCHEMAS_INSTALL
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 0fb2983..e4439d7 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -5,7 +5,7 @@ endif
 SUBDIRS = $(selector_SUBDIR)
 
 INCLUDES = \
-	-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/gnome-2.0/ui"\" 	\
+	-DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" 	\
 	$(GNOME_APPLETS3_CFLAGS) 				\
 	$(LIBGLADE_CFLAGS)					\
 	$(DBUS_CFLAGS)
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index c17183a..91681c3 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -512,12 +512,12 @@ cpufreq_applet_key_press (GtkWidget *widget, GdkEventKey *event)
         applet = CPUFREQ_APPLET (widget);
 
         switch (event->keyval) {
-        case GDK_KP_Enter:
-        case GDK_ISO_Enter:
-        case GDK_3270_Enter:
-        case GDK_Return:
-        case GDK_space:
-        case GDK_KP_Space:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_ISO_Enter:
+        case GDK_KEY_3270_Enter:
+        case GDK_KEY_Return:
+        case GDK_KEY_space:
+        case GDK_KEY_KP_Space:
                 cpufreq_applet_menu_popup (applet, event->time);
 
                 return TRUE;