nautilus-sendto r362 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Thu Oct 16 19:02:49 2008
New Revision: 362
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=362&view=rev

Log:
2008-10-16  Bastien Nocera  <hadess hadess net>

	* src/nautilus-sendto-command.c (nautilus_sendto_plugin_init):
	Check whether nautilus-sendto-command.c exists to check whether we're
	in the sources, otherwise it whinges when run from any sources that
	have a "plugins" subdir



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-sendto-command.c

Modified: trunk/src/nautilus-sendto-command.c
==============================================================================
--- trunk/src/nautilus-sendto-command.c	(original)
+++ trunk/src/nautilus-sendto-command.c	Thu Oct 16 19:02:49 2008
@@ -38,6 +38,7 @@
 #define NAUTILUS_SENDTO_STATUS_LABEL_TIMEOUT 10000
 
 #define UNINSTALLED_PLUGINDIR "plugins/.libs"
+#define UNINSTALLED_SOURCE "nautilus-sendto-command.c"
 
 /* Options */
 static gchar *default_url = NULL;
@@ -592,7 +593,8 @@
 	GError *err = NULL;
 	const char *plugindir;
 
-	if (g_file_test (UNINSTALLED_PLUGINDIR, G_FILE_TEST_IS_DIR) != FALSE)
+	if (g_file_test (UNINSTALLED_SOURCE, G_FILE_TEST_EXISTS) != FALSE &&
+	    g_file_test (UNINSTALLED_PLUGINDIR, G_FILE_TEST_IS_DIR) != FALSE)
 		plugindir = UNINSTALLED_PLUGINDIR;
 	else
 		plugindir = PLUGINDIR;