[GTK] Rename PACKAGE_LOCALE_DIR to LOCALEDIR
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Jul 2015 21:46:07 +0000 (21:46 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Jul 2015 21:46:07 +0000 (21:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146975

Reviewed by Martin Robinson.

* PlatformGTK.cmake:
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_class_init):
* WebProcess/gtk/WebProcessMainGtk.cpp:

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

Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp

index 99014c0..79409e9 100644 (file)
@@ -1,5 +1,17 @@
 2015-07-15  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [GTK] Rename PACKAGE_LOCALE_DIR to LOCALEDIR
+        https://bugs.webkit.org/show_bug.cgi?id=146975
+
+        Reviewed by Martin Robinson.
+
+        * PlatformGTK.cmake:
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_class_init):
+        * WebProcess/gtk/WebProcessMainGtk.cpp:
+
+2015-07-15  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         [GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
         https://bugs.webkit.org/show_bug.cgi?id=140070
 
index 1af764e..73c374f 100644 (file)
@@ -16,7 +16,7 @@ configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FI
 add_definitions(-DBUILDING_WEBKIT)
 add_definitions(-DWEBKIT2_COMPILATION)
 add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
-add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
+add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
 
 set(WebKit2_USE_PREFIX_HEADER ON)
index 7664558..086d4ec 100644 (file)
@@ -339,7 +339,7 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass
 {
     GObjectClass* gObjectClass = G_OBJECT_CLASS(webContextClass);
 
-    bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+    bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 
     gObjectClass->get_property = webkitWebContextGetProperty;
index 27e1e30..d5eeae1 100644 (file)
@@ -56,7 +56,7 @@ public:
 #endif
         gtk_init(nullptr, nullptr);
 
-        bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+        bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
         bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 
         SoupNetworkSession::defaultSession().setSSLPolicy(SoupNetworkSession::SSLUseSystemCAFile);