Change all GVariant to GBoxed

3 files changed, 44 insertions, 81 deletions

diff --git a/gnome-autoar/autoar-create.c b/gnome-autoar/autoar-create.c
index bb181fb..b24965f 100644
--- a/gnome-autoar/autoar-create.c
+++ b/gnome-autoar/autoar-create.c
@@ -110,17 +110,12 @@ autoar_create_get_property (GObject    *object,
   AutoarCreate *arcreate;
   AutoarCreatePrivate *priv;
 
-  GVariant *variant;
-  const char* const* strv;
-
   arcreate = AUTOAR_CREATE (object);
   priv = arcreate->priv;
 
   switch (property_id) {
     case PROP_SOURCE:
-      strv = (const char* const*)(priv->source);
-      variant = g_variant_new_strv (strv, -1);
-      g_value_take_variant (value, variant);
+      g_value_set_boxed (value, priv->source);
       break;
     case PROP_OUTPUT:
       g_value_set_string (value, priv->output);
@@ -151,8 +146,6 @@ autoar_create_set_property (GObject      *object,
   AutoarCreate *arcreate;
   AutoarCreatePrivate *priv;
 
-  const char **strv;
-
   arcreate = AUTOAR_CREATE (object);
   priv = arcreate->priv;
 
@@ -170,9 +163,8 @@ autoar_create_set_property (GObject      *object,
       autoar_create_set_completed_files (arcreate, g_value_get_uint (value));
       break;
     case PROP_SOURCE:
-      strv = g_variant_get_strv (g_value_get_variant (value), NULL);
-      g_strfreev (arcreate->priv->source);
-      arcreate->priv->source = g_strdupv ((char**)strv);
+      g_strfreev (priv->source);
+      priv->source = g_value_dup_boxed (value);
       break;
     case PROP_OUTPUT:
       g_free (priv->output);
@@ -778,7 +770,6 @@ autoar_create_class_init (AutoarCreateClass *klass)
 {
   GObjectClass *object_class;
   GType type;
-  GPtrArray *tmparr;
 
   object_class = G_OBJECT_CLASS (klass);
   type = G_TYPE_FROM_CLASS (klass);
@@ -792,20 +783,16 @@ autoar_create_class_init (AutoarCreateClass *klass)
   object_class->dispose = autoar_create_dispose;
   object_class->finalize = autoar_create_finalize;
 
-  tmparr = g_ptr_array_new ();
-  g_ptr_array_add (tmparr, NULL);
-
   g_object_class_install_property (object_class, PROP_SOURCE,
-                                   g_param_spec_variant ("source",
-                                                         "Source archive",
-                                                         "The source files and directories to be compressed",
-                                                         G_VARIANT_TYPE_STRING_ARRAY,
-                                                         g_variant_new_strv ((const char* const*)tmparr->pdata, -1),
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_CONSTRUCT_ONLY |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+                                   g_param_spec_boxed ("source",
+                                                       "Source archive",
+                                                       "The source files and directories to be compressed",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY |
+                                                       G_PARAM_STATIC_NAME |
+                                                       G_PARAM_STATIC_NICK |
+                                                       G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class, PROP_OUTPUT,
                                    g_param_spec_string ("output",
@@ -911,8 +898,6 @@ autoar_create_class_init (AutoarCreateClass *klass)
                   G_TYPE_NONE,
                   1,
                   G_TYPE_POINTER);
-
-  g_ptr_array_unref (tmparr);
 }
 
 static void
@@ -962,7 +947,7 @@ autoar_create_newv (AutoarPref  *arpref,
   g_return_val_if_fail (output != NULL, NULL);
 
   arcreate = g_object_new (AUTOAR_TYPE_CREATE,
-                           "source", g_variant_new_strv (source, -1),
+                           "source", source,
                            "output", output,
                            NULL);
   arcreate->priv->arpref = g_object_ref (arpref);
diff --git a/gnome-autoar/autoar-pref.c b/gnome-autoar/autoar-pref.c
index cdace5e..21bd725 100644
--- a/gnome-autoar/autoar-pref.c
+++ b/gnome-autoar/autoar-pref.c
@@ -91,10 +91,6 @@ autoar_pref_get_property (GObject    *object,
   AutoarPref *arpref;
   AutoarPrefPrivate *priv;
 
-  GVariant *variant;
-
-  const char* const* strv;
-
   arpref = AUTOAR_PREF (object);
   priv = arpref->priv;
 
@@ -106,19 +102,13 @@ autoar_pref_get_property (GObject    *object,
       g_value_set_enum (value, priv->default_filter);
       break;
     case PROP_FILE_NAME_SUFFIX:
-      strv = (const char* const*)(priv->file_name_suffix);
-      variant = g_variant_new_strv (strv, -1);
-      g_value_take_variant (value, variant);
+      g_value_set_boxed (value, priv->file_name_suffix);
       break;
     case PROP_FILE_MIME_TYPE:
-      strv = (const char* const*)(priv->file_mime_type);
-      variant = g_variant_new_strv (strv, -1);
-      g_value_take_variant (value, variant);
+      g_value_set_boxed (value, priv->file_mime_type);
       break;
     case PROP_PATTERN_TO_IGNORE:
-      strv = (const char* const*)(priv->pattern_to_ignore);
-      variant = g_variant_new_strv (strv, -1);
-      g_value_take_variant (value, variant);
+      g_value_set_boxed (value, priv->pattern_to_ignore);
       break;
     case PROP_DELETE_IF_SUCCEED:
       g_value_set_boolean (value, priv->delete_if_succeed);
@@ -136,7 +126,6 @@ autoar_pref_set_property (GObject      *object,
                           GParamSpec   *pspec)
 {
   AutoarPref *arpref;
-  const char **strv;
 
   arpref = AUTOAR_PREF (object);
 
@@ -148,16 +137,13 @@ autoar_pref_set_property (GObject      *object,
       autoar_pref_set_default_filter (arpref, g_value_get_enum (value));
       break;
     case PROP_FILE_NAME_SUFFIX:
-      strv = g_variant_get_strv (g_value_get_variant (value), NULL);
-      autoar_pref_set_file_name_suffix (arpref, strv);
+      autoar_pref_set_file_name_suffix (arpref, g_value_get_boxed (value));
       break;
     case PROP_FILE_MIME_TYPE:
-      strv = g_variant_get_strv (g_value_get_variant (value), NULL);
-      autoar_pref_set_file_mime_type (arpref, strv);
+      autoar_pref_set_file_mime_type (arpref, g_value_get_boxed (value));
       break;
     case PROP_PATTERN_TO_IGNORE:
-      strv = g_variant_get_strv (g_value_get_variant (value), NULL);
-      autoar_pref_set_pattern_to_ignore (arpref, strv);
+      autoar_pref_set_pattern_to_ignore (arpref, g_value_get_boxed (value));
       break;
     case PROP_DELETE_IF_SUCCEED:
       autoar_pref_set_delete_if_succeed (arpref, g_value_get_boolean (value));
@@ -300,7 +286,6 @@ static void
 autoar_pref_class_init (AutoarPrefClass *klass)
 {
   GObjectClass *object_class;
-  GPtrArray *tmparr;
 
   object_class = G_OBJECT_CLASS (klass);
 
@@ -332,41 +317,35 @@ autoar_pref_class_init (AutoarPrefClass *klass)
                                                       G_PARAM_STATIC_NICK |
                                                       G_PARAM_STATIC_BLURB));
 
-  tmparr = g_ptr_array_new ();
-  g_ptr_array_add (tmparr, NULL);
-
   g_object_class_install_property (object_class, PROP_FILE_NAME_SUFFIX,
-                                   g_param_spec_variant (KEY_FILE_NAME_SUFFIX,
-                                                         "File name suffix",
-                                                         "File name suffix whitelist for automatic extraction",
-                                                         G_VARIANT_TYPE_STRING_ARRAY,
-                                                         g_variant_new_strv ((const char* const*)tmparr->pdata, -1),
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+                                   g_param_spec_boxed (KEY_FILE_NAME_SUFFIX,
+                                                       "File name suffix",
+                                                       "File name suffix whitelist for automatic extraction",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_STATIC_NAME |
+                                                       G_PARAM_STATIC_NICK |
+                                                       G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class, PROP_FILE_MIME_TYPE,
-                                   g_param_spec_variant (KEY_FILE_MIME_TYPE,
-                                                         "File MIME type",
-                                                         "File MIME type whitelist for automatic extraction",
-                                                         G_VARIANT_TYPE_STRING_ARRAY,
-                                                         g_variant_new_strv ((const char* const*)tmparr->pdata, -1),
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+                                   g_param_spec_boxed (KEY_FILE_MIME_TYPE,
+                                                       "File MIME type",
+                                                       "File MIME type whitelist for automatic extraction",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_STATIC_NAME |
+                                                       G_PARAM_STATIC_NICK |
+                                                       G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class, PROP_PATTERN_TO_IGNORE,
-                                   g_param_spec_variant (KEY_PATTERN_TO_IGNORE,
-                                                         "Pattern to ignore",
-                                                         "Pattern of file name to skip when extracting files",
-                                                         G_VARIANT_TYPE_STRING_ARRAY,
-                                                         g_variant_new_strv ((const char* const*)tmparr->pdata, -1),
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+                                   g_param_spec_boxed (KEY_PATTERN_TO_IGNORE,
+                                                       "Pattern to ignore",
+                                                       "Pattern of file name to skip when extracting files",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_STATIC_NAME |
+                                                       G_PARAM_STATIC_NICK |
+                                                       G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class, PROP_DELETE_IF_SUCCEED,
                                    g_param_spec_boolean (KEY_DELETE_IF_SUCCEED,
@@ -377,7 +356,6 @@ autoar_pref_class_init (AutoarPrefClass *klass)
                                                          G_PARAM_STATIC_NAME |
                                                          G_PARAM_STATIC_NICK |
                                                          G_PARAM_STATIC_BLURB));
-  g_ptr_array_unref (tmparr);
 }
 
 static void
diff --git a/tests/test-create.c b/tests/test-create.c
index a96bb24..391f15e 100644
--- a/tests/test-create.c
+++ b/tests/test-create.c
@@ -51,7 +51,7 @@ main (int argc,
   AutoarPref *arpref;
 
   if (argc < 5) {
-    g_printerr ("Usage: %s format filter output_dir source ...", argv[0]);
+    g_printerr ("Usage: %s format filter output_dir source ...\n", argv[0]);
     return 255;
   }