3 files changed, 36 insertions, 38 deletions

diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
index 154f72d186..690deefc91 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
+++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
@@ -17,27 +17,32 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 Rebase for xfce4-panel 4.18.3.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Rebase for xfce4-panel 4.20.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
  plugins/windowmenu/windowmenu.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
-index be7dea4..2f432b0 100644
+index 9a73f29..eab0547 100644
 --- a/plugins/windowmenu/windowmenu.c
 +++ b/plugins/windowmenu/windowmenu.c
-@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
+@@ -266,7 +266,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
    g_signal_connect (G_OBJECT (plugin->button), "toggled",
-       G_CALLBACK (window_menu_plugin_menu), plugin);
+                     G_CALLBACK (window_menu_plugin_menu), plugin);
  
 -  plugin->icon = gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_BUTTON);
 +  plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON);
    gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon);
    gtk_widget_show (plugin->icon);
- 
-@@ -695,19 +695,19 @@ window_menu_plugin_active_window_changed (WnckScreen       *screen,
+ }
+@@ -706,19 +706,19 @@ window_menu_plugin_active_window_changed (XfwScreen *screen,
            /* skip 'fake' windows */
-           type = wnck_window_get_window_type (window);
-           if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK)
+           type = xfw_window_get_window_type (window);
+           if (type == XFW_WINDOW_TYPE_DESKTOP || type == XFW_WINDOW_TYPE_DOCK)
 -            goto show_desktop_icon;
 +            goto show_no_icon;
  
@@ -45,8 +50,8 @@ index be7dea4..2f432b0 100644
          }
        else
          {
--          show_desktop_icon:
-+          show_no_icon:
+-show_desktop_icon:
++show_no_icon:
  
            /* desktop is shown right now */
            icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin));
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch
index 66a33c722a..dc2444193d 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch
+++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch
@@ -13,41 +13,32 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Rebase for xfce4-panel 4.18.3.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Rebase for xfce4-panel 4.20.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
- plugins/actions/actions.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ plugins/actions/actions.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
-index e1f1fa7..440f430 100644
+index 5e58078..b16d38e 100644
 --- a/plugins/actions/actions.c
 +++ b/plugins/actions/actions.c
-@@ -977,12 +977,12 @@ actions_plugin_actions_allowed (void)
-   GError          *error = NULL;
+@@ -1054,11 +1054,11 @@ actions_plugin_actions_allowed (ActionsPlugin *plugin)
+       g_free (path);
+     }
  
-   /* check for commands we use */
 -  path = g_find_program_in_path ("dm-tool");
 +  path = g_find_program_in_path ("lxdm");
    if (path != NULL)
-     PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER);
+     {
+       PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER);
+-      plugin->switch_user_cmd = "dm-tool switch-to-greeter";
++      plugin->switch_user_cmd = "lxdm -c USER_SWITCH";
+     }
    else
-   {
--    /* check for gdmflexiserver if dm-tool is not present */
-+    /* check for gdmflexiserver if lxdm is not present */
-     g_free (path);
-     path = g_find_program_in_path ("gdmflexiserver");
-     if (path != NULL)
-@@ -1099,9 +1099,9 @@ actions_plugin_action_activate (GtkWidget      *widget,
-       break;
- 
-     case ACTION_TYPE_SWITCH_USER:
--      path = g_find_program_in_path ("dm-tool");
-+      path = g_find_program_in_path ("lxdm");
-       if (path != NULL)
--        succeed = g_spawn_command_line_async ("dm-tool switch-to-greeter", &error);
-+        succeed = g_spawn_command_line_async ("lxdm -c USER_SWITCH", &error);
-       else
-         succeed = g_spawn_command_line_async ("gdmflexiserver", &error);
-       g_free (path);
+     {
 -- 
 2.8.1
-
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.6.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.0.bb
index acc05f13fe..250482d2aa 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.6.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.0.bb
@@ -2,7 +2,9 @@ SUMMARY = "Xfce4 Panel"
 SECTION = "x11"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
-DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native"
+DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \
+           libwnck3 vala-native \
+           "
 
 inherit xfce gtk-doc gobject-introspection features_check mime-xdg
 
@@ -14,9 +16,9 @@ SRC_URI += " \
     file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
     file://0002-use-lxdm-to-replace-dm-tool.patch \
 "
-SRC_URI[sha256sum] = "21337161f58bb9b6e42760cb6883bc79beea27882aa6272b61f0e09d750d7c62"
+SRC_URI[sha256sum] = "ff33cd5f5d16c2193fe305f4878d82cd8d2feea92f2594bcd27b2b5c392d43b8"
 
-EXTRA_OECONF += "--disable-vala"
+EXTRA_OECONF += "--disable-vala GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen"
 
 python populate_packages:prepend() {
     plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')