From 6c10f8f9ec39b11991e69a671b8673a8c1922c32 Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Sat, 23 Dec 2000 00:02:41 +0000 Subject: reviewed by: Pavel Cisler Fixed bug 5065 (When Nautilus moves a directory it doesn't rename the corresponding private metafile). Fixed bug 5066 (Moving a directory doesn't update infomrration about child directories in Nautilus). Fixed bug 5297 (Make all (C) strings use gettext). * libnautilus-extensions/nautilus-directory-metafile.c: (nautilus_directory_rename_file_metadata), (nautilus_directory_remove_file_metadata): Add check for NULL hash table. Without this check we kept running into asserts. * libnautilus-extensions/nautilus-directory-private.h: * libnautilus-extensions/nautilus-directory.c: (nautilus_directory_new): Share URI-setup code with the renaming case. (set_directory_uri): New function shared with new directories and renaming. (get_path_from_vfs_uri), (get_private_metafile_path): Utility functions to help get local paths for private metafiles. (change_directory_uri): Update URI for an existing NautilusDirectory object. This handles renaming the private metafile too. (collect_directories_by_prefix): Function to collect affected directories when you rename a directory. (str_replace_prefix): Utility to replace string prefix so we can turn old directory name into the new one. (nautilus_directory_moved): Renamed and changed to use URIs instead of a directory object so it can be called even when no directory exists. Also made it collect all affected directories and do the work with change_directory_uri on each one. * libnautilus-extensions/nautilus-file.c: (rename_callback): Use the new nautilus_directory_moved. * libnautilus-extensions/nautilus-file-utilities.h: * libnautilus-extensions/nautilus-file-utilities.c: (nautilus_get_build_time_stamp): * src/nautilus-about.h: * src/nautilus-about.c: (nautilus_about_new), (nautilus_about_draw_info): * src/nautilus-window-manage-views.c: (window_set_title_with_time_stamp), (update_title): * src/nautilus-window-menus.c: (help_menu_about_nautilus_callback): Rename "timestamp" -> "time stamp". * src/nautilus-window-menus.c: (help_menu_about_nautilus_callback): Mark "(C)" string for translation. --- src/nautilus-about.h | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'src/nautilus-about.h') diff --git a/src/nautilus-about.h b/src/nautilus-about.h index 79f733254..9920fa549 100644 --- a/src/nautilus-about.h +++ b/src/nautilus-about.h @@ -31,15 +31,11 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #define NAUTILUS_TYPE_ABOUT (nautilus_about_get_type ()) #define NAUTILUS_ABOUT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ABOUT, NautilusAbout)) #define NAUTILUS_ABOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ABOUT, NautilusAboutClass)) -#define NAUTILUS_IS_ABOUT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ABOUT)) -#define NAUTILUS_IS_ABOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ABOUT)) +#define NAUTILUS_IS_ABOUT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ABOUT)) +#define NAUTILUS_IS_ABOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ABOUT)) typedef struct NautilusAbout NautilusAbout; typedef struct NautilusAboutClass NautilusAboutClass; @@ -54,19 +50,13 @@ struct NautilusAboutClass { GnomeDialogClass parent_class; }; -GtkType nautilus_about_get_type (void); - -GtkWidget* nautilus_about_new (const gchar *title, /* Name of the application. */ - const char *version, /* Version. */ - const char *copyright, /* Copyright notice */ - const char **authors, /* NULL terminated list of authors. */ - const char *comments, /* Other comments. */ - const char *timestamp /* date and time of build */ - ); -void nautilus_about_update_authors (NautilusAbout *about); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +GtkType nautilus_about_get_type (void); +GtkWidget *nautilus_about_new (const char *title, + const char *version, + const char *copyright, + const char **authors, + const char *comments, + const char *time_stamp); +void nautilus_about_update_authors (NautilusAbout *about); #endif /* NAUTILUS_ABOUT_H */ -- cgit v1.2.1