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

[Christian Persch <chpe src gnome org>]

commit fab29664a634d6bdabc5bcbbb60345f0383da476
Author: Christian Persch <chpe gnome org>
Date:   Thu Oct 28 14:49:40 2010 +0200

    multiload: Fix the build with gtk3

 multiload/Makefile.am  |    2 +-
 multiload/main.c       |   12 ++++++------
 multiload/properties.c |    1 -
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 0563b62..9aa9a39 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST =							\
 	$(schemas_in_files)					\
 	$(ui_DATA)
 
-uidir		= $(datadir)/gnome-2.0/ui
+uidir		= $(pkgdatadir)/ui
 ui_DATA		= multiload-applet-menu.xml
 
 appletdir       = $(datadir)/gnome-panel/applets
diff --git a/multiload/main.c b/multiload/main.c
index eea8ceb..6e361d2 100644
--- a/multiload/main.c
+++ b/multiload/main.c
@@ -235,12 +235,12 @@ multiload_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, MultiloadAp
 	switch (event->keyval) {
 	/* this list of keyvals taken from mixer applet, which seemed to have
 		a good list of keys to use */
-	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:
 		/* activate */
 		start_procman (ma);
 		return TRUE;
diff --git a/multiload/properties.c b/multiload/properties.c
index 522439e..fc338e2 100644
--- a/multiload/properties.c
+++ b/multiload/properties.c
@@ -661,7 +661,6 @@ multiload_properties_cb (GtkAction       *action,
 			       gtk_widget_get_screen (GTK_WIDGET (ma->applet)));
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);