Attachment #458878 for bug #604720

View | Details | Raw Unified | Return to bug 604720
Collapse All | Expand All

Lines 21-27 Link Here

(-)a/src/nautilus-batch-rename-utilities.h (+2 lines)
21		21
22	#include <gio/gio.h>	22	#include <gio/gio.h>
23	#include <gtk/gtk.h>	23	#include <gtk/gtk.h>
		24	#ifdef ENABLE_TRACKER
24	#include <tracker-sparql.h>	25	#include <tracker-sparql.h>
		26	#endif
25		27
26	GList* batch_rename_dialog_get_new_names_list (NautilusBatchRenameDialogMode mode,	28	GList* batch_rename_dialog_get_new_names_list (NautilusBatchRenameDialogMode mode,
27	GList *selection,	29	GList *selection,

Lines 1087-1092 nautilus_file_undo_info_rename_set_data_post (NautilusFileUndoInfoRename *self, Link Here

(-)a/src/nautilus-file-undo-operations.c (+2 lines)
1087	}	1087	}
1088		1088
1089	/* batch rename */	1089	/* batch rename */
		1090	#ifdef ENABLE_TRACKER
1090	G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO);	1091	G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO);
1091		1092
1092	struct _NautilusFileUndoInfoBatchRenameDetails	1093	struct _NautilusFileUndoInfoBatchRenameDetails
Lines 1303-1308 nautilus_file_undo_info_batch_rename_set_data_post (NautilusFileUndoInfoBatchRen Link Here
1303		1304
1304	self->priv->new_display_names = g_list_reverse (self->priv->new_display_names);	1305	self->priv->new_display_names = g_list_reverse (self->priv->new_display_names);
1305	}	1306	}
		1307	#endif
1306		1308
1307	/* trash */	1309	/* trash */
1308	G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)	1310	G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)




    NautilusFile *file;
} BatchRenameData;

#ifdef ENABLE_TRACKER
static void
batch_rename_get_info_callback (GObject      *source_object,
                                GAsyncResult *res,

        g_error_free (error);
    }
}
#endif

static void
rename_callback (GObject      *source_object,

    return new_file_name;
}

#ifdef ENABLE_TRACKER
static void
real_batch_rename (GList                         *files,
                   GList                         *new_names,

        nautilus_file_operation_complete (op, NULL, error);
    }
}
#endif

gboolean
nautilus_file_rename_handle_file_gone (NautilusFile                  *file,

    return FALSE;
}

#ifdef ENABLE_TRACKER
void
nautilus_file_batch_rename (GList                         *files,
                            GList                         *new_names,

                       callback,
                       callback_data);
}
#endif

static void
real_rename (NautilusFile                  *file,
- 

Return to bug 604720

Lines 1996-2001 typedef struct Link Here

(-)a/src/nautilus-file.c (-1 / +6 lines)
1996	NautilusFile *file;	1996	NautilusFile *file;
1997	} BatchRenameData;	1997	} BatchRenameData;
1998		1998
		1999	#ifdef ENABLE_TRACKER
1999	static void	2000	static void
2000	batch_rename_get_info_callback (GObject *source_object,	2001	batch_rename_get_info_callback (GObject *source_object,
2001	GAsyncResult *res,	2002	GAsyncResult *res,
Lines 2077-2082 batch_rename_get_info_callback (GObject *source_object, Link Here
2077	g_error_free (error);	2078	g_error_free (error);
2078	}	2079	}
2079	}	2080	}
		2081	#endif
2080		2082
2081	static void	2083	static void
2082	rename_callback (GObject *source_object,	2084	rename_callback (GObject *source_object,
Lines 2272-2277 nautilus_file_can_rename_file (NautilusFile *file, Link Here
2272	return new_file_name;	2274	return new_file_name;
2273	}	2275	}
2274		2276
		2277	#ifdef ENABLE_TRACKER
2275	static void	2278	static void
2276	real_batch_rename (GList *files,	2279	real_batch_rename (GList *files,
2277	GList *new_names,	2280	GList *new_names,
Lines 2380-2385 real_batch_rename (GList *files, Link Here
2380	nautilus_file_operation_complete (op, NULL, error);	2383	nautilus_file_operation_complete (op, NULL, error);
2381	}	2384	}
2382	}	2385	}
		2386	#endif
2383		2387
2384	gboolean	2388	gboolean
2385	nautilus_file_rename_handle_file_gone (NautilusFile *file,	2389	nautilus_file_rename_handle_file_gone (NautilusFile *file,
Lines 2407-2412 nautilus_file_rename_handle_file_gone (NautilusFile *file, Link Here
2407	return FALSE;	2411	return FALSE;
2408	}	2412	}
2409		2413
		2414	#ifdef ENABLE_TRACKER
2410	void	2415	void
2411	nautilus_file_batch_rename (GList *files,	2416	nautilus_file_batch_rename (GList *files,
2412	GList *new_names,	2417	GList *new_names,
Lines 2418-2423 nautilus_file_batch_rename (GList *files, Link Here
2418	callback,	2423	callback,
2419	callback_data);	2424	callback_data);
2420	}	2425	}
		2426	#endif
2421		2427
2422	static void	2428	static void
2423	real_rename (NautilusFile *file,	2429	real_rename (NautilusFile *file,
2424	-