- yelp-uri has been dead for a while, no need to link it in

* src/Makefile.am:
- yelp-uri has been dead for a while, no need to link it in

* src/yelp-main.c:
- Reverted #168262, fixing #169160

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f5061c0..21addf3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-06  Shaun McCance  <shaunm@gnome.org>
+
+	* src/Makefile.am:
+	- yelp-uri has been dead for a while, no need to link it in
+
+	* src/yelp-main.c:
+	- Reverted #168262, fixing #169160
+
 2005-02-23  Paolo Borelli  <pborelli@katamail.com>
 
 	* src/yelp-main.c (main): do not leak display_name.
diff --git a/src/Makefile.am b/src/Makefile.am
index 11285d51..dc04fdc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,6 @@ yelp_SOURCES =							\
 	yelp-pager.c		yelp-pager.h			\
 	yelp-settings.c		yelp-settings.h			\
 	yelp-toc-pager.c	yelp-toc-pager.h		\
-	yelp-uri.c	        yelp-uri.h			\
 	yelp-utils.c		yelp-utils.h			\
 	yelp-window.c 		yelp-window.h			\
 	yelp-xslt-pager.c	yelp-xslt-pager.h		\
diff --git a/src/yelp-main.c b/src/yelp-main.c
index 15d22fe3..5ab047ff 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -307,7 +307,6 @@ int
 main (int argc, char **argv) 
 {
 	GnomeProgram  *program;
-	gchar         *display_name;
 	CORBA_Object   factory;
 	gchar         *url = NULL;
 	GnomeClient   *client;
@@ -328,9 +327,9 @@ main (int argc, char **argv)
 
 	/* Need to set this to the canonical DISPLAY value, since
 	   that's where we're registering per-display components */
-	display_name = gdk_display_get_name (gdk_display_get_default ());
-	bonobo_activation_set_activation_env_value ("DISPLAY", display_name);
-	g_free (display_name);
+	bonobo_activation_set_activation_env_value
+		("DISPLAY",
+		 gdk_display_get_name (gdk_display_get_default ()) );
 
 	gnome_vfs_init ();