gnome-panel r10890 - in trunk: . gnome-panel

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 25 13:19:14 2008
New Revision: 10890
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10890&view=rev

Log:
2008-02-25  Alexander Larsson  <alexl redhat com>

	* launcher.c (panel_launcher_delete):
	Use g_file_has_prefix instead of renamed
	g_file_contains_file.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/launcher.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb 25 13:19:14 2008
@@ -51,7 +51,7 @@
 LIBGNOME_DESKTOP_REQUIRED=2.11.1
 GDK_PIXBUF_REQUIRED=2.7.1
 PANGO_REQUIRED=1.15.4
-GLIB_REQUIRED=2.15.5
+GLIB_REQUIRED=2.15.6
 GTK_REQUIRED=2.11.3
 LIBGLADE_REQUIRED=2.5.0
 LIBGNOME_REQUIRED=2.13.0

Modified: trunk/gnome-panel/launcher.c
==============================================================================
--- trunk/gnome-panel/launcher.c	(original)
+++ trunk/gnome-panel/launcher.c	Mon Feb 25 13:19:14 2008
@@ -356,7 +356,7 @@
 	file = panel_launcher_get_gfile (launcher->location);
 
 	/* do not remove the file if it's not in the user's launchers path */
-	if (g_file_contains_file (launchers, file)) {
+	if (g_file_has_prefix (file, launchers)) {
 		GError *error;
 
 		error = NULL;