bring the branch up in sync with 2.12.1, and tag it asNAUTILUS_SEARCH_2_12_1_MERGEPOINTNAUTILUS_SEARCH2_BRANCH_ANCHORnautilus-search

NAUTILUS_SEARCH_2_12_2_MERGEPOINT

1 files changed, 0 insertions, 69 deletions

diff --git a/capplets/common/file-transfer-dialog.h b/capplets/common/file-transfer-dialog.h
deleted file mode 100644
index 2ef095804..000000000
--- a/capplets/common/file-transfer-dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- mode: c; style: linux -*- */
-
-/* file-transfer-dialog.h
- * Copyright (C) 2002 Ximian, Inc.
- *
- * Written by Rachel Hestilow <hestilow@ximian.com> 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __FILE_TRANSFER_DIALOG_H__
-#define __FILE_TRANSFER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <libgnomevfs/gnome-vfs-xfer.h>
-
-G_BEGIN_DECLS
-
-#define FILE_TRANSFER_DIALOG(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, file_transfer_dialog_get_type (), FileTransferDialog)
-#define FILE_TRANSFER_DIALOG_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, file_transfer_dialog_get_type (), FileTransferDialogClass)
-#define IS_FILE_TRANSFER_DIALOG(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, file_transfer_dialog_get_type ())
-
-typedef struct _FileTransferDialog FileTransferDialog;
-typedef struct _FileTransferDialogClass FileTransferDialogClass;
-typedef struct _FileTransferDialogPrivate FileTransferDialogPrivate;
-
-struct _FileTransferDialog
-{
-	GtkDialog dialog;
-
-	FileTransferDialogPrivate *priv;
-};
-
-struct _FileTransferDialogClass
-{
-	GtkDialogClass parent_class;
-
-	void (*cancel) (FileTransferDialog *dlg);
-	void (*done) (FileTransferDialog *dlg);
-};
-
-GType	       file_transfer_dialog_get_type (void);
-GtkWidget*     file_transfer_dialog_new (void);
-
-GnomeVFSResult file_transfer_dialog_wrap_async_xfer (FileTransferDialog *dlg,
-						     GList *source_uri_list,
-						     GList *target_uri_list,
-						     GnomeVFSXferOptions xfer_options,
-						     GnomeVFSXferErrorMode error_mode,
-						     GnomeVFSXferOverwriteMode overwrite_mode,
-						     int priority);
-
-
-G_END_DECLS
-
-#endif /* __FILE_TRANSFER_DIALOG_H__ */