From 519e989ea8d33924f5d6f5d57f100e65359275af Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Sat, 20 Apr 2013 16:41:09 -0400
Subject: [PATCH] GIcon: pure re-factor of _from_string()

Split out the 'simple string format' cases of URIs, file paths and
themed icons to a separate function.

This function will be shared by g_icon_deserialize().

https://bugzilla.gnome.org/show_bug.cgi?id=688820
---
 gio/gicon.c | 77 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/gio/gicon.c b/gio/gicon.c
index b75e06778..34a6a2bcb 100644
--- a/gio/gicon.c
+++ b/gio/gicon.c
@@ -381,6 +381,33 @@ ensure_builtin_icon_types (void)
   g_type_ensure (G_TYPE_EMBLEM);
 }
 
+/* handles the 'simple' cases: GFileIcon and GThemedIcon */
+static GIcon *
+g_icon_new_for_string_simple (const gchar *str)
+{
+  gchar *scheme;
+  GIcon *icon;
+
+  if (str[0] == '.')
+    return NULL;
+
+  /* handle special GFileIcon and GThemedIcon cases */
+  scheme = g_uri_parse_scheme (str);
+  if (scheme != NULL || str[0] == '/' || str[0] == G_DIR_SEPARATOR)
+    {
+      GFile *location;
+      location = g_file_new_for_commandline_arg (str);
+      icon = g_file_icon_new (location);
+      g_object_unref (location);
+    }
+  else
+    icon = g_themed_icon_new (str);
+
+  g_free (scheme);
+
+  return icon;
+}
+
 /**
  * g_icon_new_for_string:
  * @str: A string obtained via g_icon_to_string().
@@ -402,48 +429,30 @@ GIcon *
 g_icon_new_for_string (const gchar   *str,
                        GError       **error)
 {
-  GIcon *icon;
+  GIcon *icon = NULL;
 
   g_return_val_if_fail (str != NULL, NULL);
 
+  icon = g_icon_new_for_string_simple (str);
+  if (icon)
+    return icon;
+
   ensure_builtin_icon_types ();
 
-  icon = NULL;
-
-  if (*str == '.')
+  if (g_str_has_prefix (str, G_ICON_SERIALIZATION_MAGIC0))
     {
-      if (g_str_has_prefix (str, G_ICON_SERIALIZATION_MAGIC0))
-	{
-	  gchar **tokens;
-	  
-	  /* handle tokenized encoding */
-	  tokens = g_strsplit (str + sizeof (G_ICON_SERIALIZATION_MAGIC0) - 1, " ", 0);
-	  icon = g_icon_new_from_tokens (tokens, error);
-	  g_strfreev (tokens);
-	}
-      else
-	g_set_error_literal (error,
-			     G_IO_ERROR,
-			     G_IO_ERROR_INVALID_ARGUMENT,
-			     _("Can't handle the supplied version of the icon encoding"));
+      gchar **tokens;
+
+      /* handle tokenized encoding */
+      tokens = g_strsplit (str + sizeof (G_ICON_SERIALIZATION_MAGIC0) - 1, " ", 0);
+      icon = g_icon_new_from_tokens (tokens, error);
+      g_strfreev (tokens);
     }
   else
-    {
-      gchar *scheme;
-
-      /* handle special GFileIcon and GThemedIcon cases */
-      scheme = g_uri_parse_scheme (str);
-      if (scheme != NULL || str[0] == '/' || str[0] == G_DIR_SEPARATOR)
-        {
-          GFile *location;
-          location = g_file_new_for_commandline_arg (str);
-          icon = g_file_icon_new (location);
-          g_object_unref (location);
-        }
-      else
-	icon = g_themed_icon_new (str);
-      g_free (scheme);
-    }
+    g_set_error_literal (error,
+                         G_IO_ERROR,
+                         G_IO_ERROR_INVALID_ARGUMENT,
+                         _("Can't handle the supplied version of the icon encoding"));
 
   return icon;
 }