Merge lp:~azzar1/bamf/bamf-export-actions-menu into lp:bamf

[Andrea Azzarone]

BamfWindow: Export window actions menu using dbusmenu

Export window actions menu using dbusmenu.

[lp:~azzar1/bamf/bamf-export-actions-menu]

634. By Andrea Azzarone on 2016-04-07

Off by default.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:634
http://jenkins.qa.ubuntu.com/job/bamf-ci/128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/9/console

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

review: Needs Fixing (continuous-integration)

[lp:~azzar1/bamf/bamf-export-actions-menu]

635. By Andrea Azzarone on 2016-04-08

Depends on libdbusmenu-gtk3-dev.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:635
http://jenkins.qa.ubuntu.com/job/bamf-ci/129/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/10
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/10/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~azzar1/bamf/bamf-export-actions-menu]

636. By Andrea Azzarone on 2016-04-08

Add safe check for tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/bamf-ci/130/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/11/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~azzar1/bamf/bamf-export-actions-menu]

637. By Andrea Azzarone on 2016-04-08

g_return_if_fail makes tests fail.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/bamf-ci/131/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/12
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/12/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, but as per the changes I posted in hud review, we can get rid of _WNCK_ACTION_MENU_OBJECT_PATH. Plus, move the wnck window calls to bamf-legacy-window class.

Finally In order to get Super+Alt keybinding working as expected, you just need something like this: http://pastebin.ubuntu.com/15701721/

PS: also merge these changes, some cleanup and fixes I've just dicovered: http://pastebin.ubuntu.com/15701745/

[Marco Trevisan (Treviño) (3v1n0)]

Actually, I've worked a little on this, and here's what I meant:
 lp:~3v1n0/bamf/action-menu-tuning

However, this branch per se doesn't change the fact that we allocate all these menus even if not needed.

In order to do that, I've pushed a proposal in lp:~3v1n0/bamf/action-menu-unref-unactive.
Basically we export the menus for the active window and the previously-active window.
This is because the Hud take focus when shown (ouch!), but still this is nice as we reduce the computation when switching between two apps (which is kinda the most used scenario).

Honestly I think that this thing should be done also HUD side by default (to reduce its huge memory usage).

In case you prefer to avoid this, I'd just ensure that we only export these menus when a window is activated (just remove the g_clear_object around and you're all set). But as said, i can't think of negative effect of this.

[lp:~azzar1/bamf/bamf-export-actions-menu]

638. By Andrea Azzarone on 2016-04-12

Merge with lp:~3v1n0/bamf/action-menu-tuning

639. By Andrea Azzarone on 2016-04-12

Merge with lp:~3v1n0/bamf/action-menu-unref-unactive

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:638
http://jenkins.qa.ubuntu.com/job/bamf-ci/133/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/14
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:639
http://jenkins.qa.ubuntu.com/job/bamf-ci/134/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Cool, please merge also with lp:~3v1n0/bamf/action-menus-test-fix as there's a crash in tests due to missing implementation of the get_action_menu function in the mock window.

[lp:~azzar1/bamf/bamf-export-actions-menu]

640. By Andrea Azzarone on 2016-04-12

Merge with lp:~3v1n0/bamf/action-menus-test-fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:640
http://jenkins.qa.ubuntu.com/job/bamf-ci/135/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/16/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

We're all set.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2016-02-29 15:32:52 +0000
+++ configure.ac	2016-04-12 11:14:14 +0000
@@ -72,6 +72,19 @@
 #
 PKG_CHECK_MODULES(X, x11)
 
+#
+# DbusMenu
+#
+AC_ARG_ENABLE([export-actions-menu],
+              AS_HELP_STRING([--enable-export-actions-menu=@<:@no/yes@:>@],[export window actions menus (requires dbusmenu) @<:@default=no@:>@]),,
+              [enable_export_actions_menu=no])
+
+AM_CONDITIONAL([EXPORT_ACTIONS_MENU],[test "x$enable_export_actions_menu" != "xno"])
+
+if test "x$enable_export_actions_menu" = "xyes"; then
+  PKG_CHECK_MODULES(DBUSMENU, [dbusmenu-glib-0.4, dbusmenu-gtk3-0.4])
+fi
+
 ###########################
 # GObject Introspection
 ###########################
@@ -172,9 +185,10 @@
 ${PACKAGE}-${VERSION}
 
   Build Environment
-    Install Prefix:     ${prefix}
-    Introspection:      ${enable_introspection}
-    Headless tests:     ${enable_headless_tests}
-    Coverage Reporting: ${use_gcov}
+    Install Prefix:       ${prefix}
+    Introspection:        ${enable_introspection}
+    Headless tests:       ${enable_headless_tests}
+    Coverage Reporting:   ${use_gcov}
+    Export actions menus: ${enable_export_actions_menu} 
 
 EOF

=== modified file 'debian/control'
--- debian/control	2015-10-28 16:41:10 +0000
+++ debian/control	2016-04-12 11:14:14 +0000
@@ -9,6 +9,7 @@
                gobject-introspection (>= 1.41.4-1~),
                gtk-doc-tools,
                hicolor-icon-theme,
+               libdbusmenu-gtk3-dev,
                libglib2.0-dev (>= 2.32.0),
                libgtop2-dev,
                libgtk-3-dev (>= 3.0.0),

=== modified file 'debian/rules'
--- debian/rules	2014-01-07 19:15:14 +0000
+++ debian/rules	2016-04-12 11:14:14 +0000
@@ -14,7 +14,8 @@
 	dh_auto_configure -- --enable-introspection=yes \
 	                     --enable-gtk-doc \
 	                     --enable-headless-tests \
-	                     --disable-silent-rules
+	                     --disable-silent-rules \
+	                     --enable-export-actions-menu=yes
 
 override_dh_auto_install:
 	dh_auto_install

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2016-01-19 11:13:01 +0000
+++ src/Makefile.am	2016-04-12 11:14:14 +0000
@@ -67,6 +67,12 @@
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
+if EXPORT_ACTIONS_MENU
+bamfdaemon_LDADD += $(DBUSMENU_LIBS)
+bamfdaemon_CFLAGS += $(DBUSMENU_CFLAGS)
+bamfdaemon_CFLAGS += -DEXPORT_ACTIONS_MENU
+endif
+
 bamfdaemon_LDFLAGS = \
 	-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 	$(COVERAGE_LDFLAGS) \

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2014-02-14 01:21:59 +0000
+++ src/bamf-legacy-window-test.c	2016-04-12 11:14:14 +0000
@@ -436,6 +436,12 @@
   return g_strdup (BAMF_LEGACY_WINDOW_TEST (window)->icon);
 }
 
+GtkWidget *
+bamf_legacy_window_test_get_action_menu (BamfLegacyWindow *window)
+{
+  return NULL;
+}
+
 void
 bamf_legacy_window_test_show_action_menu (BamfLegacyWindow *window, guint32 time, guint button, gint x, gint y)
 {}
@@ -492,6 +498,7 @@
   win_class->is_closed        = bamf_legacy_window_test_is_closed;
   win_class->get_hint         = bamf_legacy_window_test_get_hint;
   win_class->set_hint         = bamf_legacy_window_test_set_hint;
+  win_class->get_action_menu  = bamf_legacy_window_test_get_action_menu;
   win_class->show_action_menu = bamf_legacy_window_test_show_action_menu;
   win_class->reopen           = bamf_legacy_window_test_reopen;
 }

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2014-02-14 01:21:59 +0000
+++ src/bamf-legacy-window.c	2016-04-12 11:14:14 +0000
@@ -52,6 +52,7 @@
 struct _BamfLegacyWindowPrivate
 {
   WnckWindow * legacy_window;
+  GtkWidget  * action_menu;
   GFile      * mini_icon;
   gchar      * exec_string;
   gchar      * working_dir;
@@ -547,9 +548,35 @@
   *push = TRUE;
 }
 
+GtkWidget *
+bamf_legacy_window_get_action_menu (BamfLegacyWindow *self)
+{
+  BamfLegacyWindowPrivate *priv;
+
+  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
+
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_action_menu)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_action_menu (self);
+
+  priv = self->priv;
+  g_return_val_if_fail (WNCK_IS_WINDOW (priv->legacy_window), NULL);
+
+  if (!priv->action_menu)
+    {
+      priv->action_menu = wnck_action_menu_new (priv->legacy_window);
+      g_object_add_weak_pointer (G_OBJECT (priv->action_menu),
+                                 (gpointer *) &priv->action_menu);
+    }
+
+  return priv->action_menu;
+}
+
 void bamf_legacy_window_show_action_menu (BamfLegacyWindow *self, guint32 time,
                                           guint button, gint x, gint y)
 {
+  BamfLegacyWindowPrivate *priv;
+  GtkWidget *menu;
+
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
 
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->show_action_menu)
@@ -557,9 +584,16 @@
 
   g_return_if_fail (WNCK_IS_WINDOW (self->priv->legacy_window));
 
-  GtkWidget *menu = wnck_action_menu_new (self->priv->legacy_window);
-  g_signal_connect (G_OBJECT (menu), "unmap", G_CALLBACK (g_object_unref), NULL);
+  priv = self->priv;
+
+  if (priv->action_menu && gtk_widget_is_visible (GTK_WIDGET (priv->action_menu)))
+    return;
+
+  menu = bamf_legacy_window_get_action_menu (self);
+
   g_object_ref_sink (menu);
+  g_signal_handlers_disconnect_by_func (menu, g_object_unref, self);
+  g_signal_connect (G_OBJECT (menu), "unmap", G_CALLBACK (g_object_unref), self);
 
   gtk_menu_set_screen (GTK_MENU (menu), gdk_screen_get_default ());
   gtk_widget_show (menu);
@@ -650,6 +684,13 @@
       self->priv->legacy_window = NULL;
     }
 
+  if (self->priv->action_menu)
+    {
+      g_signal_handlers_disconnect_by_data (self->priv->action_menu, self);
+      g_object_remove_weak_pointer (G_OBJECT (self->priv->action_menu),
+                                    (gpointer*) &self->priv->action_menu);
+    }
+
   G_OBJECT_CLASS (bamf_legacy_window_parent_class)->dispose (object);
 }
 

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2014-02-14 01:21:59 +0000
+++ src/bamf-legacy-window.h	2016-04-12 11:14:14 +0000
@@ -99,6 +99,7 @@
                                            gint *x, gint *y, gint *w, gint *h);
   void         (*set_hint)                (BamfLegacyWindow *legacy_window,
                                            const gchar *name, const gchar *value);
+  GtkWidget  * (*get_action_menu)         (BamfLegacyWindow *legacy_window);
   void         (*show_action_menu)        (BamfLegacyWindow *legacy_window,
                                            guint32 time, guint button, gint x, gint y);
   void         (*reopen)                  (BamfLegacyWindow *legacy_window);
@@ -171,6 +172,8 @@
 
 gint               bamf_legacy_window_get_stacking_position (BamfLegacyWindow *self);
 
+GtkWidget        * bamf_legacy_window_get_action_menu      (BamfLegacyWindow *self);
+
 void               bamf_legacy_window_show_action_menu     (BamfLegacyWindow *self,
                                                             guint32 time, guint button,
                                                             gint x, gint y);

=== modified file 'src/bamf-window.c'
--- src/bamf-window.c	2013-07-31 00:11:27 +0000
+++ src/bamf-window.c	2016-04-12 11:14:14 +0000
@@ -21,6 +21,13 @@
 #include "bamf-window.h"
 #include "bamf-legacy-screen.h"
 
+#ifdef EXPORT_ACTIONS_MENU
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <libdbusmenu-glib/dbusmenu-glib.h>
+#include <libdbusmenu-gtk/parser.h>
+#endif
+
 #define BAMF_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
 BAMF_TYPE_WINDOW, BamfWindowPrivate))
 
@@ -29,7 +36,7 @@
                          G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_WINDOW,
                                                 bamf_window_dbus_iface_init));
 
-static GList *bamf_windows;
+static GList *bamf_windows = NULL;
 
 enum
 {
@@ -44,7 +51,12 @@
   BamfLegacyWindow *legacy_window;
   BamfWindowMaximizationType maximized;
   gint monitor;
-  time_t opened;
+
+#ifdef EXPORT_ACTIONS_MENU
+  DbusmenuServer *dbusmenu_server;
+  GtkWidget *action_menu;
+  gboolean was_active;
+#endif
 };
 
 BamfLegacyWindow *
@@ -129,14 +141,6 @@
   return (guint32) bamf_legacy_window_get_xid (window->priv->legacy_window);
 }
 
-time_t
-bamf_window_opened (BamfWindow *self)
-{
-  g_return_val_if_fail (BAMF_IS_WINDOW (self), 0);
-
-  return self->priv->opened;
-}
-
 static void
 handle_window_closed (BamfLegacyWindow * window, gpointer data)
 {
@@ -165,6 +169,10 @@
 {
   g_return_if_fail (BAMF_IS_WINDOW (self));
 
+#ifdef EXPORT_ACTIONS_MENU
+  self->priv->was_active = bamf_view_is_active (BAMF_VIEW (self));
+#endif
+
   bamf_view_set_active       (BAMF_VIEW (self), bamf_legacy_window_is_active (self->priv->legacy_window));
   bamf_view_set_urgent       (BAMF_VIEW (self), bamf_legacy_window_needs_attention (self->priv->legacy_window));
   bamf_view_set_user_visible (BAMF_VIEW (self), !bamf_legacy_window_is_skip_tasklist (self->priv->legacy_window));
@@ -177,6 +185,15 @@
     self->priv->maximized = maximized;
     g_signal_emit_by_name (self, "maximized-changed", old_state, maximized);
   }
+
+#ifdef EXPORT_ACTIONS_MENU
+  if (self->priv->dbusmenu_server && !self->priv->was_active &&
+      !bamf_view_is_active (BAMF_VIEW (self)))
+    {
+      g_clear_object (&self->priv->dbusmenu_server);
+      g_clear_object (&self->priv->action_menu);
+    }
+#endif
 }
 
 static void
@@ -263,6 +280,60 @@
   bamf_window_ensure_flags (window);
 }
 
+#ifdef EXPORT_ACTIONS_MENU
+static gboolean
+bamf_window_active_changed (BamfView *view, gboolean active)
+{
+  BamfWindow *self = BAMF_WINDOW (view);
+  BamfWindowPrivate *priv = self->priv;
+  GtkWidget *window_menu;
+  BamfWindowType win_type;
+  const char *view_path;
+
+  if (!active && !priv->was_active)
+    {
+      g_clear_object (&priv->dbusmenu_server);
+      g_clear_object (&priv->action_menu);
+      return FALSE;
+    }
+
+  if (priv->dbusmenu_server)
+    return FALSE;
+
+  win_type = bamf_window_get_window_type (self);
+
+  if (win_type == BAMF_WINDOW_DOCK ||
+      win_type == BAMF_WINDOW_TOOLBAR ||
+      win_type == BAMF_WINDOW_MENU ||
+      win_type == BAMF_WINDOW_SPLASHSCREEN)
+  {
+    return FALSE;
+  }
+
+  window_menu = bamf_legacy_window_get_action_menu (priv->legacy_window);
+
+  if (!GTK_IS_WIDGET (window_menu))
+    return FALSE;
+
+  view_path = bamf_view_get_path (view);
+  priv->dbusmenu_server = dbusmenu_server_new (view_path);
+
+  priv->action_menu = gtk_menu_new ();
+  g_object_ref_sink (priv->action_menu);
+
+  GtkWidget *menuitem = gtk_menu_item_new_with_label (_("Window actions"));
+  gtk_widget_show (menuitem);
+
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), window_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (priv->action_menu), menuitem);
+
+  dbusmenu_server_set_root (priv->dbusmenu_server,
+                            dbusmenu_gtk_parse_menu_structure (priv->action_menu));
+
+  return FALSE;
+}
+#endif
+
 static gboolean
 on_dbus_handle_get_pid (BamfDBusItemWindow *interface,
                         GDBusMethodInvocation *invocation,
@@ -414,8 +485,6 @@
   self = BAMF_WINDOW (object);
   bamf_windows = g_list_prepend (bamf_windows, self);
 
-  self->priv->opened = time (NULL);
-
   bamf_view_set_name (BAMF_VIEW (self), bamf_legacy_window_get_name (window));
 
   g_signal_connect (G_OBJECT (window), "name-changed",
@@ -452,6 +521,11 @@
       self->priv->legacy_window = NULL;
     }
 
+#ifdef EXPORT_ACTIONS_MENU
+    g_clear_object (&self->priv->dbusmenu_server);
+    g_clear_object (&self->priv->action_menu);
+#endif
+
   G_OBJECT_CLASS (bamf_window_parent_class)->dispose (object);
 }
 
@@ -528,6 +602,9 @@
   object_class->constructed   = bamf_window_constructed;
   view_class->view_type       = bamf_window_get_view_type;
   view_class->stable_bus_name = bamf_window_get_stable_bus_name;
+#ifdef EXPORT_ACTIONS_MENU
+  view_class->active_changed  = bamf_window_active_changed;
+#endif
 
   pspec = g_param_spec_object ("legacy-window", "legacy-window", "legacy-window",
                                BAMF_TYPE_LEGACY_WINDOW,

=== modified file 'src/bamf-window.h'
--- src/bamf-window.h	2013-06-08 13:54:06 +0000
+++ src/bamf-window.h	2016-04-12 11:14:14 +0000
@@ -69,8 +69,6 @@
 
 guint32            bamf_window_get_pid (BamfWindow *window);
 
-time_t             bamf_window_opened (BamfWindow *window);
-
 gint               bamf_window_get_stack_position (BamfWindow *window);
 
 char             * bamf_window_get_string_hint (BamfWindow *self, const char* prop);

=== modified file 'src/bamf-xutils.c'
--- src/bamf-xutils.c	2014-02-14 01:21:59 +0000
+++ src/bamf-xutils.c	2016-04-12 11:14:14 +0000
@@ -57,7 +57,7 @@
       XGetErrorText (dpy, error_code, tmp, sizeof (tmp) - 1);
       tmp[sizeof (tmp) - 1] = '\0';
 
-      g_warning("Got an X error: %s\n", tmp);
+      g_warning ("Got an X error: %s\n", tmp);
 
       return TRUE;
     }
@@ -103,17 +103,25 @@
                                    &type, &format, &numItems,
                                    &bytesAfter, &buffer);
 
+  gboolean x_error = gdk_error_trap_pop_and_print (XDisplay);
+
   if (close_display)
     XCloseDisplay (XDisplay);
 
-  if (result == Success && numItems > 0 && !gdk_error_trap_pop_and_print (XDisplay))
+  if (x_error)
+    {
+      XFree (buffer);
+      return;
+    }
+
+  if (result == Success && numItems > 0)
     {
       if (return_type)
         *return_type = type;
 
       if (return_hint && buffer && buffer[0] != '\0')
         {
-          if (type == XA_STRING || type == gdk_x11_get_xatom_by_name("UTF8_STRING"))
+          if (type == XA_STRING || type == gdk_x11_get_xatom_by_name ("UTF8_STRING"))
             *return_hint = g_strdup ((char*) buffer);
         }
 
@@ -155,7 +163,7 @@
     {
       type = XA_STRING;
     }
-  else if (type != XA_STRING && type != gdk_x11_get_xatom_by_name("UTF8_STRING"))
+  else if (type != XA_STRING && type != gdk_x11_get_xatom_by_name ("UTF8_STRING"))
     {
       g_error ("Impossible to set the atom %s on Window %lu", atom_name, xid);
 
@@ -177,6 +185,31 @@
 }
 
 void
+bamf_xutils_unset_window_hint (Window xid, const char *atom_name)
+{
+  Display *XDisplay;
+  gboolean close_display = FALSE;
+
+  g_return_if_fail (xid != 0);
+  g_return_if_fail (atom_name);
+
+  XDisplay = get_xdisplay (&close_display);
+
+  if (!XDisplay)
+  {
+    g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
+    return;
+  }
+
+  gdk_error_trap_push ();
+  XDeleteProperty (XDisplay, xid, gdk_x11_get_xatom_by_name (atom_name));
+  gdk_error_trap_pop_and_print (XDisplay);
+
+  if (close_display)
+    XCloseDisplay (XDisplay);
+}
+
+void
 bamf_xutils_get_window_class_hints (Window xid, char **class_instance_name, char **class_name)
 {
   Display *xdisplay;
@@ -196,7 +229,7 @@
 
   gdk_error_trap_push ();
 
-  XGetClassHint(xdisplay, xid, &class_hint);
+  XGetClassHint (xdisplay, xid, &class_hint);
 
   if (!gdk_error_trap_pop_and_print (xdisplay))
     {

=== modified file 'src/bamf-xutils.h'
--- src/bamf-xutils.h	2014-02-14 01:21:59 +0000
+++ src/bamf-xutils.h	2016-04-12 11:14:14 +0000
@@ -27,6 +27,7 @@
 
 void  bamf_xutils_set_string_window_hint (Window xid, const char *atom_name, const char *value);
 char* bamf_xutils_get_string_window_hint (Window xid, const char *atom_name);
+void  bamf_xutils_unset_window_hint (Window xid, const char *atom_name);
 
 void  bamf_xutils_get_window_class_hints (Window xid, char **class_instance_name, char **class_name);
 

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2016-01-19 11:13:01 +0000
+++ tests/bamfdaemon/Makefile.am	2016-04-12 11:14:14 +0000
@@ -68,6 +68,13 @@
 	$(X_LIBS) \
 	$(NULL)
 
+if EXPORT_ACTIONS_MENU
+test_bamf_LDADD += $(DBUSMENU_LIBS)
+test_bamf_CFLAGS += $(DBUSMENU_CFLAGS)
+test_bamf_CFLAGS += -DEXPORT_ACTIONS_MENU
+endif
+
+
 test_bamf_LDFLAGS = \
 	-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 	$(COVERAGE_LDFLAGS) \