SF.net SVN: geany:[5089] trunk

[ntrel at users.sourceforge.net]

Revision: 5089
          http://geany.svn.sourceforge.net/geany/?rev=5089&view=rev
Author:   ntrel
Date:     2010-07-05 12:03:27 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Don't unnecessarily test G_FILE_TEST_IS_SYMLINK when testing
G_FILE_TEST_IS_REGULAR (patch by Dimitar Zhekov, thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c
    trunk/src/keyfile.c
    trunk/src/main.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-05 11:59:08 UTC (rev 5088)
+++ trunk/ChangeLog	2010-07-05 12:03:27 UTC (rev 5089)
@@ -2,6 +2,9 @@
 
  * src/sidebar.c:
    Add sidebar Documents popup menu item 'Find in Files'.
+ * src/keyfile.c, src/main.c, src/editor.c:
+   Don't unnecessarily test G_FILE_TEST_IS_SYMLINK when testing
+   G_FILE_TEST_IS_REGULAR (patch by Dimitar Zhekov, thanks).
 
 
 2010-07-02  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2010-07-05 11:59:08 UTC (rev 5088)
+++ trunk/src/editor.c	2010-07-05 12:03:27 UTC (rev 5089)
@@ -145,7 +145,7 @@
 	userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "snippets.conf", NULL);
 
 	/* check for old autocomplete.conf files (backwards compatibility) */
-	if (! g_file_test(userconfigfile, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+	if (! g_file_test(userconfigfile, G_FILE_TEST_IS_REGULAR))
 		setptr(userconfigfile,
 			g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "autocomplete.conf", NULL));
 

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2010-07-05 11:59:08 UTC (rev 5088)
+++ trunk/src/keyfile.c	2010-07-05 12:03:27 UTC (rev 5089)
@@ -935,7 +935,7 @@
 	gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL);
 	GKeyFile *config = g_key_file_new();
 
-	if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+	if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR))
 	{	/* config file does not (yet) exist, so try to load a global config file which may be */
 		/* created by distributors */
 		geany_debug("No user config file found, trying to use global configuration.");
@@ -984,7 +984,7 @@
 	if (len > 8)
 		line_breaking = atoi(tmp[8]);
 
-	if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+	if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR))
 	{
 		GeanyFiletype *ft = filetypes_lookup_by_name(ft_name);
 		GeanyDocument *doc = document_open_file_full(

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2010-07-05 11:59:08 UTC (rev 5088)
+++ trunk/src/main.c	2010-07-05 12:03:27 UTC (rev 5089)
@@ -758,7 +758,7 @@
 	if (column >= 0)
 		cl_options.goto_column = column;
 
-	if (g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+	if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
 	{
 		doc = document_open_file(filename, FALSE, NULL, NULL);
 		/* add recent file manually if opening_session_files is set */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.