Changeset 103927 in webkit

Timestamp:

Jan 3, 2012 12:04:49 AM (12 years ago)

Author:

Philippe Normand

Message:

[GTK] GtkLauncher settings improvements
​https://bugs.webkit.org/show_bug.cgi?id=75439

Reviewed by Martin Robinson.

• GtkLauncher/main.c:

(filenameToURL): We can use NULL in C.
(isValidParameterType): Utility function to filter GParamTypes
that can be edited.
(getOptionEntriesFromWebKitWebSettings): Avoid handling
construct-only properties and use the isValidParameterType
function. Makes the code a bit cleaner.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• GtkLauncher/main.c (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-02  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] GtkLauncher settings improvements
+        https://bugs.webkit.org/show_bug.cgi?id=75439
+
+        Reviewed by Martin Robinson.
+
+        * GtkLauncher/main.c:
+        (filenameToURL): We can use NULL in C.
+        (isValidParameterType): Utility function to filter GParamTypes
+        that can be edited.
+        (getOptionEntriesFromWebKitWebSettings): Avoid handling
+        construct-only properties and use the isValidParameterType
+        function. Makes the code a bit cleaner.
+
 2012-01-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Tools/GtkLauncher/main.c

@@ -231 +231 @@
 {
     if (!g_file_test(filename, G_FILE_TEST_EXISTS))
-        return 0;
+        return NULL;
 
     GFile *gfile = g_file_new_for_path(filename);
@@ -307 +307 @@
 }
 
+static gboolean isValidParameterType(GType gParamType)
+{
+    return (gParamType == G_TYPE_BOOLEAN || gParamType == G_TYPE_STRING || gParamType == G_TYPE_INT
+            || gParamType == G_TYPE_FLOAT);
+}
+
 static GOptionEntry* getOptionEntriesFromWebKitWebSettings(WebKitWebSettings *webSettings)
 {
@@ -315 +321 @@
     propertySpecs = g_object_class_list_properties(G_OBJECT_GET_CLASS(webSettings), &numProperties);
     if (!propertySpecs)
-        return 0;
+        return NULL;
 
     optionEntries = g_new0(GOptionEntry, numProperties + 1);
@@ -322 +328 @@
         GParamSpec *param = propertySpecs[i];
 
-        /* Fill in structures only for writable properties. */
-        if (!param || !(param->flags & G_PARAM_WRITABLE))
+        /* Fill in structures only for writable and not construct-only properties. */
+        if (!param || !(param->flags & G_PARAM_WRITABLE) || (param->flags & G_PARAM_CONSTRUCT_ONLY))
             continue;
 
         GType gParamType = G_PARAM_SPEC_VALUE_TYPE(param);
-        if (gParamType == G_TYPE_BOOLEAN || gParamType == G_TYPE_STRING || gParamType == G_TYPE_INT
-            || gParamType == G_TYPE_FLOAT) {
-            GOptionEntry *optionEntry = &optionEntries[numEntries++];
-            optionEntry->long_name = g_param_spec_get_name(param);
-
-            /* There is no easy way to figure our short name for generated option entries.
-               optionEntry.short_name=*/
-            /* For bool arguments "enable" type make option argument not required. */
-            if (gParamType == G_TYPE_BOOLEAN && (strstr(optionEntry->long_name, "enable")))
-                optionEntry->flags = G_OPTION_FLAG_OPTIONAL_ARG;
-            optionEntry->arg = G_OPTION_ARG_CALLBACK;
-            optionEntry->arg_data = parseOptionEntryCallback;
-            optionEntry->description = g_param_spec_get_blurb(param);
-            optionEntry->arg_description = g_type_name(gParamType);
-        }
+        if (!isValidParameterType(gParamType))
+            continue;
+
+        GOptionEntry *optionEntry = &optionEntries[numEntries++];
+        optionEntry->long_name = g_param_spec_get_name(param);
+
+        /* There is no easy way to figure our short name for generated option entries.
+           optionEntry.short_name=*/
+        /* For bool arguments "enable" type make option argument not required. */
+        if (gParamType == G_TYPE_BOOLEAN && (strstr(optionEntry->long_name, "enable")))
+            optionEntry->flags = G_OPTION_FLAG_OPTIONAL_ARG;
+        optionEntry->arg = G_OPTION_ARG_CALLBACK;
+        optionEntry->arg_data = parseOptionEntryCallback;
+        optionEntry->description = g_param_spec_get_blurb(param);
+        optionEntry->arg_description = g_type_name(gParamType);
     }
     g_free(propertySpecs);