[Xfce4-commits] <garcon:master> Implement remaining properties and fix some ref issues.

[Nick Schermer]

Updating branch refs/heads/master
         to e3155d694770f29d838286423c36942f29c0280b (commit)
       from 36051c8fbc53e9f937b007928314676eac1ff94a (commit)

commit e3155d694770f29d838286423c36942f29c0280b
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Aug 16 12:51:53 2009 +0200

    Implement remaining properties and fix some ref issues.

 garcon/garcon-menu-item.c   |   22 ++++++++++++++++++++++
 garcon/garcon-menu-merger.c |    4 +++-
 garcon/garcon-menu-node.c   |    3 ++-
 garcon/garcon-menu-parser.c |    2 ++
 garcon/garcon-menu.c        |    4 +++-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index e309f72..252a1c0 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -417,13 +417,35 @@ garcon_menu_item_get_property (GObject    *object,
       break;
 
     case PROP_REQUIRES_TERMINAL:
+      g_value_set_boolean (value, garcon_menu_item_requires_terminal (item));
+      break;
+
     case PROP_NO_DISPLAY:
+      g_value_set_boolean (value, garcon_menu_item_get_no_display (item));
+      break;
+
     case PROP_STARTUP_NOTIFICATION:
+      g_value_set_boolean (value, garcon_menu_item_supports_startup_notification (item));
+      break;
+
     case PROP_NAME:
+      g_value_set_string (value, garcon_menu_item_get_name (item));
+      break;
+
     case PROP_GENERIC_NAME:
+      g_value_set_string (value, garcon_menu_item_get_generic_name (item));
+      break;
+
     case PROP_COMMAND:
+      g_value_set_string (value, garcon_menu_item_get_command (item));
+      break;
+
     case PROP_ICON_NAME:
+      g_value_set_string (value, garcon_menu_item_get_icon_name (item));
+      break;
+
     case PROP_TRY_EXEC:
+      g_value_set_string (value, garcon_menu_item_get_try_exec (item));
       break;
 
     case PROP_PATH:
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index a50d551..8b5c82d 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -189,8 +189,9 @@ garcon_menu_merger_get_property (GObject    *object,
   switch (prop_id)
     {
     case PROP_TREE_PROVIDER:
-      g_value_set_object (value, g_object_ref (merger->priv->tree_provider));
+      g_value_set_object (value, merger->priv->tree_provider);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -212,6 +213,7 @@ garcon_menu_merger_set_property (GObject      *object,
     case PROP_TREE_PROVIDER:
       merger->priv->tree_provider = g_object_ref (g_value_get_object (value));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/garcon/garcon-menu-node.c b/garcon/garcon-menu-node.c
index d232b18..c537027 100644
--- a/garcon/garcon-menu-node.c
+++ b/garcon/garcon-menu-node.c
@@ -188,6 +188,7 @@ garcon_menu_node_get_property (GObject    *object,
     case PROP_NODE_TYPE:
       g_value_set_enum (value, node->node_type);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -210,7 +211,7 @@ garcon_menu_node_set_property (GObject      *object,
       node->node_type = g_value_get_enum (value);
       g_object_notify (G_OBJECT (node), "node-type");
       break;
-      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/garcon/garcon-menu-parser.c b/garcon/garcon-menu-parser.c
index 595ea95..7c9cb98 100644
--- a/garcon/garcon-menu-parser.c
+++ b/garcon/garcon-menu-parser.c
@@ -208,6 +208,7 @@ garcon_menu_parser_get_property (GObject    *object,
     case PROP_FILE:
       g_value_set_object (value, parser->priv->file);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -229,6 +230,7 @@ garcon_menu_parser_set_property (GObject      *object,
     case PROP_FILE:
       parser->priv->file = g_object_ref (g_value_get_object (value));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index c95596e..93dee3b 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -292,7 +292,7 @@ garcon_menu_get_property (GObject    *object,
   switch (prop_id)
     {
     case PROP_FILE:
-      g_value_set_object (value, garcon_menu_get_file (menu));
+      g_value_set_object (value, menu->priv->file);
       break;
 
     case PROP_DIRECTORY:
@@ -446,6 +446,8 @@ garcon_menu_new_applications (void)
  *
  * Returns the #GFile of @menu. It refers to the .menu file from which 
  * @menu was or will be loaded.
+ * The caller is responsible to free the returned object using
+ * g_object_unref() when no longer needed.
  * 
  * Return value: the @GFile of @menu.
  */