summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjan Timmerman <arjani@soulfly.nl>2006-03-29 16:18:42 +0000
committerRodrigo Moya <rodrigo@src.gnome.org>2006-03-29 16:18:42 +0000
commit8ac6a35a19dd83310d234c300fda5f89ac100415 (patch)
tree54ab5213b2ab91d1761069082b98dca5981c76b5
parentefeb4b9632944df6b44369bae3316597c5b610fb (diff)
downloadgnome-control-center-8ac6a35a19dd83310d234c300fda5f89ac100415.tar.gz
Fixes #334153
2006-03-29 Arjan Timmerman <arjani@soulfly.nl> Fixes #334153 * factory.c (register_server): no trim needed. Now really fixed.
-rw-r--r--gnome-settings-daemon/ChangeLog6
-rw-r--r--gnome-settings-daemon/factory.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index d5eeb1f9e..18588ac44 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-29 Arjan Timmerman <arjani@soulfly.nl>
+
+ Fixes #334153
+
+ * factory.c (register_server): no trim needed. Now really fixed.
+
2006-03-23 Rodrigo Moya <rodrigo@novell.com>
* factory.c (register_server): set DISPLAY environment variable as
diff --git a/gnome-settings-daemon/factory.c b/gnome-settings-daemon/factory.c
index bc9ebda1e..f60a5c14a 100644
--- a/gnome-settings-daemon/factory.c
+++ b/gnome-settings-daemon/factory.c
@@ -24,12 +24,7 @@ register_server (BonoboObject *server)
char *display;
char *p;
- display = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
- if ((p = strrchr (display, ':'))) {
- p = strchr (p, '.');
- if (p)
- p [0] = '\0';
- }
+ display = gdk_display_get_name (gdk_display_get_default ());
reg_env = bonobo_activation_registration_env_set (NULL, "DISPLAY", display);
@@ -42,7 +37,6 @@ register_server (BonoboObject *server)
}
bonobo_activation_registration_env_free (reg_env);
- g_free (display);
}
int main (int argc, char *argv [])