Merge lp:~laney/gnome-menus/add-forgotten-symbol into lp:~ubuntu-desktop/gnome-menus/ubuntu

[Iain Lane]

I need this patch to fix bug #1010800, which is an annoying crash in alacarte whenever there is a separator.

[lp:~laney/gnome-menus/add-forgotten-symbol]

120. By Iain Lane on 2012-06-11

Take patch from upstream bug #677344 to add a forgotten API
gmenu_tree_iter_get_separator. Unbreaks alacarte. (LP: #1010800)

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-06 02:20:46 +0000
+++ debian/changelog	2012-06-11 16:07:19 +0000
@@ -1,3 +1,10 @@
+gnome-menus (3.5.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Take patch from upstream bug #677344 to add a forgotten API
+    gmenu_tree_iter_get_separator. Unbreaks alacarte. (LP: #1010800)
+
+ -- Iain Lane <[e-mail]>  Mon, 11 Jun 2012 16:17:52 +0100
+
 gnome-menus (3.5.2-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream release
 
=== modified file 'debian/libgnome-menu-3-0.symbols'
--- debian/libgnome-menu-3-0.symbols	2012-06-06 02:20:46 +0000
+++ debian/libgnome-menu-3-0.symbols	2012-06-11 16:07:19 +0000
@@ -36,6 +36,7 @@
  gmenu_tree_iter_get_directory@Base 3.2.0.1
  gmenu_tree_iter_get_entry@Base 3.2.0.1
  gmenu_tree_iter_get_header@Base 3.2.0.1
+ gmenu_tree_iter_get_separator@Base 3.5.2-0ubuntu2~
  gmenu_tree_iter_get_type@Base 3.2.0.1
  gmenu_tree_iter_next@Base 3.2.0.1
  gmenu_tree_iter_ref@Base 3.2.0.1
 
=== added file 'debian/patches/forgotten-gmenu-separator-api'
--- debian/patches/forgotten-gmenu-separator-api	1970-01-01 00:00:00 +0000
+++ debian/patches/forgotten-gmenu-separator-api	2012-06-11 16:07:19 +0000
@@ -0,0 +1,52 @@
+From: "Jasper St. Pierre" <[e-mail]>
+Date: Sat, 2 Jun 2012 13:27:24 -0400
+Subject: [PATCH] libmenu: Add the forgotten gmenu_tree_iter_get_separator
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=677344
+
+---
+ libmenu/gmenu-tree.c |   19 +++++++++++++++++++
+ libmenu/gmenu-tree.h |    1 +
+ 2 files changed, 20 insertions(+)
+
+Index: gnome-menus-3.5.2/libmenu/gmenu-tree.c
+===================================================================
+--- gnome-menus-3.5.2.orig/libmenu/gmenu-tree.c	2012-05-25 19:34:25.000000000 +0100
++++ gnome-menus-3.5.2/libmenu/gmenu-tree.c	2012-06-11 16:17:18.004596713 +0100
+@@ -1039,6 +1039,25 @@
+   return (GMenuTreeAlias*)gmenu_tree_item_ref (iter->item);
+ }
+ 
++/**
++ * gmenu_tree_iter_get_separator:
++ * @iter: iter
++ *
++ * This method may only be called if gmenu_tree_iter_next()
++ * returned #GMENU_TREE_ITEM_SEPARATOR.
++ *
++ * Returns: (transfer full): A separator
++ */
++GMenuTreeSeparator *
++gmenu_tree_iter_get_separator (GMenuTreeIter *iter)
++{
++  g_return_val_if_fail (iter != NULL, NULL);
++  g_return_val_if_fail (iter->item != NULL, NULL);
++  g_return_val_if_fail (iter->item->type == GMENU_TREE_ITEM_SEPARATOR, NULL);
++
++  return (GMenuTreeSeparator*)gmenu_tree_item_ref (iter->item);
++}
++
+ const char *
+ gmenu_tree_directory_get_name (GMenuTreeDirectory *directory)
+ {
+Index: gnome-menus-3.5.2/libmenu/gmenu-tree.h
+===================================================================
+--- gnome-menus-3.5.2.orig/libmenu/gmenu-tree.h	2012-05-25 19:34:25.000000000 +0100
++++ gnome-menus-3.5.2/libmenu/gmenu-tree.h	2012-06-11 16:17:18.004596713 +0100
+@@ -125,6 +125,7 @@
+ GMenuTreeEntry     *gmenu_tree_iter_get_entry            (GMenuTreeIter *iter);
+ GMenuTreeHeader    *gmenu_tree_iter_get_header           (GMenuTreeIter *iter);
+ GMenuTreeAlias     *gmenu_tree_iter_get_alias            (GMenuTreeIter *iter);
++GMenuTreeSeparator *gmenu_tree_iter_get_separator        (GMenuTreeIter *iter);
+ 
+ char *gmenu_tree_directory_make_path (GMenuTreeDirectory *directory,
+ 				      GMenuTreeEntry     *entry);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-29 21:34:18 +0000
+++ debian/patches/series	2012-06-11 16:07:19 +0000
@@ -10,3 +10,4 @@
 21_default-python-in-shebang.patch
 22_directory-suffix-for-icons.patch
 70_ubuntu-directories.patch
+forgotten-gmenu-separator-api