Commit 0ee0b717 authored by Darin Adler's avatar Darin Adler

Tweak to match Nautilus coding style.

	* libnautilus-extensions/nautilus-file-operations.h:
	* libnautilus-extensions/nautilus-file-operations.c:
	* src/nautilus-first-time-druid.h:
	Tweak to match Nautilus coding style.

	* src/nautilus-first-time-druid.c: (druid_cancel): Added FIXME
	about the way it quits Nautilus when you cancel.
	(druid_finished): Use #define constants instead of hard-coded
	URLs.
	(make_anti_aliased_label): Put FIXME where a font and size are
	hard-coded.
	(make_hbox_user_level_radio_button): Put FIXME where a font is
	hard-coded.
	(set_up_user_level_page): Put FIXME where a font size is
	hard-coded.
	(next_update_page_callback): Put FIXME where a comment mentions
	a "timer task" that does not exist.
	(nautilus_first_time_druid_show), (download_callback),
	(read_file_handle_cancel_cover), (initiate_file_download): Got rid
	of "cheap workaround" for when the druid goes away; instead, we
	cancel the I/O.

	Other tweaks to be at least in the vicinity of Nautilus coding
	style.
parent 197db577
2000-11-07 Darin Adler <darin@eazel.com>
* libnautilus-extensions/nautilus-file-operations.h:
* libnautilus-extensions/nautilus-file-operations.c:
* src/nautilus-first-time-druid.h:
Tweak to match Nautilus coding style.
* src/nautilus-first-time-druid.c: (druid_cancel): Added FIXME
about the way it quits Nautilus when you cancel.
(druid_finished): Use #define constants instead of hard-coded
URLs.
(make_anti_aliased_label): Put FIXME where a font and size are
hard-coded.
(make_hbox_user_level_radio_button): Put FIXME where a font is
hard-coded.
(set_up_user_level_page): Put FIXME where a font size is
hard-coded.
(next_update_page_callback): Put FIXME where a comment mentions
a "timer task" that does not exist.
(nautilus_first_time_druid_show), (download_callback),
(read_file_handle_cancel_cover), (initiate_file_download): Got rid
of "cheap workaround" for when the druid goes away; instead, we
cancel the I/O.
Other tweaks to be at least in the vicinity of Nautilus coding
style.
2000-11-07 Maciej Stachowiak <mjs@eazel.com>
* nautilus-installer/src/prescript: Make the installer run
......
......@@ -114,7 +114,8 @@ char *
nautilus_convert_to_unescaped_string_for_display (char *escaped)
{
char *result;
if (!escaped) {
if (escaped == NULL) {
return NULL;
}
result = gnome_vfs_unescape_string_for_display (escaped);
......
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-operatoins: execute file operations.
/* nautilus-file-operations: execute file operations.
Copyright (C) 1999, 2000 Free Software Foundation
......@@ -21,34 +22,37 @@
Author: Ettore Perazzoli <ettore@gnu.org>
*/
#ifndef _NAUTILUS_FILE_OPERATIONS_H
#define _NAUTILUS_FILE_OPERATIONS_H
#ifndef NAUTILUS_FILE_OPERATIONS_H
#define NAUTILUS_FILE_OPERATIONS_H
#include <libgnomevfs/gnome-vfs.h>
void nautilus_file_operations_copy_move (const GList *item_uris,
const GdkPoint *target_item_points,
const char *target_dir,
int copy_action,
GtkWidget *parent_view,
void (*done_callback) (GHashTable *debuting_uris, gpointer data),
gpointer done_callback_data);
void nautilus_file_operations_move_to_trash (const GList *item_uris,
GtkWidget *parent_view);
void nautilus_file_operations_empty_trash (GtkWidget *parent_view);
void nautilus_file_operations_new_folder (GtkWidget *parent_view,
const char *parent_dir,
void (*done_callback)(const char *new_folder_uri, gpointer data),
gpointer data);
void nautilus_file_operations_delete (const GList *item_uris, GtkWidget *parent_view);
typedef void (* NautilusCopyCallback) (GHashTable *debuting_uris,
gpointer callback_data);
typedef void (* NautilusNewFolderCallback) (const char *new_folder_uri,
gpointer callback_data);
void nautilus_file_operations_copy_move (const GList *item_uris,
const GdkPoint *target_item_points,
const char *target_dir_uri,
int copy_action,
GtkWidget *parent_view,
NautilusCopyCallback done_callback,
gpointer done_callback_data);
void nautilus_file_operations_move_to_trash (const GList *item_uris,
GtkWidget *parent_view);
void nautilus_file_operations_empty_trash (GtkWidget *parent_view);
void nautilus_file_operations_new_folder (GtkWidget *parent_view,
const char *parent_dir_uri,
NautilusNewFolderCallback done_callback,
gpointer done_callback_data);
void nautilus_file_operations_delete (const GList *item_uris,
GtkWidget *parent_view);
/* Prepare an escaped string for display. Unescapes a string in place.
* Frees the original string.
* Like gnome_vfs_unescape_string_for_display but frees the original
* string.
*/
char *nautilus_convert_to_unescaped_string_for_display (char *escaped);
#endif /* _NAUTILUS_FILE_OPERATIONS_H */
char *nautilus_convert_to_unescaped_string_for_display (char *escaped);
#endif /* NAUTILUS_FILE_OPERATIONS_H */
......@@ -114,7 +114,8 @@ char *
nautilus_convert_to_unescaped_string_for_display (char *escaped)
{
char *result;
if (!escaped) {
if (escaped == NULL) {
return NULL;
}
result = gnome_vfs_unescape_string_for_display (escaped);
......
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* nautilus-file-operatoins: execute file operations.
/* nautilus-file-operations: execute file operations.
Copyright (C) 1999, 2000 Free Software Foundation
......@@ -21,34 +22,37 @@
Author: Ettore Perazzoli <ettore@gnu.org>
*/
#ifndef _NAUTILUS_FILE_OPERATIONS_H
#define _NAUTILUS_FILE_OPERATIONS_H
#ifndef NAUTILUS_FILE_OPERATIONS_H
#define NAUTILUS_FILE_OPERATIONS_H
#include <libgnomevfs/gnome-vfs.h>
void nautilus_file_operations_copy_move (const GList *item_uris,
const GdkPoint *target_item_points,
const char *target_dir,
int copy_action,
GtkWidget *parent_view,
void (*done_callback) (GHashTable *debuting_uris, gpointer data),
gpointer done_callback_data);
void nautilus_file_operations_move_to_trash (const GList *item_uris,
GtkWidget *parent_view);
void nautilus_file_operations_empty_trash (GtkWidget *parent_view);
void nautilus_file_operations_new_folder (GtkWidget *parent_view,
const char *parent_dir,
void (*done_callback)(const char *new_folder_uri, gpointer data),
gpointer data);
void nautilus_file_operations_delete (const GList *item_uris, GtkWidget *parent_view);
typedef void (* NautilusCopyCallback) (GHashTable *debuting_uris,
gpointer callback_data);
typedef void (* NautilusNewFolderCallback) (const char *new_folder_uri,
gpointer callback_data);
void nautilus_file_operations_copy_move (const GList *item_uris,
const GdkPoint *target_item_points,
const char *target_dir_uri,
int copy_action,
GtkWidget *parent_view,
NautilusCopyCallback done_callback,
gpointer done_callback_data);
void nautilus_file_operations_move_to_trash (const GList *item_uris,
GtkWidget *parent_view);
void nautilus_file_operations_empty_trash (GtkWidget *parent_view);
void nautilus_file_operations_new_folder (GtkWidget *parent_view,
const char *parent_dir_uri,
NautilusNewFolderCallback done_callback,
gpointer done_callback_data);
void nautilus_file_operations_delete (const GList *item_uris,
GtkWidget *parent_view);
/* Prepare an escaped string for display. Unescapes a string in place.
* Frees the original string.
* Like gnome_vfs_unescape_string_for_display but frees the original
* string.
*/
char *nautilus_convert_to_unescaped_string_for_display (char *escaped);
#endif /* _NAUTILUS_FILE_OPERATIONS_H */
char *nautilus_convert_to_unescaped_string_for_display (char *escaped);
#endif /* NAUTILUS_FILE_OPERATIONS_H */
This diff is collapsed.
......@@ -29,12 +29,11 @@
#ifndef NAUTILUS_FIRST_TIME_DRUID_H
#define NAUTILUS_FIRST_TIME_DRUID_H
#include <glib.h>
#include <gtk/gtkwidget.h>
#include "nautilus-application.h"
GtkWidget *nautilus_first_time_druid_show (NautilusApplication *application,
gboolean manage_desktop,
const char *urls[]);
gboolean manage_desktop,
const char *urls[]);
#endif /* NAUTILUS_FIRST_TIME_DRUID_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment