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

Proposed by Iain Lane on 2012-06-11
Status: Merged
Merged at revision: 120
Proposed branch: lp:~laney/gnome-menus/add-forgotten-symbol
Merge into: lp:~ubuntu-desktop/gnome-menus/ubuntu
Diff against target: 92 lines (+61/-0)
4 files modified
debian/changelog (+7/-0)
debian/libgnome-menu-3-0.symbols (+1/-0)
debian/patches/forgotten-gmenu-separator-api (+52/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~laney/gnome-menus/add-forgotten-symbol
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2012-06-11 Pending
Ubuntu Sponsors Team 2012-06-11 Pending
Review via email: mp+109675@code.launchpad.net

Description of the change

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

To post a comment you must log in.
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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-06 02:20:46 +0000
3+++ debian/changelog 2012-06-11 16:07:19 +0000
4@@ -1,3 +1,10 @@
5+gnome-menus (3.5.2-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Take patch from upstream bug #677344 to add a forgotten API
8+ gmenu_tree_iter_get_separator. Unbreaks alacarte. (LP: #1010800)
9+
10+ -- Iain Lane <iain.lane@canonical.com> Mon, 11 Jun 2012 16:17:52 +0100
11+
12 gnome-menus (3.5.2-0ubuntu1) quantal-proposed; urgency=low
13
14 * New upstream release
15
16=== modified file 'debian/libgnome-menu-3-0.symbols'
17--- debian/libgnome-menu-3-0.symbols 2012-06-06 02:20:46 +0000
18+++ debian/libgnome-menu-3-0.symbols 2012-06-11 16:07:19 +0000
19@@ -36,6 +36,7 @@
20 gmenu_tree_iter_get_directory@Base 3.2.0.1
21 gmenu_tree_iter_get_entry@Base 3.2.0.1
22 gmenu_tree_iter_get_header@Base 3.2.0.1
23+ gmenu_tree_iter_get_separator@Base 3.5.2-0ubuntu2~
24 gmenu_tree_iter_get_type@Base 3.2.0.1
25 gmenu_tree_iter_next@Base 3.2.0.1
26 gmenu_tree_iter_ref@Base 3.2.0.1
27
28=== added file 'debian/patches/forgotten-gmenu-separator-api'
29--- debian/patches/forgotten-gmenu-separator-api 1970-01-01 00:00:00 +0000
30+++ debian/patches/forgotten-gmenu-separator-api 2012-06-11 16:07:19 +0000
31@@ -0,0 +1,52 @@
32+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
33+Date: Sat, 2 Jun 2012 13:27:24 -0400
34+Subject: [PATCH] libmenu: Add the forgotten gmenu_tree_iter_get_separator
35+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=677344
36+
37+---
38+ libmenu/gmenu-tree.c | 19 +++++++++++++++++++
39+ libmenu/gmenu-tree.h | 1 +
40+ 2 files changed, 20 insertions(+)
41+
42+Index: gnome-menus-3.5.2/libmenu/gmenu-tree.c
43+===================================================================
44+--- gnome-menus-3.5.2.orig/libmenu/gmenu-tree.c 2012-05-25 19:34:25.000000000 +0100
45++++ gnome-menus-3.5.2/libmenu/gmenu-tree.c 2012-06-11 16:17:18.004596713 +0100
46+@@ -1039,6 +1039,25 @@
47+ return (GMenuTreeAlias*)gmenu_tree_item_ref (iter->item);
48+ }
49+
50++/**
51++ * gmenu_tree_iter_get_separator:
52++ * @iter: iter
53++ *
54++ * This method may only be called if gmenu_tree_iter_next()
55++ * returned #GMENU_TREE_ITEM_SEPARATOR.
56++ *
57++ * Returns: (transfer full): A separator
58++ */
59++GMenuTreeSeparator *
60++gmenu_tree_iter_get_separator (GMenuTreeIter *iter)
61++{
62++ g_return_val_if_fail (iter != NULL, NULL);
63++ g_return_val_if_fail (iter->item != NULL, NULL);
64++ g_return_val_if_fail (iter->item->type == GMENU_TREE_ITEM_SEPARATOR, NULL);
65++
66++ return (GMenuTreeSeparator*)gmenu_tree_item_ref (iter->item);
67++}
68++
69+ const char *
70+ gmenu_tree_directory_get_name (GMenuTreeDirectory *directory)
71+ {
72+Index: gnome-menus-3.5.2/libmenu/gmenu-tree.h
73+===================================================================
74+--- gnome-menus-3.5.2.orig/libmenu/gmenu-tree.h 2012-05-25 19:34:25.000000000 +0100
75++++ gnome-menus-3.5.2/libmenu/gmenu-tree.h 2012-06-11 16:17:18.004596713 +0100
76+@@ -125,6 +125,7 @@
77+ GMenuTreeEntry *gmenu_tree_iter_get_entry (GMenuTreeIter *iter);
78+ GMenuTreeHeader *gmenu_tree_iter_get_header (GMenuTreeIter *iter);
79+ GMenuTreeAlias *gmenu_tree_iter_get_alias (GMenuTreeIter *iter);
80++GMenuTreeSeparator *gmenu_tree_iter_get_separator (GMenuTreeIter *iter);
81+
82+ char *gmenu_tree_directory_make_path (GMenuTreeDirectory *directory,
83+ GMenuTreeEntry *entry);
84
85=== modified file 'debian/patches/series'
86--- debian/patches/series 2012-02-29 21:34:18 +0000
87+++ debian/patches/series 2012-06-11 16:07:19 +0000
88@@ -10,3 +10,4 @@
89 21_default-python-in-shebang.patch
90 22_directory-suffix-for-icons.patch
91 70_ubuntu-directories.patch
92+forgotten-gmenu-separator-api

Subscribers

People subscribed via source and target branches

to all changes: