Hello community, here is the log from the commit of package beagle checked in at Mon May 29 01:02:35 CEST 2006. -------- --- GNOME/beagle/beagle.changes 2006-05-23 17:16:57.000000000 +0200 +++ beagle/beagle.changes 2006-05-26 23:32:39.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 23:32:13 CEST 2006 - joeshaw@suse.de + +- Add a patch to remove terminal entries from beagle-search + results when command-line lockdown is enabled. (bnc #179333) + +------------------------------------------------------------------- New: ---- beagle-terminal-lockdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.yqQfuQ/_old 2006-05-29 01:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.yqQfuQ/_new 2006-05-29 01:02:15.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 44 +Release: 46 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -53,6 +53,7 @@ Patch25: beagle-vorbis-mime-type.patch Patch26: beagle-check-for-mmap.patch Patch27: beagle-xdgmime-crash.patch +Patch28: beagle-terminal-lockdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Prereq: /usr/sbin/groupadd /usr/sbin/useradd Requires: mono-core >= 1.1.13.5 @@ -322,6 +323,7 @@ %patch25 %patch26 %patch27 +%patch28 %build rm po/no.* @@ -479,6 +481,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n beagle +* Fri May 26 2006 - joeshaw@suse.de +- Add a patch to remove terminal entries from beagle-search + results when command-line lockdown is enabled. (bnc #179333) * Tue May 23 2006 - joeshaw@suse.de - Add a patch to check for mmap() in configure.in - Run autoheader in the %%setup section so we get the mmap check. ++++++ beagle-terminal-lockdown.patch ++++++ Index: search/Tiles/Application.cs =================================================================== RCS file: /cvs/gnome/beagle/search/Tiles/Application.cs,v retrieving revision 1.8 diff -u -p -r1.8 Application.cs --- search/Tiles/Application.cs 5 May 2006 18:36:25 -0000 1.8 +++ search/Tiles/Application.cs 26 May 2006 20:49:51 -0000 @@ -3,10 +3,15 @@ using System.Diagnostics; using System.Runtime.InteropServices; using Mono.Unix; +using GConf; + namespace Search.Tiles { public class ApplicationActivator : TileActivator { + static bool checked_gconf = false; + static bool disable_command_line = false; + public ApplicationActivator () : base () { AddSupportedFlavor (new HitFlavor (null, null, "application/x-desktop")); @@ -29,6 +34,20 @@ namespace Search.Tiles { gnome_desktop_item_unref (ditem); } + static void CheckLockdown () + { + GConf.Client client = new GConf.Client (); + + try { + disable_command_line = (bool) client.Get ("/desktop/gnome/lockdown/disable_command_line"); + } catch { + // The key isn't set for some reason + disable_command_line = false; + } + + checked_gconf = true; + } + // invalid .desktop files get filtered out by Validate(), so they won't // show up as Application tiles, but will show up as File tiles. But // valid .desktop files marked to not show up in GNOME get eaten by @@ -66,6 +85,17 @@ namespace Search.Tiles { string onlyshow = gnome_desktop_item_get_string (ditem, "OnlyShowIn"); if (onlyshow != null && onlyshow.IndexOf ("GNOME") == -1) return null; + + + if (!checked_gconf) + CheckLockdown(); + + if (disable_command_line) { + string[] categories = hit.GetProperties ("fixme:Categories"); + + if (categories != null && Array.IndexOf (categories, "TerminalEmulator") != -1) + return null; + } return new Application (hit, query, ditem); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...