summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2004-05-27 20:42:48 +0000
committerGeorge Lebl <jirka@src.gnome.org>2004-05-27 20:42:48 +0000
commitb11360cc0320f8732aa84db81c84b66ac31d1d9c (patch)
tree7d6d2cf9af2ef767c8c69ae10e13f66dc4798981 /gui
parentfd955b67ade9f7d91fb084104ab52abafeb730c2 (diff)
downloadgdm-b11360cc0320f8732aa84db81c84b66ac31d1d9c.tar.gz
The screen code was wankered, it wanted HAVE_GTK_MULTIHEAD to be defined
Thu May 27 13:42:39 2004 George Lebl <jirka@5z.com> * gui/modules/dwellmouselistener.c, gui/modules/keymouselistener.c: The screen code was wankered, it wanted HAVE_GTK_MULTIHEAD to be defined to work properly and otherwise it confused bonobo which is completely moronic (I mean bonobo is moronic) by using slightly different (but perfectly legal) DISPLAY env var.
Diffstat (limited to 'gui')
-rw-r--r--gui/modules/dwellmouselistener.c7
-rw-r--r--gui/modules/keymouselistener.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c
index 9f066c27..890d9a67 100644
--- a/gui/modules/dwellmouselistener.c
+++ b/gui/modules/dwellmouselistener.c
@@ -98,7 +98,6 @@ BindingDirection get_binding_direction(char c);
static gchar *
screen_exec_display_string (GdkScreen *screen, const char *old)
{
-#ifdef HAVE_GTK_MULTIHEAD
GString *str;
const gchar *old_display;
gchar *retval;
@@ -122,12 +121,6 @@ screen_exec_display_string (GdkScreen *screen, const char *old)
g_string_free (str, FALSE);
return retval;
-#else
- if (old)
- return g_strdup (old);
- else
- return g_strdup ("DISPLAY=:0.0");
-#endif
}
/**
diff --git a/gui/modules/keymouselistener.c b/gui/modules/keymouselistener.c
index 978d3378..b1ca4301 100644
--- a/gui/modules/keymouselistener.c
+++ b/gui/modules/keymouselistener.c
@@ -107,7 +107,6 @@ free_gesture (Gesture *gesture)
static gchar *
screen_exec_display_string (GdkScreen *screen, const char *old)
{
-#ifdef HAVE_GTK_MULTIHEAD
GString *str;
const gchar *old_display;
gchar *retval;
@@ -131,12 +130,6 @@ screen_exec_display_string (GdkScreen *screen, const char *old)
g_string_free (str, FALSE);
return retval;
-#else
- if (old)
- return g_strdup (old);
- else
- return g_strdup ("DISPLAY=:0.0");
-#endif
}
static void create_event_watcher ()