[webkit-changes] [98484] trunk/Source/WebKit2

Wed, 26 Oct 2011 08:41:52 -0700

Title: [98484] trunk/Source/WebKit2
Revision
98484
Author
carlo...@webkit.org
Date
2011-10-26 08:40:56 -0700 (Wed, 26 Oct 2011)

Log Message

[GTK] Inconsistent name of WebKitSettings macros
https://bugs.webkit.org/show_bug.cgi?id=70924

Reviewed by Martin Robinson.

Rename WEBKIT_TYPE_WEB_SETTINGS as WEBKIT_TYPE_SETTINGS and
WEBKIT_IS_WEB_SETTINGS as WEBKIT_IS_SETTINGS.

* UIProcess/API/gtk/WebKitSettings.cpp:
(webkit_settings_init):
(webkit_settings_new):
(webkit_settings_get_enable_javascript):
(webkit_settings_set_enable_javascript):
(webkit_settings_get_auto_load_images):
(webkit_settings_set_auto_load_images):
(webkit_settings_get_load_icons_ignoring_image_load_setting):
(webkit_settings_set_load_icons_ignoring_image_load_setting):
(webkit_settings_get_enable_offline_web_application_cache):
(webkit_settings_set_enable_offline_web_application_cache):
(webkit_settings_get_enable_html5_local_storage):
(webkit_settings_set_enable_html5_local_storage):
(webkit_settings_get_enable_html5_database):
(webkit_settings_set_enable_html5_database):
(webkit_settings_get_enable_xss_auditor):
(webkit_settings_set_enable_xss_auditor):
(webkit_settings_get_enable_frame_flattening):
(webkit_settings_set_enable_frame_flattening):
(webkit_settings_get_enable_plugins):
(webkit_settings_set_enable_plugins):
(webkit_settings_get_enable_java):
(webkit_settings_set_enable_java):
(webkit_settings_get_javascript_can_open_windows_automatically):
(webkit_settings_set_javascript_can_open_windows_automatically):
(webkit_settings_get_enable_hyperlink_auditing):
(webkit_settings_set_enable_hyperlink_auditing):
* UIProcess/API/gtk/WebKitSettings.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (98483 => 98484)


--- trunk/Source/WebKit2/ChangeLog	2011-10-26 15:27:44 UTC (rev 98483)
+++ trunk/Source/WebKit2/ChangeLog	2011-10-26 15:40:56 UTC (rev 98484)
@@ -1,3 +1,42 @@
+2011-10-26  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Inconsistent name of WebKitSettings macros
+        https://bugs.webkit.org/show_bug.cgi?id=70924
+
+        Reviewed by Martin Robinson.
+
+        Rename WEBKIT_TYPE_WEB_SETTINGS as WEBKIT_TYPE_SETTINGS and
+        WEBKIT_IS_WEB_SETTINGS as WEBKIT_IS_SETTINGS.
+
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webkit_settings_init):
+        (webkit_settings_new):
+        (webkit_settings_get_enable_javascript):
+        (webkit_settings_set_enable_javascript):
+        (webkit_settings_get_auto_load_images):
+        (webkit_settings_set_auto_load_images):
+        (webkit_settings_get_load_icons_ignoring_image_load_setting):
+        (webkit_settings_set_load_icons_ignoring_image_load_setting):
+        (webkit_settings_get_enable_offline_web_application_cache):
+        (webkit_settings_set_enable_offline_web_application_cache):
+        (webkit_settings_get_enable_html5_local_storage):
+        (webkit_settings_set_enable_html5_local_storage):
+        (webkit_settings_get_enable_html5_database):
+        (webkit_settings_set_enable_html5_database):
+        (webkit_settings_get_enable_xss_auditor):
+        (webkit_settings_set_enable_xss_auditor):
+        (webkit_settings_get_enable_frame_flattening):
+        (webkit_settings_set_enable_frame_flattening):
+        (webkit_settings_get_enable_plugins):
+        (webkit_settings_set_enable_plugins):
+        (webkit_settings_get_enable_java):
+        (webkit_settings_set_enable_java):
+        (webkit_settings_get_javascript_can_open_windows_automatically):
+        (webkit_settings_set_javascript_can_open_windows_automatically):
+        (webkit_settings_get_enable_hyperlink_auditing):
+        (webkit_settings_set_enable_hyperlink_auditing):
+        * UIProcess/API/gtk/WebKitSettings.h:
+
 2011-10-26  Andras Becsi  <andras.be...@nokia.com>
 
         [Qt][WK2] Rename clean-up of QtPinchGestureRecognizer and QtViewportInteractionEngine

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (98483 => 98484)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2011-10-26 15:27:44 UTC (rev 98483)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2011-10-26 15:40:56 UTC (rev 98484)
@@ -385,7 +385,7 @@
 
 static void webkit_settings_init(WebKitSettings* settings)
 {
-    WebKitSettingsPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(settings, WEBKIT_TYPE_WEB_SETTINGS, WebKitSettingsPrivate);
+    WebKitSettingsPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(settings, WEBKIT_TYPE_SETTINGS, WebKitSettingsPrivate);
     settings->priv = priv;
     new (priv) WebKitSettingsPrivate();
 
@@ -402,7 +402,7 @@
  **/
 WebKitSettings* webkit_settings_new()
 {
-    return WEBKIT_SETTINGS(g_object_new(WEBKIT_TYPE_WEB_SETTINGS, NULL));
+    return WEBKIT_SETTINGS(g_object_new(WEBKIT_TYPE_SETTINGS, NULL));
 }
 
 /**
@@ -416,7 +416,7 @@
  **/
 gboolean webkit_settings_get_enable_javascript(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetJavaScriptEnabled(settings->priv->preferences.get());
 }
@@ -431,7 +431,7 @@
  **/
 void webkit_settings_set_enable_javascript(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetJavaScriptEnabled(priv->preferences.get());
@@ -453,7 +453,7 @@
  **/
 gboolean webkit_settings_get_auto_load_images(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetLoadsImagesAutomatically(settings->priv->preferences.get());
 }
@@ -468,7 +468,7 @@
  **/
 void webkit_settings_set_auto_load_images(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetLoadsImagesAutomatically(priv->preferences.get());
@@ -490,7 +490,7 @@
  **/
 gboolean webkit_settings_get_load_icons_ignoring_image_load_setting(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetLoadsSiteIconsIgnoringImageLoadingPreference(settings->priv->preferences.get());
 }
@@ -505,7 +505,7 @@
  **/
 void webkit_settings_set_load_icons_ignoring_image_load_setting(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetLoadsSiteIconsIgnoringImageLoadingPreference(priv->preferences.get());
@@ -527,7 +527,7 @@
  **/
 gboolean webkit_settings_get_enable_offline_web_application_cache(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetOfflineWebApplicationCacheEnabled(settings->priv->preferences.get());
 }
@@ -542,7 +542,7 @@
  **/
 void webkit_settings_set_enable_offline_web_application_cache(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetOfflineWebApplicationCacheEnabled(priv->preferences.get());
@@ -564,7 +564,7 @@
  **/
 gboolean webkit_settings_get_enable_html5_local_storage(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetLocalStorageEnabled(settings->priv->preferences.get());
 }
@@ -579,7 +579,7 @@
  **/
 void webkit_settings_set_enable_html5_local_storage(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetLocalStorageEnabled(priv->preferences.get());
@@ -601,7 +601,7 @@
  **/
 gboolean webkit_settings_get_enable_html5_database(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetDatabasesEnabled(settings->priv->preferences.get());
 }
@@ -616,7 +616,7 @@
  **/
 void webkit_settings_set_enable_html5_database(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetDatabasesEnabled(priv->preferences.get());
@@ -638,7 +638,7 @@
  **/
 gboolean webkit_settings_get_enable_xss_auditor(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetXSSAuditorEnabled(settings->priv->preferences.get());
 }
@@ -653,7 +653,7 @@
  **/
 void webkit_settings_set_enable_xss_auditor(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetXSSAuditorEnabled(priv->preferences.get());
@@ -675,7 +675,7 @@
  **/
 gboolean webkit_settings_get_enable_frame_flattening(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetFrameFlatteningEnabled(settings->priv->preferences.get());
 }
@@ -690,7 +690,7 @@
  **/
 void webkit_settings_set_enable_frame_flattening(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetFrameFlatteningEnabled(priv->preferences.get());
@@ -712,7 +712,7 @@
  **/
 gboolean webkit_settings_get_enable_plugins(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetPluginsEnabled(settings->priv->preferences.get());
 }
@@ -727,7 +727,7 @@
  **/
 void webkit_settings_set_enable_plugins(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetPluginsEnabled(priv->preferences.get());
@@ -749,7 +749,7 @@
  **/
 gboolean webkit_settings_get_enable_java(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetJavaEnabled(settings->priv->preferences.get());
 }
@@ -764,7 +764,7 @@
  **/
 void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetJavaEnabled(priv->preferences.get());
@@ -786,7 +786,7 @@
  **/
 gboolean webkit_settings_get_javascript_can_open_windows_automatically(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(settings->priv->preferences.get());
 }
@@ -801,7 +801,7 @@
  **/
 void webkit_settings_set_javascript_can_open_windows_automatically(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(priv->preferences.get());
@@ -823,7 +823,7 @@
  **/
 gboolean webkit_settings_get_enable_hyperlink_auditing(WebKitSettings* settings)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(settings), FALSE);
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
 
     return WKPreferencesGetHyperlinkAuditingEnabled(settings->priv->preferences.get());
 }
@@ -838,7 +838,7 @@
  **/
 void webkit_settings_set_enable_hyperlink_auditing(WebKitSettings* settings, gboolean enabled)
 {
-    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(settings));
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
 
     WebKitSettingsPrivate* priv = settings->priv;
     bool currentValue = WKPreferencesGetHyperlinkAuditingEnabled(priv->preferences.get());

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h (98483 => 98484)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h	2011-10-26 15:27:44 UTC (rev 98483)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h	2011-10-26 15:40:56 UTC (rev 98484)
@@ -40,12 +40,12 @@
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_WEB_SETTINGS            (webkit_settings_get_type())
-#define WEBKIT_SETTINGS(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitSettings))
-#define WEBKIT_SETTINGS_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_WEB_SETTINGS, WebKitSettingsClass))
-#define WEBKIT_IS_WEB_SETTINGS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_WEB_SETTINGS))
-#define WEBKIT_IS_WEB_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_WEB_SETTINGS))
-#define WEBKIT_SETTINGS_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_SETTINGS, WebKitSettingsClass))
+#define WEBKIT_TYPE_SETTINGS            (webkit_settings_get_type())
+#define WEBKIT_SETTINGS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_SETTINGS, WebKitSettings))
+#define WEBKIT_SETTINGS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_SETTINGS, WebKitSettingsClass))
+#define WEBKIT_IS_SETTINGS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_SETTINGS))
+#define WEBKIT_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_SETTINGS))
+#define WEBKIT_SETTINGS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_SETTINGS, WebKitSettingsClass))
 
 typedef struct _WebKitSettings WebKitSettings;
 typedef struct _WebKitSettingsClass WebKitSettingsClass;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to