2011-03-10 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Mar 2011 00:49:01 +0000 (00:49 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Mar 2011 00:49:01 +0000 (00:49 +0000)
        Build for WebKit2 GTK+ after r80714.

        * GNUmakefile.am: Update source list.
        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
        (WebKit::x11Display): Add missing semicolon.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

index c5a81c1..1a7bb27 100644 (file)
@@ -1,3 +1,11 @@
+2011-03-10  Martin Robinson  <mrobinson@igalia.com>
+
+        Build for WebKit2 GTK+ after r80714.
+
+        * GNUmakefile.am: Update source list.
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: 
+        (WebKit::x11Display): Add missing semicolon.
+
 2011-03-10  Chris Fleizach  <cfleizach@apple.com>
 
         Reviewed by Darin Adler.
index d0a252a..677f382 100644 (file)
@@ -563,7 +563,6 @@ libWebKit2_la_SOURCES = \
        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h \
        Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp \
        Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h \
-       Source/WebKit2/WebProcess/Plugins/Netscape/gtk/NetscapePluginGtk.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h \
        Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp \
@@ -580,6 +579,7 @@ libWebKit2_la_SOURCES = \
        Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h \
        Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h \
+       Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp \
        Source/WebKit2/WebProcess/Plugins/PluginController.h \
        Source/WebKit2/WebProcess/Plugins/Plugin.cpp \
        Source/WebKit2/WebProcess/Plugins/Plugin.h \
index 3d76d52..16db199 100644 (file)
@@ -80,7 +80,7 @@ static inline Display* x11Display()
 #if PLATFORM(QT)
     return QX11Info::display();
 #elif PLATFORM(GTK)
-    return GDK_DISPLAY_XDISPLAY(gdk_display_get_default())
+    return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 #else
     return 0;
 #endif