[gtk+/action-helper] gtkmodelmenu: don't use & in get_item_attribute calls
- From: Lars Uebernickel <larsu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/action-helper] gtkmodelmenu: don't use & in get_item_attribute calls
- Date: Mon, 20 Aug 2012 15:42:39 +0000 (UTC)
commit 7f2348a85849b352029c78d4aa64280766ebe849
Author: Lars Uebernickel <lars uebernickel canonical com>
Date: Mon Aug 20 17:36:46 2012 +0200
gtkmodelmenu: don't use & in get_item_attribute calls
gtk/gtkmodelmenu.c | 3 ++-
gtk/gtkmodelmenuitem.c | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkmodelmenu.c b/gtk/gtkmodelmenu.c
index ab9bbb4..dccf72a 100644
--- a/gtk/gtkmodelmenu.c
+++ b/gtk/gtkmodelmenu.c
@@ -87,7 +87,7 @@ gtk_model_menu_binding_append_item (GtkModelMenuBinding *binding,
const gchar *section_namespace = NULL;
g_menu_model_get_item_attribute (model, item_index, "label", "s", heading);
- g_menu_model_get_item_attribute (model, item_index, "action-namespace", "&s", §ion_namespace);
+ g_menu_model_get_item_attribute (model, item_index, "action-namespace", "s", §ion_namespace);
if (action_namespace)
{
@@ -100,6 +100,7 @@ gtk_model_menu_binding_append_item (GtkModelMenuBinding *binding,
gtk_model_menu_binding_append_model (binding, section, section_namespace, FALSE);
}
+ g_free (section_namespace);
g_object_unref (section);
}
else
diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index b7338a5..d2c533c 100644
--- a/gtk/gtkmodelmenuitem.c
+++ b/gtk/gtkmodelmenuitem.c
@@ -94,10 +94,10 @@ gtk_model_menu_item_setup (GtkModelMenuItem *item,
if ((submenu = g_menu_model_get_item_link (model, item_index, "submenu")))
{
- const gchar *section_namespace = NULL;
+ gchar *section_namespace = NULL;
GtkWidget *menu;
- g_menu_model_get_item_attribute (model, item_index, "action-namespace", "&s", §ion_namespace);
+ g_menu_model_get_item_attribute (model, item_index, "action-namespace", "s", §ion_namespace);
if (action_namespace)
{
@@ -111,6 +111,8 @@ gtk_model_menu_item_setup (GtkModelMenuItem *item,
}
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
+
+ g_free (section_namespace);
g_object_unref (submenu);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]