Merge lp:~3v1n0/libdbusmenu/custom-stock-item-label into lp:libdbusmenu/15.04

Proposed by Marco Trevisan (Treviño) on 2015-04-09
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2015-04-10
Approved revision: 477
Merged at revision: 476
Proposed branch: lp:~3v1n0/libdbusmenu/custom-stock-item-label
Merge into: lp:libdbusmenu/15.04
Prerequisite: lp:~laney/libdbusmenu/libtool-and-gi
Diff against target: 95 lines (+15/-11)
4 files modified
INSTALL (+12/-7)
libdbusmenu-gtk/parser.c (+1/-1)
tests/Makefile.am (+1/-1)
tests/test-json-server.c (+1/-2)
To merge this branch: bzr merge lp:~3v1n0/libdbusmenu/custom-stock-item-label
Reviewer Review Type Date Requested Status
Timo Jyrinki 2015-04-09 Approve on 2015-04-10
PS Jenkins bot (community) continuous-integration 2015-04-09 Approve on 2015-04-09
Lars Karlitski 2015-04-09 Pending
Review via email: mp+255709@code.launchpad.net

This proposal supersedes a proposal from 2015-03-04.

Commit message

Parser: don't override the label for stock items if a custom one is provided

Description of the change

Parser: don't override the label for stock items if a custom one is provided

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Lars Karlitski (larsu) wrote : Posted in a previous version of this proposal

Hm, I think apps just shouldn't use stock items. They're deprecated in gtk and it's very easy to work around by setting the icon manually.

I don't mind about this patch though :)

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal

Yeah... The whole libdbusmenu is somewhat deprecated :)

Timo Jyrinki (timo-jyrinki) wrote : Posted in a previous version of this proposal

This was canceled in CI Train with "Cleaning, tests are failing on gtk2 for vivid." so I think the MP status should reflect it until decided otherwise.

Timo Jyrinki (timo-jyrinki) : Posted in a previous version of this proposal
review: Disapprove
Timo Jyrinki (timo-jyrinki) wrote :

Just to counter my previous Disapprove, but note you need a landing line for this in https://wiki.ubuntu.com/citrain/ or the current line 30 renewed by tedg :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2010-06-09 16:24:31 +0000
3+++ INSTALL 2015-04-09 16:45:00 +0000
4@@ -1,8 +1,8 @@
5 Installation Instructions
6 *************************
7
8-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
9-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
11+Inc.
12
13 Copying and distribution of this file, with or without modification,
14 are permitted in any medium without royalty provided the copyright
15@@ -12,8 +12,8 @@
16 Basic Installation
17 ==================
18
19- Briefly, the shell commands `./configure; make; make install' should
20-configure, build, and install this package. The following
21+ Briefly, the shell command `./configure && make && make install'
22+should configure, build, and install this package. The following
23 more-detailed instructions are generic; see the `README' file for
24 instructions specific to this package. Some packages provide this
25 `INSTALL' file but do not implement all of the features documented
26@@ -226,6 +226,11 @@
27
28 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
29
30+ HP-UX `make' updates targets which have the same time stamps as
31+their prerequisites, which makes it generally unusable when shipped
32+generated files such as `configure' are involved. Use GNU `make'
33+instead.
34+
35 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
36 parse its `<wchar.h>' header file. The option `-nodtk' can be used as
37 a workaround. If GNU CC is not installed, it is therefore recommended
38@@ -304,9 +309,10 @@
39 overridden in the site shell script).
40
41 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
42-an Autoconf bug. Until the bug is fixed you can use this workaround:
43+an Autoconf limitation. Until the limitation is lifted, you can use
44+this workaround:
45
46- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
47+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
48
49 `configure' Invocation
50 ======================
51@@ -362,4 +368,3 @@
52
53 `configure' also accepts some other, not widely useful, options. Run
54 `configure --help' for more details.
55-
56
57=== modified file 'libdbusmenu-gtk/parser.c'
58--- libdbusmenu-gtk/parser.c 2014-06-06 23:37:51 +0000
59+++ libdbusmenu-gtk/parser.c 2015-04-09 16:45:00 +0000
60@@ -886,7 +886,7 @@
61 const gchar * label = NULL;
62 label = dbusmenu_menuitem_property_get (menuitem,
63 DBUSMENU_MENUITEM_PROP_LABEL);
64- if (stock.label != NULL && label != NULL) {
65+ if (stock.label != NULL && label != NULL && label[0] == '\0') {
66 dbusmenu_menuitem_property_set (menuitem,
67 DBUSMENU_MENUITEM_PROP_LABEL,
68 stock.label);
69
70=== modified file 'tests/Makefile.am'
71--- tests/Makefile.am 2015-04-09 16:45:00 +0000
72+++ tests/Makefile.am 2015-04-09 16:45:00 +0000
73@@ -249,7 +249,7 @@
74 @echo export G_DEBUG=fatal_criticals >> $@
75 @echo export G_MESSAGES_DEBUG=all >> $@
76 @echo $(XVFB_RUN) >> $@
77- @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task "$(abs_top_builddir)/libtool" --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
78+ @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
79 @chmod +x $@
80
81 EXTRA_DIST += \
82
83=== modified file 'tests/test-json-server.c'
84--- tests/test-json-server.c 2013-01-21 16:04:47 +0000
85+++ tests/test-json-server.c 2015-04-09 16:45:00 +0000
86@@ -36,8 +36,7 @@
87 g_debug("Dumping callgrind data");
88 CALLGRIND_DUMP_STATS_AT("exported");
89 CALLGRIND_STOP_INSTRUMENTATION;
90- g_main_loop_quit(mainloop);
91- return;
92+ g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop);
93 }
94
95 static void

Subscribers

People subscribed via source and target branches