gedit r6818 - in trunk: . gedit

[icq svn gnome org]

Author: icq
Date: Tue Jan  6 22:28:35 2009
New Revision: 6818
URL: http://svn.gnome.org/viewvc/gedit?rev=6818&view=rev

Log:
2009-01-06  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-window.c:
        Fix bug showing warning.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-window.c

Modified: trunk/gedit/gedit-window.c
==============================================================================
--- trunk/gedit/gedit-window.c	(original)
+++ trunk/gedit/gedit-window.c	Tue Jan  6 22:28:35 2009
@@ -1391,12 +1391,12 @@
 	/* now load the UI definition */
 	ui_file = gedit_dirs_get_ui_file (GEDIT_UIFILE);
 	gtk_ui_manager_add_ui_from_file (manager, ui_file, &error);
-	g_free (ui_file);
 	if (error != NULL)
 	{
-		g_warning ("Could not merge %s: %s", GEDIT_UIFILE, error->message);
+		g_warning ("Could not merge %s: %s", ui_file, error->message);
 		g_error_free (error);
 	}
+	g_free (ui_file);
 
 	/* show tooltips in the statusbar */
 	g_signal_connect (manager,