Attachment #215393 for bug #292867

View | Details | Raw Unified | Return to bug 292867
Collapse All | Expand All

Lines 375-381 Link Here

(-)lib/ephy-file-chooser.c~ (-1 lines)
375	* run.	375	* run.
376	*/	376	*/
377		377
378	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
379		378
380	if (persist_key != NULL)	379	if (persist_key != NULL)
381	{	380	{




#include "ephy-string.h"

#include <glib.h>
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>

{
	const char *uuid;

	/* Make sure the server process doesn't hog any mountpoints! */
	if (chdir ("/") < 0)
		g_warning ("Failed to chdir to /: %s", g_strerror (errno));

	/* See if we've been calling ourself, and abort if we have */
	uuid = g_getenv (EPHY_UUID_ENVVAR);
	if (uuid && strcmp (uuid, EPHY_UUID) == 0)

Return to bug 292867

Lines 33-39 Link Here

(-)lib/ephy-file-helpers.c~ (-5 lines)
33	#include "ephy-string.h"	33	#include "ephy-string.h"
34		34
35	#include <glib.h>	35	#include <glib.h>
36	#include <glib/gstdio.h>
37	#include <glib/gi18n.h>	36	#include <glib/gi18n.h>
38	#include <gio/gio.h>	37	#include <gio/gio.h>
39	#include <gio/gdesktopappinfo.h>	38	#include <gio/gdesktopappinfo.h>
Lines 264-273 Link Here
264	{	263	{
265	const char *uuid;	264	const char *uuid;
266		265
267	/* Make sure the server process doesn't hog any mountpoints! */
268	if (chdir ("/") < 0)
269	g_warning ("Failed to chdir to /: %s", g_strerror (errno));
270
271	/* See if we've been calling ourself, and abort if we have */	266	/* See if we've been calling ourself, and abort if we have */
272	uuid = g_getenv (EPHY_UUID_ENVVAR);	267	uuid = g_getenv (EPHY_UUID_ENVVAR);
273	if (uuid && strcmp (uuid, EPHY_UUID) == 0)	268	if (uuid && strcmp (uuid, EPHY_UUID) == 0)