libgnome r3596 - in trunk: . libgnome

[kmaraas svn gnome org]

Author: kmaraas
Date: Wed Jan 23 19:00:05 2008
New Revision: 3596
URL: http://svn.gnome.org/viewvc/libgnome?rev=3596&view=rev

Log:
2008-01-23  Kjartan Maraas  <kmaraas gnome org>

	* libgnome/gnome-exec.c: (gnome_prepend_terminal_to_vector):
	* libgnome/gnome-gconf.c: Remove more unneeded use of popt.
	Patch from dmacks at netspace org. Closes bug #511424.

Modified:
   trunk/ChangeLog
   trunk/libgnome/gnome-exec.c
   trunk/libgnome/gnome-gconf.c

Modified: trunk/libgnome/gnome-exec.c
==============================================================================
--- trunk/libgnome/gnome-exec.c	(original)
+++ trunk/libgnome/gnome-exec.c	Wed Jan 23 19:00:05 2008
@@ -43,7 +43,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <popt.h>
 
 #include <errno.h>
 #ifndef errno
@@ -423,11 +422,6 @@
 		g_free (command_line);
 		g_free (exec_flag);
 		g_free (terminal);
-#if 0
-	    poptParseArgvString (terminal, &term_argc, &temp_argv);
-	    term_argv = g_strdupv ((gchar **) temp_argv);
-	    g_free (terminal);
-#endif
 	}
 
 	if (term_argv == NULL) {

Modified: trunk/libgnome/gnome-gconf.c
==============================================================================
--- trunk/libgnome/gnome-gconf.c	(original)
+++ trunk/libgnome/gnome-gconf.c	Wed Jan 23 19:00:05 2008
@@ -26,7 +26,6 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <popt.h>
 
 #define GCONF_ENABLE_INTERNALS
 #include <gconf/gconf.h>