summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorquinn <quinn>2006-10-02 12:25:08 +0000
committerquinn <quinn>2006-10-02 12:25:08 +0000
commita66ccee1f273dcea915e501df27dc0fab049c95e (patch)
tree464af030a63f5b78e15e27b8dc97d12d954b4216 /src
parent554156b4a965bf331eaf1cf5f9fe5161bd88c62c (diff)
downloadberyl-manager-a66ccee1f273dcea915e501df27dc0fab049c95e.tar.gz
beryl-manager-a66ccee1f273dcea915e501df27dc0fab049c95e.tar.bz2
move compiz to end of list to make things more sensible
fix grep to not match on beryl-manager for beryl
Diffstat (limited to 'src')
-rw-r--r--src/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index e337452..3dcd82d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -66,8 +66,6 @@ DMInfo DMs[] = {
#define numDM (sizeof(DMs)/sizeof(DMInfo))
WMInfo WMs[]={
{N_("Beryl"), 0, 0, 0 ,0,0,0,0},
- {N_("Compiz"), "compiz", "--replace gconf", "compiz" ,0,0,0,0},
- {N_("Compiz with COW"), "compiz", "--use-cow --replace gconf", "compiz" ,0,0,0,0},
{N_("Metacity (Gnome Window Manager)"), "metacity", "--replace", "metacity" ,0,0,0,0},
{N_("KWin (KDE Window Manager)"), "kwin", "--replace", "kwin" ,0,0,0,0},
{N_("xfwm4 (XFCE Window Manager)"), "xfwm4", "", "xfwm4" ,0,1,0,0},
@@ -77,6 +75,8 @@ WMInfo WMs[]={
{N_("OpenBox"), "openbox", "", "openbox" ,0,0,0,0},
{N_("IceWM"), "icewm", "", "icewm" ,0,0,0,0},
{N_("Enlightenment"), "enlightenment", "", "enlightenment" ,0,1,0,0},
+ {N_("Compiz"), "compiz", "--replace gconf", "compiz" ,0,0,0,0},
+ {N_("Compiz with COW"), "compiz", "--use-cow --replace gconf", "compiz" ,0,0,0,0},
};
#define numWM (sizeof(WMs)/sizeof(WMInfo))
GtkWidget * useFBItem;
@@ -188,7 +188,7 @@ gboolean is_running(const gchar * command)
{
gint ex;
if (!g_spawn_command_line_sync(
- g_strdup_printf("sh -c 'ps xo comm | grep %s > /dev/null'",command),
+ g_strdup_printf("sh -c \"ps xo comm | egrep '^%s$' > /dev/null\"",command),
NULL,NULL,&ex,NULL))
g_error(_("can't use this app, no ps or grep"));
if (WIFEXITED(ex))