[Xfce4-commits] <midori:master> Always save KatzeItem::icon as meta data

[Christian Dywan]

Updating branch refs/heads/master
         to af29dcf3043dc23cd8707946a80574850dae4a35 (commit)
       from d522efa23c86e72a1d6f591c4cd84330e4e54b4e (commit)

commit af29dcf3043dc23cd8707946a80574850dae4a35
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun May 9 00:56:03 2010 +0200

    Always save KatzeItem::icon as meta data
    
    This gives us saving of the icon in XML for free.

 katze/katze-item.c |   10 ++++------
 katze/katze-item.h |    1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/katze/katze-item.c b/katze/katze-item.c
index e3962a3..9ea98bd 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -189,7 +189,6 @@ katze_item_finalize (GObject* object)
     g_free (item->name);
     g_free (item->text);
     g_free (item->uri);
-    g_free (item->icon);
     g_free (item->token);
 
     g_hash_table_unref (item->metadata);
@@ -217,7 +216,7 @@ katze_item_set_property (GObject*      object,
         katze_assign (item->uri, g_value_dup_string (value));
         break;
     case PROP_ICON:
-        katze_assign (item->icon, g_value_dup_string (value));
+        katze_item_set_icon (item, g_value_get_string (value));
         break;
     case PROP_TOKEN:
         katze_assign (item->token, g_value_dup_string (value));
@@ -254,7 +253,7 @@ katze_item_get_property (GObject*    object,
         g_value_set_string (value, item->uri);
         break;
     case PROP_ICON:
-        g_value_set_string (value, item->icon);
+        g_value_set_string (value, katze_item_get_icon (item));
         break;
     case PROP_TOKEN:
         g_value_set_string (value, item->token);
@@ -398,7 +397,7 @@ katze_item_get_icon (KatzeItem* item)
 {
     g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
 
-    return item->icon;
+    return katze_item_get_meta_string (item, "icon");
 }
 
 /**
@@ -414,7 +413,7 @@ katze_item_set_icon (KatzeItem*   item,
 {
     g_return_if_fail (KATZE_IS_ITEM (item));
 
-    katze_assign (item->icon, g_strdup (icon));
+    katze_item_set_meta_string (item, "icon", icon);
     g_object_notify (G_OBJECT (item), "icon");
 }
 
@@ -698,7 +697,6 @@ katze_item_copy (KatzeItem* item)
         "name", item->name,
         "text", item->text,
         "uri", item->uri,
-        "icon", item->icon,
         "token", item->token,
         "added", item->added,
         "parent", item->parent,
diff --git a/katze/katze-item.h b/katze/katze-item.h
index 344f501..387a7a2 100644
--- a/katze/katze-item.h
+++ b/katze/katze-item.h
@@ -39,7 +39,6 @@ struct _KatzeItem
     gchar* name;
     gchar* text;
     gchar* uri;
-    gchar* icon;
     gchar* token;
     gint64 added;
     GHashTable* metadata;