DBus Menu

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

  1. custom-stock-item-label
  2. Merge into trunk.15.04
Proposed by Marco Trevisan (Treviño)
Status: Superseded
Proposed branch: lp:~3v1n0/libdbusmenu/custom-stock-item-label
Merge into: lp:libdbusmenu/15.04
Diff against target: 179 lines (+24/-17)
10 files modified
INSTALL (+12/-7)
debian/control (+4/-1)
debian/gir1.2-dbusmenu-glib-0.4.install (+1/-1)
debian/gir1.2-dbusmenu-gtk-0.4.install (+1/-1)
debian/gir1.2-dbusmenu-gtk3-0.4.install (+1/-1)
libdbusmenu-glib/Makefile.am (+1/-1)
libdbusmenu-gtk/Makefile.am (+1/-1)
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
PS Jenkins bot (community) continuous-integration Approve
Timo Jyrinki Disapprove
Lars Karlitski (community) Approve
Review via email: mp+251840@code.launchpad.net

This proposal has been superseded by a proposal from 2015-04-09.

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/26/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

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
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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.

Revision history for this message
Timo Jyrinki (timo-jyrinki) :
review: Disapprove
lp:~3v1n0/libdbusmenu/custom-stock-item-label updated
475. By Marco Trevisan (Treviño)

Tests: test-json-instruction, don't use libtool for running tasks

476. By Marco Trevisan (Treviño)

test-json-server: add a timeout before quitting

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/27/rebuild

review: Approve (continuous-integration)
lp:~3v1n0/libdbusmenu/custom-stock-item-label updated
477. By Marco Trevisan (Treviño)

Merging with lp:~laney/libdbusmenu/libtool-and-gi

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'INSTALL'
--- INSTALL 2010-06-09 16:24:31 +0000
+++ INSTALL 2015-04-09 16:44:48 +0000
@@ -1,8 +1,8 @@
1Installation Instructions1Installation Instructions
2*************************2*************************
33
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,4Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
52006, 2007, 2008, 2009 Free Software Foundation, Inc.5Inc.
66
7 Copying and distribution of this file, with or without modification,7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright8are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@
12Basic Installation12Basic Installation
13==================13==================
1414
15 Briefly, the shell commands `./configure; make; make install' should15 Briefly, the shell command `./configure && make && make install'
16configure, build, and install this package. The following16should configure, build, and install this package. The following
17more-detailed instructions are generic; see the `README' file for17more-detailed instructions are generic; see the `README' file for
18instructions specific to this package. Some packages provide this18instructions specific to this package. Some packages provide this
19`INSTALL' file but do not implement all of the features documented19`INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@
226226
227and if that doesn't work, install pre-built binaries of GCC for HP-UX.227and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228228
229 HP-UX `make' updates targets which have the same time stamps as
230their prerequisites, which makes it generally unusable when shipped
231generated files such as `configure' are involved. Use GNU `make'
232instead.
233
229 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot234 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
230parse its `<wchar.h>' header file. The option `-nodtk' can be used as235parse its `<wchar.h>' header file. The option `-nodtk' can be used as
231a workaround. If GNU CC is not installed, it is therefore recommended236a workaround. If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
304overridden in the site shell script).309overridden in the site shell script).
305310
306Unfortunately, this technique does not work for `CONFIG_SHELL' due to311Unfortunately, this technique does not work for `CONFIG_SHELL' due to
307an Autoconf bug. Until the bug is fixed you can use this workaround:312an Autoconf limitation. Until the limitation is lifted, you can use
313this workaround:
308314
309 CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash315 CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
310316
311`configure' Invocation317`configure' Invocation
312======================318======================
@@ -362,4 +368,3 @@
362368
363`configure' also accepts some other, not widely useful, options. Run369`configure' also accepts some other, not widely useful, options. Run
364`configure --help' for more details.370`configure --help' for more details.
365
366371
=== modified file 'debian/control'
--- debian/control 2013-12-18 23:16:03 +0000
+++ debian/control 2015-04-09 16:44:48 +0000
@@ -20,7 +20,7 @@
20 libdbus-glib-1-dev,20 libdbus-glib-1-dev,
21 libatk1.0-dev,21 libatk1.0-dev,
22 libjson-glib-dev (>= 0.13.4),22 libjson-glib-dev (>= 0.13.4),
23 gobject-introspection,23 gobject-introspection (>= 1.41.4-1~),
24 libgirepository1.0-dev (>= 0.9.3),24 libgirepository1.0-dev (>= 0.9.3),
25 libx11-dev (>= 1.3), 25 libx11-dev (>= 1.3),
26 valac (>= 0.16),26 valac (>= 0.16),
@@ -114,6 +114,7 @@
114Package: gir1.2-dbusmenu-glib-0.4114Package: gir1.2-dbusmenu-glib-0.4
115Section: introspection115Section: introspection
116Architecture: any116Architecture: any
117Multi-Arch: same
117Depends: ${misc:Depends},118Depends: ${misc:Depends},
118 libdbusmenu-glib4 (= ${binary:Version}),119 libdbusmenu-glib4 (= ${binary:Version}),
119 ${gir:Depends},120 ${gir:Depends},
@@ -128,6 +129,7 @@
128Package: gir1.2-dbusmenu-gtk-0.4129Package: gir1.2-dbusmenu-gtk-0.4
129Section: introspection130Section: introspection
130Architecture: any131Architecture: any
132Multi-Arch: same
131Depends: ${misc:Depends},133Depends: ${misc:Depends},
132 libdbusmenu-gtk4 (= ${binary:Version}),134 libdbusmenu-gtk4 (= ${binary:Version}),
133 ${gir:Depends},135 ${gir:Depends},
@@ -229,6 +231,7 @@
229Package: gir1.2-dbusmenu-gtk3-0.4231Package: gir1.2-dbusmenu-gtk3-0.4
230Section: introspection232Section: introspection
231Architecture: any233Architecture: any
234Multi-Arch: same
232Depends: ${misc:Depends},235Depends: ${misc:Depends},
233 libdbusmenu-gtk3-4 (= ${binary:Version}),236 libdbusmenu-gtk3-4 (= ${binary:Version}),
234 ${gir:Depends},237 ${gir:Depends},
235238
=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-glib-0.4.install 2015-04-09 16:44:48 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib
22
=== modified file 'debian/gir1.2-dbusmenu-gtk-0.4.install'
--- debian/gir1.2-dbusmenu-gtk-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-gtk-0.4.install 2015-04-09 16:44:48 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib
22
=== modified file 'debian/gir1.2-dbusmenu-gtk3-0.4.install'
--- debian/gir1.2-dbusmenu-gtk3-0.4.install 2011-10-28 13:25:56 +0000
+++ debian/gir1.2-dbusmenu-gtk3-0.4.install 2015-04-09 16:44:48 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/1usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib
22
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2013-06-20 16:30:45 +0000
+++ libdbusmenu-glib/Makefile.am 2015-04-09 16:44:48 +0000
@@ -198,7 +198,7 @@
198girdir = $(datadir)/gir-1.0198girdir = $(datadir)/gir-1.0
199gir_DATA = $(INTROSPECTION_GIRS)199gir_DATA = $(INTROSPECTION_GIRS)
200200
201typelibdir = $(libdir)/girepository-1.0201typelibdir = $(INTROSPECTION_TYPELIBDIR)
202typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)202typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
203203
204CLEANFILES += $(gir_DATA) $(typelib_DATA)204CLEANFILES += $(gir_DATA) $(typelib_DATA)
205205
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2013-06-20 16:30:45 +0000
+++ libdbusmenu-gtk/Makefile.am 2015-04-09 16:44:48 +0000
@@ -142,7 +142,7 @@
142girdir = $(datadir)/gir-1.0142girdir = $(datadir)/gir-1.0
143gir_DATA = $(INTROSPECTION_GIRS)143gir_DATA = $(INTROSPECTION_GIRS)
144144
145typelibdir = $(libdir)/girepository-1.0145typelibdir = $(INTROSPECTION_TYPELIBDIR)
146typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)146typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
147147
148CLEANFILES += $(gir_DATA) $(typelib_DATA)148CLEANFILES += $(gir_DATA) $(typelib_DATA)
149149
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2014-06-06 23:37:51 +0000
+++ libdbusmenu-gtk/parser.c 2015-04-09 16:44:48 +0000
@@ -886,7 +886,7 @@
886 const gchar * label = NULL;886 const gchar * label = NULL;
887 label = dbusmenu_menuitem_property_get (menuitem,887 label = dbusmenu_menuitem_property_get (menuitem,
888 DBUSMENU_MENUITEM_PROP_LABEL);888 DBUSMENU_MENUITEM_PROP_LABEL);
889 if (stock.label != NULL && label != NULL) {889 if (stock.label != NULL && label != NULL && label[0] == '\0') {
890 dbusmenu_menuitem_property_set (menuitem,890 dbusmenu_menuitem_property_set (menuitem,
891 DBUSMENU_MENUITEM_PROP_LABEL,891 DBUSMENU_MENUITEM_PROP_LABEL,
892 stock.label);892 stock.label);
893893
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2014-03-18 18:27:18 +0000
+++ tests/Makefile.am 2015-04-09 16:44:48 +0000
@@ -249,7 +249,7 @@
249 @echo export G_DEBUG=fatal_criticals >> $@249 @echo export G_DEBUG=fatal_criticals >> $@
250 @echo export G_MESSAGES_DEBUG=all >> $@250 @echo export G_MESSAGES_DEBUG=all >> $@
251 @echo $(XVFB_RUN) >> $@251 @echo $(XVFB_RUN) >> $@
252 @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 libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@252 @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 >> $@
253 @chmod +x $@253 @chmod +x $@
254254
255EXTRA_DIST += \255EXTRA_DIST += \
256256
=== modified file 'tests/test-json-server.c'
--- tests/test-json-server.c 2013-01-21 16:04:47 +0000
+++ tests/test-json-server.c 2015-04-09 16:44:48 +0000
@@ -36,8 +36,7 @@
36 g_debug("Dumping callgrind data");36 g_debug("Dumping callgrind data");
37 CALLGRIND_DUMP_STATS_AT("exported");37 CALLGRIND_DUMP_STATS_AT("exported");
38 CALLGRIND_STOP_INSTRUMENTATION;38 CALLGRIND_STOP_INSTRUMENTATION;
39 g_main_loop_quit(mainloop);39 g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop);
40 return;
41}40}
4241
43static void42static void

Subscribers

People subscribed via source and target branches