added my Recipes
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
From 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 24 Sep 2012 09:57:46 +0200
|
||||
Subject: [PATCH] windowmenu: do not display desktop icon when no window is
|
||||
active
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* desktop icon is of no use
|
||||
* desktop icon confuses when using showdesktop plugin
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
Rebase for xfce4 4.18.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 ba245a3..f8fdee8 100644
|
||||
--- a/plugins/windowmenu/windowmenu.c
|
||||
+++ b/plugins/windowmenu/windowmenu.c
|
||||
@@ -250,7 +250,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
|
||||
g_signal_connect (G_OBJECT (plugin->button), "toggled",
|
||||
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);
|
||||
}
|
||||
@@ -680,19 +680,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
|
||||
/* skip 'fake' windows */
|
||||
type = wnck_window_get_window_type (window);
|
||||
if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK)
|
||||
- goto show_desktop_icon;
|
||||
+ goto show_no_icon;
|
||||
|
||||
window_menu_plugin_set_icon (plugin, window);
|
||||
}
|
||||
else
|
||||
{
|
||||
- show_desktop_icon:
|
||||
+ show_no_icon:
|
||||
|
||||
/* desktop is shown right now */
|
||||
icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin));
|
||||
- gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size);
|
||||
+ gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size);
|
||||
gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size);
|
||||
- gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop"));
|
||||
+ gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows"));
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 28 Jun 2019 16:02:13 +0800
|
||||
Subject: [PATCH] use lxdm to replace dm-tool
|
||||
|
||||
OE does not support lightdm but lxdm,
|
||||
so use lxdm to replace dm-tool
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
plugins/actions/actions.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
|
||||
index 474798e..63eb41d 100644
|
||||
--- a/plugins/actions/actions.c
|
||||
+++ b/plugins/actions/actions.c
|
||||
@@ -905,12 +905,12 @@ actions_plugin_actions_allowed (void)
|
||||
GError *error = NULL;
|
||||
|
||||
/* 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);
|
||||
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)
|
||||
@@ -1027,9 +1027,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
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
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"
|
||||
|
||||
inherit xfce gtk-doc gobject-introspection features_check mime-xdg
|
||||
|
||||
# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
|
||||
# cairo would at least needed to be built with xlib.
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
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] = "be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710"
|
||||
|
||||
EXTRA_OECONF += "--disable-vala"
|
||||
|
||||
python populate_packages:prepend() {
|
||||
plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')
|
||||
plugin_name = d.expand('${PN}-plugin-%s')
|
||||
do_split_packages(d, plugin_dir, r'^lib(.*)\.so$', plugin_name,
|
||||
'${PN} plugin for %s', extra_depends='', prepend=True,
|
||||
aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop',
|
||||
'${sysconfdir}/xdg/xfce/panel/%s-*',
|
||||
'${datadir}/icons/hicolor/48x48/apps/*-%s.png',
|
||||
'${bindir}/*%s*'])
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC += "^${PN}-plugin-.*"
|
||||
|
||||
PACKAGES =+ "${PN}-gtk3"
|
||||
|
||||
FILES:${PN} += "${libdir}/xfce4/panel/migrate \
|
||||
${libdir}/xfce4/panel/wrapper-1.0"
|
||||
|
||||
FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la"
|
||||
|
||||
FILES:${PN}-gtk3 = " \
|
||||
${libdir}/libxfce4panel-2.0${SOLIBS} \
|
||||
${libdir}/xfce4/panel/wrapper-2.0 \
|
||||
"
|
||||
Reference in New Issue
Block a user