[gnome-bluetooth] moblin: Fix compilation with GTK+ 3.x

[Bastien Nocera <hadess src gnome org>]

commit 9f72a569c1ddeb8a0aea2684694e7763d80fbd46
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Nov 11 22:50:27 2010 +0000

    moblin: Fix compilation with GTK+ 3.x

 moblin/main.c         |    6 +++---
 moblin/moblin-panel.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/moblin/main.c b/moblin/main.c
index 64edd30..bfce497 100644
--- a/moblin/main.c
+++ b/moblin/main.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
-#include <mx/mx-gtk.h>
+#include <mx-gtk/mx-gtk.h>
 #include <moblin-panel/mpl-panel-common.h>
 #include <moblin-panel/mpl-panel-gtk.h>
 #include <bluetooth-enums.h>
@@ -114,7 +114,7 @@ main (int argc, char *argv[])
 		window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 		g_signal_connect (window, "delete-event", (GCallback) gtk_main_quit,
 				NULL);
-		gtk_widget_set_size_request (window, 1000, -1);
+		gtk_window_set_default_size (GTK_WINDOW (window), 1000, -1);
 		content = moblin_panel_new ();
 		gtk_widget_show (content);
 
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
 		gtk_widget_show (content);
 		gtk_box_pack_start (GTK_BOX (box), content, TRUE, TRUE, 0);
 
-		gtk_widget_size_request (window, &req);
+		gtk_widget_get_preferred_size (window, NULL, &req);
 		mpl_panel_client_set_height_request (panel, req.height);
 	}
 
diff --git a/moblin/moblin-panel.c b/moblin/moblin-panel.c
index 94d03fd..3c6f962 100644
--- a/moblin/moblin-panel.c
+++ b/moblin/moblin-panel.c
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <math.h>
 #include <gdk/gdkkeysyms.h>
-#include <mx/mx-gtk.h>
+#include <mx-gtk/mx-gtk.h>
 
 #include "bluetooth-client.h"
 #include "bluetooth-client-private.h"
@@ -399,8 +399,8 @@ entry_custom_event (GtkWidget *entry, GdkEventKey *event)
 	if (event->length == 0)
 		return FALSE;
 
-	if ((event->keyval >= GDK_0 && event->keyval <= GDK_9) ||
-	    (event->keyval >= GDK_KP_0 && event->keyval <= GDK_KP_9))
+	if ((event->keyval >= GDK_KEY_0 && event->keyval <= GDK_KEY_9) ||
+	    (event->keyval >= GDK_KEY_KP_0 && event->keyval <= GDK_KEY_KP_9))
 		return FALSE;
 
 	return TRUE;