1999-08-08 David Martin <dmartina@usa.net>

* gtkedit/syntax.c (upgrade_syntax_file): Mark error strings for
	translation.

	* gtkedit/editmenu.c (edit_about_cmd): Mark text in "about" for
	translation as it used to be.

BUGS

@@ -3,7 +3,7 @@ Bugzilla: 3436
 bugs.gnome.org:
   Important: 1006, 1796
   Major cosmetic: 272/875, 487, 845, 899, 923, 1072/1336,
-		  1299, 1415, 1457, 1545, 1559, 1582
+		  1299, 1415, 1457, 1545, 1559
   Minor cosmetic: 55/208, 115, 308, 383, 398, 449, 479, 597, 781,
 		  874, 931, 956/1126, 1022.1, 1045, 1047, 904, 1329,
 		  1468, 1508, 1750

gnome/ChangeLog

@@ -1,5 +1,11 @@
 1999-08-13  Federico Mena Quintero  <federico@redhat.com>
 
+	* gscreen.c (rename_file_with_context): Moved the try_rename()
+	function from gdesktop.c over to here, and renamed it for general
+	use.
+	(panel_icon_renamed): Use rename_file_with_context().  BUGFIX:
+	GNOME bug tracker #1582.
+
 	* gscreen.c (panel_fill_panel_list): Select or unselect the rows
 	as appropriate, not just select them.  This is needed because the
 	clist changes the selection under us when appending rows.

gnome/gdesktop.c

@@ -915,31 +915,6 @@ set_icon_wmclass (DesktopIconInfo *dii)
 	XFree (h);
 }
 
-/* Renames a file using a file operation context */
-static int
-try_rename (char *source, char *dest)
-{
-	FileOpContext *ctx;
-	struct stat s;
-	long count;
-	double bytes;
-	int retval;
-
-	if (mc_lstat (source, &s) != 0)
-		return FILE_ABORT;
-
-	ctx = file_op_context_new ();
-	file_op_context_create_ui (ctx, OP_MOVE, FALSE);
-
-	count = 1;
-	bytes = s.st_size;
-
-	retval = move_file_file (ctx, source, dest, &count, &bytes);
-	file_op_context_destroy (ctx);
-
-	return retval;
-}
-
 /* Removes the Gtk and Gdk grabs that are present when editing a desktop icon */
 static void
 remove_editing_grab (DesktopIconInfo *dii)
@@ -975,7 +950,7 @@ text_changed (GnomeIconTextItem *iti, gpointer data)
 
 		dest = g_concat_dir_and_file (desktop_directory, new_name);
 
-		if (try_rename (source, dest) == FILE_CONT) {
+		if (rename_file_with_context (source, dest) == FILE_CONT) {
 			GList *icons;
 			GList *l;
 

gnome/gmain.h

@@ -47,6 +47,7 @@ void x_show_info (WInfo *info, struct my_statfs *s, struct stat *b);
 void x_create_info (Dlg_head *h, widget_data parent, WInfo *info);
 void gnome_check_super_user (void);
 gint create_new_menu_from (char *file, GtkWidget *shell, gint pos);
+int rename_file_with_context (char *source, char *dest);
 
 /*
  * stuff from gaction.c

gnome/gscreen.c

@@ -27,6 +27,7 @@
 #include "dir.h"
 #include "dialog.h"
 #include "setup.h"
+#include "file.h"
 #include "fileopctx.h"
 #include "gdesktop.h"
 #include "gdnd.h"
@@ -1431,20 +1432,54 @@ queue_reread_cmd (gpointer data)
 	return FALSE;
 }
 
+/* Renames a file using a file operation context.  Returns FILE_CONT on success. */
+int
+rename_file_with_context (char *source, char *dest)
+{
+	FileOpContext *ctx;
+	struct stat s;
+	long count;
+	double bytes;
+	int retval;
+
+	if (mc_lstat (source, &s) != 0)
+		return FILE_ABORT;
+
+	ctx = file_op_context_new ();
+	file_op_context_create_ui (ctx, OP_MOVE, FALSE);
+
+	count = 1;
+	bytes = s.st_size;
+
+	retval = move_file_file (ctx, source, dest, &count, &bytes);
+	file_op_context_destroy (ctx);
+
+	return retval;
+}
+
 static int
 panel_icon_renamed (GtkWidget *widget, int index, char *dest, WPanel *panel)
 {
 	char *source;
+	char *fullname;
+	int retval;
 
-	source = panel->dir.list [index].fname;
-	if (mc_rename (source, dest) == 0){
+	source = g_concat_dir_and_file (cpanel->cwd, panel->dir.list [index].fname);
+	fullname = g_concat_dir_and_file (cpanel->cwd, dest);
+
+	if (rename_file_with_context (source, dest) == FILE_CONT) {
 		g_free (panel->dir.list [index].fname);
 		panel->dir.list [index].fname = g_strdup (dest);
 
 		gtk_idle_add (queue_reread_cmd, NULL);
-		return TRUE;
+		retval = TRUE;
 	} else
-		return FALSE;
+		retval = FALSE;
+
+	g_free (source);
+	g_free (fullname);
+
+	return retval;
 }
 
 /* Callback for rescanning the cwd */

gnome/gtkdtree.c

@@ -156,7 +156,7 @@ gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int leve
 		return FALSE;
 	}
 
-	for (; (dirent = tree_store_readdir (dir)) != NULL; ){
+	while ((dirent = tree_store_readdir (dir)) != NULL) {
 		GtkCTreeNode *sibling;
 		char *text;
 
@@ -226,8 +226,6 @@ scan_subtree (GtkDTree *dtree, GtkCTreeNode *row)
 
 	dtree->loading_dir--;
 	scan_end (dtree);
-
-	return TRUE;
 }
 
 static void
@@ -335,11 +333,11 @@ gtk_dtree_do_select_dir (GtkDTree *dtree, char *path)
 
 	if (current_node) {
 		gtk_ctree_select (GTK_CTREE (dtree), current_node);
-		if (gtk_ctree_node_is_visible (GTK_CTREE (dtree), current_node) != GTK_VISIBILITY_FULL){
+		if (gtk_ctree_node_is_visible (GTK_CTREE (dtree), current_node)
+		    != GTK_VISIBILITY_FULL)
 			gtk_ctree_node_moveto (GTK_CTREE (dtree), current_node, 0, 0.5, 0.0);
 	}
 
-	}
 	if (dtree->current_path) {
 		g_free (dtree->current_path);
 		dtree->current_path = g_strdup (path);