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

Approved by: Timo Jyrinki, PS Jenkins bot

4 files changed, 15 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index 7d1c323..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index cc83e18..d23fb75 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -886,7 +886,7 @@ update_icon (DbusmenuMenuitem *menuitem, ParserData * pdata, GtkImage *image)
         const gchar * label = NULL;
         label = dbusmenu_menuitem_property_get (menuitem,
                                                 DBUSMENU_MENUITEM_PROP_LABEL);
-        if (stock.label != NULL && label != NULL) {
+        if (stock.label != NULL && label != NULL && label[0] == '\0') {
           dbusmenu_menuitem_property_set (menuitem,
                                           DBUSMENU_MENUITEM_PROP_LABEL,
                                           stock.label);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 06191b1..9e3e472 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -249,7 +249,7 @@ test-json-instruction: test-json-client test-json-server test-json-instruction-c
 	@echo export G_DEBUG=fatal_criticals >> $@
 	@echo export G_MESSAGES_DEBUG=all >> $@
 	@echo $(XVFB_RUN) >> $@
-	@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 >> $@
+	@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 >> $@
 	@chmod +x $@
 
 EXTRA_DIST += \
diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index 9a2dd8e..2603070 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -36,8 +36,7 @@ root_activate (void)
 	g_debug("Dumping callgrind data");
 	CALLGRIND_DUMP_STATS_AT("exported");
 	CALLGRIND_STOP_INSTRUMENTATION;
-	g_main_loop_quit(mainloop);
-	return;
+	g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop);
 }
 
 static void