Hello!

Did a quick build test and needed to do the attached changes to get the
build to not fail... HTH.

-- 
Andreas Henriksson
diff -uriNp -x .libs -x gtk-vnc-plugin.la -x npshell.c -x npunix.c -x '*.lo' -x '*.so' -x Makefile gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.c gtk-vnc-0.4.3-gtk3/plugin/gtk-vnc-plugin.c
--- gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.c	2011-02-18 17:29:10.000000000 +0100
+++ gtk-vnc-0.4.3-gtk3/plugin/gtk-vnc-plugin.c	2011-04-13 18:24:51.000000000 +0200
@@ -196,11 +196,11 @@ GtkVNCXSetWindow (NPP instance, NPWindow
   This->height = window->height;
 
   /* Create a GtkPlug container and a Gtk-VNC widget inside it. */
-  This->container = gtk_plug_new ((GdkNativeWindow)(long)window->window);
+  This->container = gtk_plug_new ((long)window->window);
   This->vnc = vnc_display_new ();
 
   /* Make sure the canvas is capable of receiving focus. */
-  GTK_WIDGET_SET_FLAGS (GTK_WIDGET(This->vnc), GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (GTK_WIDGET(This->vnc), TRUE);
 
   /* All the events that our canvas wants to receive */
   gtk_widget_add_events
diff -uriNp -x .libs -x gtk-vnc-plugin.la -x npshell.c -x npunix.c -x '*.lo' -x '*.so' -x Makefile gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.h gtk-vnc-0.4.3-gtk3/plugin/gtk-vnc-plugin.h
--- gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.h	2011-02-18 17:29:10.000000000 +0100
+++ gtk-vnc-0.4.3-gtk3/plugin/gtk-vnc-plugin.h	2011-04-13 18:11:08.000000000 +0200
@@ -38,6 +38,7 @@
 
 #include <npapi.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include <X11/Xlib.h>
 
 #define PLUGIN_NAME         "GTK-VNC plugin"
diff -uriNp -x .libs -x gtk-vnc-plugin.la -x npshell.c -x npunix.c -x '*.lo' -x '*.so' -x Makefile gtk-vnc-0.4.3/plugin/Makefile.am gtk-vnc-0.4.3-gtk3/plugin/Makefile.am
--- gtk-vnc-0.4.3/plugin/Makefile.am	2011-02-18 17:29:10.000000000 +0100
+++ gtk-vnc-0.4.3-gtk3/plugin/Makefile.am	2011-04-13 18:19:26.000000000 +0200
@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = gtk-vnc-plugin.la
 gtk_vnc_plugin_la_SOURCES = \
 	gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c
 gtk_vnc_plugin_la_LIBADD = \
-	../src/libgtk-vnc-1.0.la @GTK_LIBS@ \
+	../src/libgtk-vnc-$(GTK_VNC_API_VERSION).la @GTK_LIBS@ \
 	@FIREFOX_PLUGIN_LIBS@
 gtk_vnc_plugin_la_LDFLAGS = \
 	-module -avoid-version
diff -uriNp -x .libs -x gtk-vnc-plugin.la -x npshell.c -x npunix.c -x '*.lo' -x '*.so' -x Makefile gtk-vnc-0.4.3/plugin/Makefile.in gtk-vnc-0.4.3-gtk3/plugin/Makefile.in
--- gtk-vnc-0.4.3/plugin/Makefile.in	2011-02-18 17:29:21.000000000 +0100
+++ gtk-vnc-0.4.3-gtk3/plugin/Makefile.in	2011-04-13 18:19:34.000000000 +0200
@@ -71,8 +71,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
-@ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_DEPENDENCIES =  \
-@ENABLE_PLUGIN_TRUE@	../src/libgtk-vnc-1.0.la
+@ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_DEPENDENCIES = ../src/libgtk-vnc-$(GTK_VNC_API_VERSION).la
 am__gtk_vnc_plugin_la_SOURCES_DIST = gtk-vnc-plugin.c gtk-vnc-plugin.h \
 	npshell.c npunix.c
 @ENABLE_PLUGIN_TRUE@am_gtk_vnc_plugin_la_OBJECTS =  \
@@ -320,7 +319,7 @@ top_srcdir = @top_srcdir@
 @ENABLE_PLUGIN_TRUE@	gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c
 
 @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_LIBADD = \
-@ENABLE_PLUGIN_TRUE@	../src/libgtk-vnc-1.0.la @GTK_LIBS@ \
+@ENABLE_PLUGIN_TRUE@	../src/libgtk-vnc-$(GTK_VNC_API_VERSION).la @GTK_LIBS@ \
 @ENABLE_PLUGIN_TRUE@	@FIREFOX_PLUGIN_LIBS@
 
 @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_LDFLAGS = \

Reply via email to