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) on 2015-03-04
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 continuous-integration Approve on 2015-04-09
Timo Jyrinki 2015-03-04 Disapprove on 2015-04-09
Lars Karlitski (community) Approve on 2015-03-05
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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
Marco Trevisan (Treviño) (3v1n0) wrote :

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

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.

Timo Jyrinki (timo-jyrinki) :
review: Disapprove
lp:~3v1n0/libdbusmenu/custom-stock-item-label updated on 2015-04-09
475. By Marco Trevisan (Treviño) on 2015-04-09

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

476. By Marco Trevisan (Treviño) on 2015-04-09

test-json-server: add a timeout before quitting

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~3v1n0/libdbusmenu/custom-stock-item-label updated on 2015-04-09
477. By Marco Trevisan (Treviño) on 2015-04-09

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
1=== modified file 'INSTALL'
2--- INSTALL 2010-06-09 16:24:31 +0000
3+++ INSTALL 2015-04-09 16:44:48 +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 'debian/control'
58--- debian/control 2013-12-18 23:16:03 +0000
59+++ debian/control 2015-04-09 16:44:48 +0000
60@@ -20,7 +20,7 @@
61 libdbus-glib-1-dev,
62 libatk1.0-dev,
63 libjson-glib-dev (>= 0.13.4),
64- gobject-introspection,
65+ gobject-introspection (>= 1.41.4-1~),
66 libgirepository1.0-dev (>= 0.9.3),
67 libx11-dev (>= 1.3),
68 valac (>= 0.16),
69@@ -114,6 +114,7 @@
70 Package: gir1.2-dbusmenu-glib-0.4
71 Section: introspection
72 Architecture: any
73+Multi-Arch: same
74 Depends: ${misc:Depends},
75 libdbusmenu-glib4 (= ${binary:Version}),
76 ${gir:Depends},
77@@ -128,6 +129,7 @@
78 Package: gir1.2-dbusmenu-gtk-0.4
79 Section: introspection
80 Architecture: any
81+Multi-Arch: same
82 Depends: ${misc:Depends},
83 libdbusmenu-gtk4 (= ${binary:Version}),
84 ${gir:Depends},
85@@ -229,6 +231,7 @@
86 Package: gir1.2-dbusmenu-gtk3-0.4
87 Section: introspection
88 Architecture: any
89+Multi-Arch: same
90 Depends: ${misc:Depends},
91 libdbusmenu-gtk3-4 (= ${binary:Version}),
92 ${gir:Depends},
93
94=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
95--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-10-28 13:25:56 +0000
96+++ debian/gir1.2-dbusmenu-glib-0.4.install 2015-04-09 16:44:48 +0000
97@@ -1,1 +1,1 @@
98-usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
99+usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib
100
101=== modified file 'debian/gir1.2-dbusmenu-gtk-0.4.install'
102--- debian/gir1.2-dbusmenu-gtk-0.4.install 2011-10-28 13:25:56 +0000
103+++ debian/gir1.2-dbusmenu-gtk-0.4.install 2015-04-09 16:44:48 +0000
104@@ -1,1 +1,1 @@
105-usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
106+usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib
107
108=== modified file 'debian/gir1.2-dbusmenu-gtk3-0.4.install'
109--- debian/gir1.2-dbusmenu-gtk3-0.4.install 2011-10-28 13:25:56 +0000
110+++ debian/gir1.2-dbusmenu-gtk3-0.4.install 2015-04-09 16:44:48 +0000
111@@ -1,1 +1,1 @@
112-usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
113+usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib
114
115=== modified file 'libdbusmenu-glib/Makefile.am'
116--- libdbusmenu-glib/Makefile.am 2013-06-20 16:30:45 +0000
117+++ libdbusmenu-glib/Makefile.am 2015-04-09 16:44:48 +0000
118@@ -198,7 +198,7 @@
119 girdir = $(datadir)/gir-1.0
120 gir_DATA = $(INTROSPECTION_GIRS)
121
122-typelibdir = $(libdir)/girepository-1.0
123+typelibdir = $(INTROSPECTION_TYPELIBDIR)
124 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
125
126 CLEANFILES += $(gir_DATA) $(typelib_DATA)
127
128=== modified file 'libdbusmenu-gtk/Makefile.am'
129--- libdbusmenu-gtk/Makefile.am 2013-06-20 16:30:45 +0000
130+++ libdbusmenu-gtk/Makefile.am 2015-04-09 16:44:48 +0000
131@@ -142,7 +142,7 @@
132 girdir = $(datadir)/gir-1.0
133 gir_DATA = $(INTROSPECTION_GIRS)
134
135-typelibdir = $(libdir)/girepository-1.0
136+typelibdir = $(INTROSPECTION_TYPELIBDIR)
137 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
138
139 CLEANFILES += $(gir_DATA) $(typelib_DATA)
140
141=== modified file 'libdbusmenu-gtk/parser.c'
142--- libdbusmenu-gtk/parser.c 2014-06-06 23:37:51 +0000
143+++ libdbusmenu-gtk/parser.c 2015-04-09 16:44:48 +0000
144@@ -886,7 +886,7 @@
145 const gchar * label = NULL;
146 label = dbusmenu_menuitem_property_get (menuitem,
147 DBUSMENU_MENUITEM_PROP_LABEL);
148- if (stock.label != NULL && label != NULL) {
149+ if (stock.label != NULL && label != NULL && label[0] == '\0') {
150 dbusmenu_menuitem_property_set (menuitem,
151 DBUSMENU_MENUITEM_PROP_LABEL,
152 stock.label);
153
154=== modified file 'tests/Makefile.am'
155--- tests/Makefile.am 2014-03-18 18:27:18 +0000
156+++ tests/Makefile.am 2015-04-09 16:44:48 +0000
157@@ -249,7 +249,7 @@
158 @echo export G_DEBUG=fatal_criticals >> $@
159 @echo export G_MESSAGES_DEBUG=all >> $@
160 @echo $(XVFB_RUN) >> $@
161- @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 >> $@
162+ @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 >> $@
163 @chmod +x $@
164
165 EXTRA_DIST += \
166
167=== modified file 'tests/test-json-server.c'
168--- tests/test-json-server.c 2013-01-21 16:04:47 +0000
169+++ tests/test-json-server.c 2015-04-09 16:44:48 +0000
170@@ -36,8 +36,7 @@
171 g_debug("Dumping callgrind data");
172 CALLGRIND_DUMP_STATS_AT("exported");
173 CALLGRIND_STOP_INSTRUMENTATION;
174- g_main_loop_quit(mainloop);
175- return;
176+ g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop);
177 }
178
179 static void

Subscribers

People subscribed via source and target branches