r35409 - in /desktop/unstable/gnome-menus/debian: changelog patches/60_missing_unction.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 23 17:02:52 2012
New Revision: 35409

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35409
Log:
60_missing_unction.patch: backported from upstream git. Add a 
missing function in the library. Closes: #676566.

Added:
    desktop/unstable/gnome-menus/debian/patches/60_missing_unction.patch
Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/series

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=35409&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Sat Jun 23 17:02:52 2012
@@ -1,8 +1,10 @@
-gnome-menus (3.4.2-2) UNRELEASED; urgency=low
+gnome-menus (3.4.2-2) unstable; urgency=low
 
   * Blacklist imagemagick. Closes: #678406.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 22 Jun 2012 20:28:10 +0200
+  * 60_missing_unction.patch: backported from upstream git. Add a 
+    missing function in the library. Closes: #676566.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 23 Jun 2012 19:02:38 +0200
 
 gnome-menus (3.4.2-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-menus/debian/patches/60_missing_unction.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/60_missing_unction.patch?rev=35409&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/60_missing_unction.patch (added)
+++ desktop/unstable/gnome-menus/debian/patches/60_missing_unction.patch [utf-8] Sat Jun 23 17:02:52 2012
@@ -1,0 +1,51 @@
+From 8cd6efdf03a7056ed4c7373e00a2eb7657e5c6cc Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Sat, 02 Jun 2012 17:27:24 +0000
+Subject: libmenu: Add the forgotten gmenu_tree_iter_get_separator
+
+https://bugzilla.gnome.org/show_bug.cgi?id=677344
+---
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index 23cd353..1c46c8e 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -1039,6 +1039,25 @@ gmenu_tree_iter_get_alias (GMenuTreeIter *iter)
+   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)
+ {
+diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
+index 95f9be8..3b3a12d 100644
+--- a/libmenu/gmenu-tree.h
++++ b/libmenu/gmenu-tree.h
+@@ -125,6 +125,7 @@ GMenuTreeDirectory *gmenu_tree_iter_get_directory        (GMenuTreeIter *iter);
+ 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);
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/series?rev=35409&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/series [utf-8] Sat Jun 23 17:02:52 2012
@@ -7,3 +7,4 @@
 #20_show-admin-tools-for-admin-group.patch
 11_science-menu.patch
 21_default-python-in-shebang.patch
+60_missing_unction.patch