libgnome r3724 - in trunk: . libgnome schemas

[kmaraas svn gnome org]

Author: kmaraas
Date: Sun Apr 27 10:29:13 2008
New Revision: 3724
URL: http://svn.gnome.org/viewvc/libgnome?rev=3724&view=rev

Log:
2008-04-27  William Jon McCann  <jmccann redhat com>

	* schemas/desktop_gnome_lockdown.schemas.in:
	Add disable_application_handlers lockdown.

Modified:
   trunk/ChangeLog
   trunk/libgnome/gnome-exec.c
   trunk/libgnome/gnome-gconf.c
   trunk/libgnome/gnome-help.c
   trunk/libgnome/gnome-init.c
   trunk/libgnome/gnome-open.c
   trunk/libgnome/gnome-util.c
   trunk/schemas/desktop_gnome_lockdown.schemas.in

Modified: trunk/libgnome/gnome-exec.c
==============================================================================
--- trunk/libgnome/gnome-exec.c	(original)
+++ trunk/libgnome/gnome-exec.c	Sun Apr 27 10:29:13 2008
@@ -43,7 +43,6 @@
 
 #include <gconf/gconf-client.h>
 
-
 #include <errno.h>
 #ifndef errno
 extern int errno;
@@ -95,8 +94,7 @@
   int child_errno, itmp, i, open_max;
   gssize res;
   char **cpargv;
-  pid_t child_pid, immediate_child_pid; /* XXX this routine assumes
-					   pid_t is signed */
+  pid_t child_pid, immediate_child_pid;
 
   if(pipe(parent_comm_pipes))
     return -1;
@@ -216,7 +214,8 @@
 
   /* do this after the read's in case some OS's handle blocking on pipe writes
      differently */
-   while ((waitpid(immediate_child_pid, &itmp, 0)== -1) && (errno == EINTR)); /* eat zombies */
+  while ((waitpid(immediate_child_pid, &itmp, 0)== -1) && (errno == EINTR))
+    ; /* eat zombies */
 
   close(parent_comm_pipes[0]);
 

Modified: trunk/libgnome/gnome-gconf.c
==============================================================================
--- trunk/libgnome/gnome-gconf.c	(original)
+++ trunk/libgnome/gnome-gconf.c	Sun Apr 27 10:29:13 2008
@@ -33,9 +33,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libgnome/libgnome.h>
+#include "libgnome.h"
 
-#include "gnome-gconf.h"
 #include "gnome-gconfP.h"
 
 /**
@@ -108,7 +107,7 @@
 }
 
 /**
- * gnome_gconf_lazy_init
+ * gnome_gconf_lazy_init:
  *
  * Description:  Internal libgnome/ui routine.  You never have
  * to do this from your code.  But all places in libgnome/ui

Modified: trunk/libgnome/gnome-help.c
==============================================================================
--- trunk/libgnome/gnome-help.c	(original)
+++ trunk/libgnome/gnome-help.c	Sun Apr 27 10:29:13 2008
@@ -26,16 +26,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-
 #include <string.h>
+
 #include <glib.h>
 #include <glib/gstdio.h>
-
 #include <glib/gi18n-lib.h>
 
-#include "gnome-program.h"
 #include "gnome-url.h"
-
 #include "gnome-help.h"
 
 static char *

Modified: trunk/libgnome/gnome-init.c
==============================================================================
--- trunk/libgnome/gnome-init.c	(original)
+++ trunk/libgnome/gnome-init.c	Sun Apr 27 10:29:13 2008
@@ -38,13 +38,14 @@
 #include <glib.h>
 #include <glib/goption.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-i18n.h>
 
+#include "gnome-i18n.h"
 #include "gnome-init.h"
 #include "gnome-gconfP.h"
 #include "gnome-util.h"
 #include "gnome-sound.h"
 #include "gnome-triggers.h"
+#include "libgnome-private.h"
 
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo-activation/bonobo-activation-version.h>
@@ -52,8 +53,6 @@
 
 #include <libgnomevfs/gnome-vfs-init.h>
 
-#include "libgnome-private.h"
-
 /* implemented in gnome-sound.c */
 G_GNUC_INTERNAL extern void _gnome_sound_set_enabled (gboolean);
 

Modified: trunk/libgnome/gnome-open.c
==============================================================================
--- trunk/libgnome/gnome-open.c	(original)
+++ trunk/libgnome/gnome-open.c	Sun Apr 27 10:29:13 2008
@@ -1,13 +1,15 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n-lib.h>
+
 #include <stdio.h>
-#include <libgnome/gnome-url.h>
-#include <libgnome/gnome-program.h>
-#include <libgnome/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <glib/gi18n-lib.h>
+#include "gnome-url.h"
+#include "gnome-program.h"
+#include "gnome-init.h"
+
+#include <libgnomevfs/gnome-vfs-utils.h>
 
 int
 main (int argc, char *argv[])

Modified: trunk/libgnome/gnome-util.c
==============================================================================
--- trunk/libgnome/gnome-util.c	(original)
+++ trunk/libgnome/gnome-util.c	Sun Apr 27 10:29:13 2008
@@ -50,8 +50,8 @@
 #include <pwd.h>
 #endif
 #include <limits.h>
-#include <libgnome/gnome-program.h>
-#include <libgnome/gnome-util.h>
+#include "gnome-program.h"
+#include "gnome-util.h"
 
 #ifdef G_OS_WIN32
 #include <windows.h>

Modified: trunk/schemas/desktop_gnome_lockdown.schemas.in
==============================================================================
--- trunk/schemas/desktop_gnome_lockdown.schemas.in	(original)
+++ trunk/schemas/desktop_gnome_lockdown.schemas.in	Sun Apr 27 10:29:13 2008
@@ -94,5 +94,19 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/lockdown/disable_application_handlers</key>
+      <applyto>/desktop/gnome/lockdown/disable_application_handlers</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Disable URL and MIME type handlers</short>
+        <long>
+         Prevent running any URL or MIME type handler applications.
+        </long>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>