diff options
58 files changed, 142 insertions, 84 deletions
@@ -1,3 +1,61 @@ +2003-02-04 Alexander Larsson <alexl@redhat.com> + + * components/adapter/nautilus-adapter-control-embed-strategy.h: + * components/adapter/nautilus-adapter-embed-strategy.h: + * components/adapter/nautilus-adapter-file-load-strategy.h: + * components/adapter/nautilus-adapter-load-strategy.h: + * components/adapter/nautilus-adapter-stream-load-strategy.h: + * components/adapter/nautilus-adapter.h: + * components/adapter/nautilus-zoomable-proxy.c: + * components/emblem/nautilus-emblem-view.h: + * components/hardware/nautilus-hardware-view.h: + * components/loser/content/nautilus-content-loser.h: + * components/loser/sidebar/nautilus-sidebar-loser.h: + * components/music/nautilus-music-view.h: + * components/news/nautilus-cell-renderer-news.c: + * components/text/nautilus-text-view.h: + * components/throbber/nautilus-throbber.h: + * libnautilus-private/nautilus-directory-metafile-monitor.h: + * libnautilus-private/nautilus-directory.h: + * libnautilus-private/nautilus-entry.h: + * libnautilus-private/nautilus-file.h: + * libnautilus-private/nautilus-horizontal-splitter.h: + * libnautilus-private/nautilus-icon-canvas-item.h: + * libnautilus-private/nautilus-keep-last-vertical-box.h: + * libnautilus-private/nautilus-merged-directory.h: + * libnautilus-private/nautilus-metafile.h: + * libnautilus-private/nautilus-program-chooser.h: + * libnautilus-private/nautilus-trash-directory.h: + * libnautilus-private/nautilus-trash-file.h: + * libnautilus-private/nautilus-vfs-directory.h: + * libnautilus-private/nautilus-vfs-file.h: + * libnautilus-private/nautilus-volume-monitor.h: + * libnautilus/nautilus-view-standard-main.c: + * libnautilus/nautilus-view.h: + * src/file-manager/fm-desktop-icon-view.h: + * src/file-manager/fm-directory-view.h: + * src/file-manager/fm-icon-view.h: + * src/file-manager/fm-properties-window.h: + * src/file-manager/fm-search-list-view.h: + * src/nautilus-bookmark-list.h: + * src/nautilus-complex-search-bar.h: + * src/nautilus-component-adapter-factory.h: + * src/nautilus-desktop-window.h: + * src/nautilus-information-panel.h: + * src/nautilus-location-bar.h: + * src/nautilus-navigation-bar.h: + * src/nautilus-property-browser.h: + * src/nautilus-search-bar-criterion.h: + * src/nautilus-search-bar.h: + * src/nautilus-sidebar-title.h: + * src/nautilus-simple-search-bar.h: + * src/nautilus-switchable-navigation-bar.h: + * src/nautilus-switchable-search-bar.h: + * src/nautilus-view-frame.h: + * src/nautilus-window.h: + * src/nautilus-zoom-control.h: + Change GtkType to GType, patch by Christian Meyer <chrisime@uni.de> + 2003-02-03 David Bordoley <bordoley@msu.edu> * lbnautilus-private/nautilus-file-operations.c diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.h b/components/adapter/nautilus-adapter-control-embed-strategy.h index 0d0f2c614..c0c8de3d1 100644 --- a/components/adapter/nautilus-adapter-control-embed-strategy.h +++ b/components/adapter/nautilus-adapter-control-embed-strategy.h @@ -46,8 +46,8 @@ typedef struct { NautilusAdapterEmbedStrategyClass parent; } NautilusAdapterControlEmbedStrategyClass; -/* GtkObject support */ -GtkType nautilus_adapter_control_embed_strategy_get_type (void); +/* GObject support */ +GType nautilus_adapter_control_embed_strategy_get_type (void); NautilusAdapterEmbedStrategy *nautilus_adapter_control_embed_strategy_new (Bonobo_Control control, Bonobo_UIContainer ui_container); diff --git a/components/adapter/nautilus-adapter-embed-strategy.h b/components/adapter/nautilus-adapter-embed-strategy.h index e6218834e..af97bf37b 100644 --- a/components/adapter/nautilus-adapter-embed-strategy.h +++ b/components/adapter/nautilus-adapter-embed-strategy.h @@ -59,19 +59,19 @@ typedef struct { } NautilusAdapterEmbedStrategyClass; -/* GtkObject support */ -GtkType nautilus_adapter_embed_strategy_get_type (void); +/* GObject support */ +GType nautilus_adapter_embed_strategy_get_type (void); /* Instantiates the proper concrete subclass */ -NautilusAdapterEmbedStrategy *nautilus_adapter_embed_strategy_get (Bonobo_Unknown component); +NautilusAdapterEmbedStrategy *nautilus_adapter_embed_strategy_get (Bonobo_Unknown component); -void nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy, - Bonobo_UIContainer ui_container); -void nautilus_adapter_embed_strategy_deactivate(NautilusAdapterEmbedStrategy *strategy); +void nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy, + Bonobo_UIContainer ui_container); +void nautilus_adapter_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *strategy); -GtkWidget *nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strategy); +GtkWidget *nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strategy); -BonoboObject *nautilus_adapter_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy); +BonoboObject *nautilus_adapter_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy); #endif /* NAUTILUS_ADAPTER_EMBED_STRATEGY_H */ diff --git a/components/adapter/nautilus-adapter-file-load-strategy.h b/components/adapter/nautilus-adapter-file-load-strategy.h index 8c7588da8..646c92360 100644 --- a/components/adapter/nautilus-adapter-file-load-strategy.h +++ b/components/adapter/nautilus-adapter-file-load-strategy.h @@ -46,8 +46,8 @@ typedef struct { NautilusAdapterLoadStrategyClass parent; } NautilusAdapterFileLoadStrategyClass; -/* GtkObject support */ -GtkType nautilus_adapter_file_load_strategy_get_type (void); +/* GObject support */ +GType nautilus_adapter_file_load_strategy_get_type (void); NautilusAdapterLoadStrategy *nautilus_adapter_file_load_strategy_new (Bonobo_PersistFile persist_file); diff --git a/components/adapter/nautilus-adapter-load-strategy.h b/components/adapter/nautilus-adapter-load-strategy.h index 2bf9e6d84..c88a73bc5 100644 --- a/components/adapter/nautilus-adapter-load-strategy.h +++ b/components/adapter/nautilus-adapter-load-strategy.h @@ -60,8 +60,8 @@ typedef struct { void (*stop_loading) (NautilusAdapterLoadStrategy *strategy); } NautilusAdapterLoadStrategyClass; -/* GtkObject support */ -GtkType nautilus_adapter_load_strategy_get_type (void); +/* GObject support */ +GType nautilus_adapter_load_strategy_get_type (void); /* Instantiates the proper concrete subclass */ NautilusAdapterLoadStrategy *nautilus_adapter_load_strategy_get (Bonobo_Unknown component); diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.h b/components/adapter/nautilus-adapter-stream-load-strategy.h index 7f4bb68ad..b02666f65 100644 --- a/components/adapter/nautilus-adapter-stream-load-strategy.h +++ b/components/adapter/nautilus-adapter-stream-load-strategy.h @@ -46,8 +46,8 @@ typedef struct { NautilusAdapterLoadStrategyClass parent; } NautilusAdapterStreamLoadStrategyClass; -/* GtkObject support */ -GtkType nautilus_adapter_stream_load_strategy_get_type (void); +/* GObject support */ +GType nautilus_adapter_stream_load_strategy_get_type (void); NautilusAdapterLoadStrategy *nautilus_adapter_stream_load_strategy_new (Bonobo_PersistStream persist_stream); diff --git a/components/adapter/nautilus-adapter.h b/components/adapter/nautilus-adapter.h index 1b1662c6e..dcd14ef01 100644 --- a/components/adapter/nautilus-adapter.h +++ b/components/adapter/nautilus-adapter.h @@ -46,8 +46,8 @@ typedef struct { GtkObjectClass parent; } NautilusAdapterClass; -/* GtkObject support */ -GtkType nautilus_adapter_get_type (void); +/* GObject support */ +GType nautilus_adapter_get_type (void); NautilusAdapter *nautilus_adapter_new (Bonobo_Unknown component); NautilusView *nautilus_adapter_get_nautilus_view (NautilusAdapter *adapter); diff --git a/components/adapter/nautilus-zoomable-proxy.c b/components/adapter/nautilus-zoomable-proxy.c index b335ab355..a57aeb02e 100644 --- a/components/adapter/nautilus-zoomable-proxy.c +++ b/components/adapter/nautilus-zoomable-proxy.c @@ -267,7 +267,7 @@ nautilus_zoomable_proxy_init (NautilusZoomableProxy *proxy) /** * nautilus_zoomable_proxy_get_type: * - * Returns: the GtkType for a NautilusZoomableProxy object. + * Returns: the GType for a NautilusZoomableProxy object. */ GType nautilus_zoomable_proxy_get_type (void) diff --git a/components/emblem/nautilus-emblem-view.h b/components/emblem/nautilus-emblem-view.h index 8bb359fa8..9cb9507d6 100644 --- a/components/emblem/nautilus-emblem-view.h +++ b/components/emblem/nautilus-emblem-view.h @@ -52,6 +52,6 @@ typedef struct { } NautilusEmblemViewClass; -GtkType nautilus_emblem_view_get_type (void); +GType nautilus_emblem_view_get_type (void); #endif /* NAUTILUS_EMBLEM_VIEW_H */ diff --git a/components/hardware/nautilus-hardware-view.h b/components/hardware/nautilus-hardware-view.h index 727da068c..57cf3a79e 100644 --- a/components/hardware/nautilus-hardware-view.h +++ b/components/hardware/nautilus-hardware-view.h @@ -49,8 +49,8 @@ struct _NautilusHardwareViewClass { EelBackgroundBoxClass parent_class; }; -/* GtkObject support */ -GtkType nautilus_hardware_view_get_type (void); +/* GObject support */ +GType nautilus_hardware_view_get_type (void); /* Component embedding support */ BonoboObject *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *view); diff --git a/components/loser/content/nautilus-content-loser.h b/components/loser/content/nautilus-content-loser.h index 8b046ae5e..bb2215508 100644 --- a/components/loser/content/nautilus-content-loser.h +++ b/components/loser/content/nautilus-content-loser.h @@ -51,8 +51,8 @@ struct NautilusContentLoserClass { GtkLabelClass parent_class; }; -/* GtkObject support */ -GtkType nautilus_content_loser_get_type (void); +/* GObject support */ +GType nautilus_content_loser_get_type (void); /* Component embedding support */ NautilusView *nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view); diff --git a/components/loser/sidebar/nautilus-sidebar-loser.h b/components/loser/sidebar/nautilus-sidebar-loser.h index c9abccf6e..8a8f2c9b1 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.h +++ b/components/loser/sidebar/nautilus-sidebar-loser.h @@ -51,8 +51,8 @@ struct NautilusSidebarLoserClass { GtkLabelClass parent_class; }; -/* GtkObject support */ -GtkType nautilus_sidebar_loser_get_type (void); +/* GObject support */ +GType nautilus_sidebar_loser_get_type (void); /* Component embedding support */ NautilusView *nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view); diff --git a/components/music/nautilus-music-view.h b/components/music/nautilus-music-view.h index 7d557ea67..8edeface4 100644 --- a/components/music/nautilus-music-view.h +++ b/components/music/nautilus-music-view.h @@ -50,7 +50,7 @@ struct NautilusMusicViewClass { -/* GtkObject support */ -GtkType nautilus_music_view_get_type (void); +/* GObject support */ +GType nautilus_music_view_get_type (void); #endif /* NAUTILUS_MUSIC_VIEW_H */ diff --git a/components/news/nautilus-cell-renderer-news.c b/components/news/nautilus-cell-renderer-news.c index ad91f7ddd..c14f55a58 100644 --- a/components/news/nautilus-cell-renderer-news.c +++ b/components/news/nautilus-cell-renderer-news.c @@ -88,7 +88,7 @@ static gpointer parent_class; GType nautilus_cell_renderer_news_get_type (void) { - static GtkType cell_news_type = 0; + static GType cell_news_type = 0; if (!cell_news_type) { static const GTypeInfo cell_news_info = { diff --git a/components/text/nautilus-text-view.h b/components/text/nautilus-text-view.h index e81a6c3b1..498977c41 100644 --- a/components/text/nautilus-text-view.h +++ b/components/text/nautilus-text-view.h @@ -31,10 +31,10 @@ typedef struct NautilusTextView NautilusTextView; typedef struct NautilusTextViewClass NautilusTextViewClass; -#define NAUTILUS_TYPE_TEXT_VIEW (nautilus_text_view_get_type ()) -#define NAUTILUS_TEXT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_VIEW, NautilusTextView)) +#define NAUTILUS_TYPE_TEXT_VIEW (nautilus_text_view_get_type ()) +#define NAUTILUS_TEXT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_VIEW, NautilusTextView)) #define NAUTILUS_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TEXT_VIEW, NautilusTextViewClass)) -#define NAUTILUS_IS_TEXT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_VIEW)) +#define NAUTILUS_IS_TEXT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_VIEW)) #define NAUTILUS_IS_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_TEXT_VIEW)) typedef struct NautilusTextViewDetails NautilusTextViewDetails; @@ -50,8 +50,8 @@ struct NautilusTextViewClass { -/* GtkObject support */ -GtkType nautilus_text_view_get_type (void); +/* GObject support */ +GType nautilus_text_view_get_type (void); #endif /* NAUTILUS_TEXT_VIEW_H */ diff --git a/components/throbber/nautilus-throbber.h b/components/throbber/nautilus-throbber.h index af7fec964..0961749fc 100644 --- a/components/throbber/nautilus-throbber.h +++ b/components/throbber/nautilus-throbber.h @@ -56,7 +56,7 @@ struct NautilusThrobberClass { const char *location); }; -GtkType nautilus_throbber_get_type (void); +GType nautilus_throbber_get_type (void); GtkWidget *nautilus_throbber_new (void); BonoboObject *nautilus_throbber_get_control (NautilusThrobber *throbber); void nautilus_throbber_start (NautilusThrobber *throbber); diff --git a/libnautilus-private/nautilus-directory-metafile-monitor.h b/libnautilus-private/nautilus-directory-metafile-monitor.h index 35fa83466..c7cbb9eb2 100644 --- a/libnautilus-private/nautilus-directory-metafile-monitor.h +++ b/libnautilus-private/nautilus-directory-metafile-monitor.h @@ -45,7 +45,7 @@ typedef struct { POA_Nautilus_MetafileMonitor__epv epv; } NautilusMetafileMonitorClass; -GtkType nautilus_metafile_monitor_get_type (void); +GType nautilus_metafile_monitor_get_type (void); NautilusMetafileMonitor *nautilus_metafile_monitor_new (NautilusDirectory *directory); #endif /* NAUTILUS_METAFILE_MONITOR_H */ diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h index 90e375b9f..fc3fa5af1 100644 --- a/libnautilus-private/nautilus-directory.h +++ b/libnautilus-private/nautilus-directory.h @@ -127,8 +127,8 @@ typedef struct char * (* get_name_for_self_as_new_file) (NautilusDirectory *directory); } NautilusDirectoryClass; -/* Basic GtkObject requirements. */ -GtkType nautilus_directory_get_type (void); +/* Basic GObject requirements. */ +GType nautilus_directory_get_type (void); /* Get a directory given a uri. * Creates the appropriate subclass given the uri mappings. diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h index 74126e2d2..0d28e85d8 100644 --- a/libnautilus-private/nautilus-entry.h +++ b/libnautilus-private/nautilus-entry.h @@ -56,7 +56,7 @@ typedef struct { void (*selection_changed) (NautilusEntry *entry); } NautilusEntryClass; -GtkType nautilus_entry_get_type (void); +GType nautilus_entry_get_type (void); GtkWidget *nautilus_entry_new (void); GtkWidget *nautilus_entry_new_with_max_length (guint16 max); void nautilus_entry_set_text (NautilusEntry *entry, diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h index 63ec8708e..c61360d7e 100644 --- a/libnautilus-private/nautilus-file.h +++ b/libnautilus-private/nautilus-file.h @@ -83,8 +83,8 @@ typedef char * (*NautilusTruncateCallback) (const char *string, int width, void *context); -/* GtkObject requirements. */ -GtkType nautilus_file_get_type (void); +/* GObject requirements. */ +GType nautilus_file_get_type (void); /* Getting at a single file. */ NautilusFile * nautilus_file_get (const char *uri); diff --git a/libnautilus-private/nautilus-horizontal-splitter.h b/libnautilus-private/nautilus-horizontal-splitter.h index b55923519..108620790 100644 --- a/libnautilus-private/nautilus-horizontal-splitter.h +++ b/libnautilus-private/nautilus-horizontal-splitter.h @@ -47,7 +47,7 @@ typedef struct { } NautilusHorizontalSplitterClass; /* NautilusHorizontalSplitter public methods */ -GtkType nautilus_horizontal_splitter_get_type (void); +GType nautilus_horizontal_splitter_get_type (void); GtkWidget *nautilus_horizontal_splitter_new (void); gboolean nautilus_horizontal_splitter_is_hidden (NautilusHorizontalSplitter *splitter); diff --git a/libnautilus-private/nautilus-icon-canvas-item.h b/libnautilus-private/nautilus-icon-canvas-item.h index fbe86d02b..42ceafd93 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.h +++ b/libnautilus-private/nautilus-icon-canvas-item.h @@ -57,8 +57,8 @@ struct NautilusIconCanvasItemClass { EelCanvasItemClass parent_class; }; -/* GtkObject */ -GtkType nautilus_icon_canvas_item_get_type (void); +/* GObject */ +GType nautilus_icon_canvas_item_get_type (void); /* attributes */ void nautilus_icon_canvas_item_set_image (NautilusIconCanvasItem *item, diff --git a/libnautilus-private/nautilus-keep-last-vertical-box.h b/libnautilus-private/nautilus-keep-last-vertical-box.h index 6fe1d48cd..316ffd071 100644 --- a/libnautilus-private/nautilus-keep-last-vertical-box.h +++ b/libnautilus-private/nautilus-keep-last-vertical-box.h @@ -45,7 +45,7 @@ struct NautilusKeepLastVerticalBoxClass { GtkVBoxClass parent_class; }; -GtkType nautilus_keep_last_vertical_box_get_type (void); +GType nautilus_keep_last_vertical_box_get_type (void); GtkWidget *nautilus_keep_last_vertical_box_new (gint spacing); #endif /* NAUTILUS_KEEP_LAST_VERTICAL_BOX_H */ diff --git a/libnautilus-private/nautilus-merged-directory.h b/libnautilus-private/nautilus-merged-directory.h index 338aa4770..01f2f8f4b 100644 --- a/libnautilus-private/nautilus-merged-directory.h +++ b/libnautilus-private/nautilus-merged-directory.h @@ -56,7 +56,7 @@ typedef struct { NautilusDirectory *real_directory); } NautilusMergedDirectoryClass; -GtkType nautilus_merged_directory_get_type (void); +GType nautilus_merged_directory_get_type (void); void nautilus_merged_directory_add_real_directory (NautilusMergedDirectory *merged_directory, NautilusDirectory *real_directory); void nautilus_merged_directory_remove_real_directory (NautilusMergedDirectory *merged_directory, diff --git a/libnautilus-private/nautilus-metafile.h b/libnautilus-private/nautilus-metafile.h index df98c80f9..c168eacf3 100644 --- a/libnautilus-private/nautilus-metafile.h +++ b/libnautilus-private/nautilus-metafile.h @@ -46,7 +46,7 @@ typedef struct { POA_Nautilus_Metafile__epv epv; } NautilusMetafileClass; -GtkType nautilus_metafile_get_type (void); +GType nautilus_metafile_get_type (void); NautilusMetafile *nautilus_metafile_get (const char *directory_uri); diff --git a/libnautilus-private/nautilus-program-chooser.h b/libnautilus-private/nautilus-program-chooser.h index 9d0aa81c0..2e6b7bd08 100644 --- a/libnautilus-private/nautilus-program-chooser.h +++ b/libnautilus-private/nautilus-program-chooser.h @@ -54,7 +54,7 @@ struct NautilusProgramChooserClass GtkDialogClass parent_class; }; -GtkType nautilus_program_chooser_get_type (void); +GType nautilus_program_chooser_get_type (void); GtkWidget *nautilus_program_chooser_new (GnomeVFSMimeActionType type, NautilusFile *file); diff --git a/libnautilus-private/nautilus-trash-directory.h b/libnautilus-private/nautilus-trash-directory.h index ae40492bf..9da49e41c 100644 --- a/libnautilus-private/nautilus-trash-directory.h +++ b/libnautilus-private/nautilus-trash-directory.h @@ -50,7 +50,7 @@ typedef struct { NautilusMergedDirectoryClass parent_slot; } NautilusTrashDirectoryClass; -GtkType nautilus_trash_directory_get_type (void); +GType nautilus_trash_directory_get_type (void); void nautilus_trash_directory_finish_initializing (NautilusTrashDirectory *trash); #endif /* NAUTILUS_TRASH_DIRECTORY_H */ diff --git a/libnautilus-private/nautilus-trash-file.h b/libnautilus-private/nautilus-trash-file.h index 7f50b9425..b339d7b97 100644 --- a/libnautilus-private/nautilus-trash-file.h +++ b/libnautilus-private/nautilus-trash-file.h @@ -50,6 +50,6 @@ typedef struct { NautilusFileClass parent_slot; } NautilusTrashFileClass; -GtkType nautilus_trash_file_get_type (void); +GType nautilus_trash_file_get_type (void); #endif /* NAUTILUS_TRASH_FILE_H */ diff --git a/libnautilus-private/nautilus-vfs-directory.h b/libnautilus-private/nautilus-vfs-directory.h index 040e6729d..b16eb3bdf 100644 --- a/libnautilus-private/nautilus-vfs-directory.h +++ b/libnautilus-private/nautilus-vfs-directory.h @@ -50,6 +50,6 @@ typedef struct { NautilusDirectoryClass parent_slot; } NautilusVFSDirectoryClass; -GtkType nautilus_vfs_directory_get_type (void); +GType nautilus_vfs_directory_get_type (void); #endif /* NAUTILUS_VFS_DIRECTORY_H */ diff --git a/libnautilus-private/nautilus-vfs-file.h b/libnautilus-private/nautilus-vfs-file.h index 94e5fe419..4956c810c 100644 --- a/libnautilus-private/nautilus-vfs-file.h +++ b/libnautilus-private/nautilus-vfs-file.h @@ -50,6 +50,6 @@ typedef struct { NautilusFileClass parent_slot; } NautilusVFSFileClass; -GtkType nautilus_vfs_file_get_type (void); +GType nautilus_vfs_file_get_type (void); #endif /* NAUTILUS_VFS_FILE_H */ diff --git a/libnautilus-private/nautilus-volume-monitor.h b/libnautilus-private/nautilus-volume-monitor.h index 68aca00ce..1921e4b51 100644 --- a/libnautilus-private/nautilus-volume-monitor.h +++ b/libnautilus-private/nautilus-volume-monitor.h @@ -74,7 +74,7 @@ typedef enum { typedef gboolean (* NautilusEachVolumeCallback) (const NautilusVolume *, gpointer callback_data); -GtkType nautilus_volume_monitor_get_type (void); +GType nautilus_volume_monitor_get_type (void); NautilusVolumeMonitor *nautilus_volume_monitor_get (void); void nautilus_volume_monitor_mount_unmount_removable (NautilusVolumeMonitor *monitor, const char *mount_point, diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index afecdd65a..2247d408a 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -415,7 +415,7 @@ nautilus_view_standard_main (const char *executable_name, user_data); } -typedef GtkType (* TypeFunc) (void); +typedef GType (* TypeFunc) (void); BonoboObject * nautilus_view_create_from_get_type_function (const char *iid, void *user_data) diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index 9077aae31..22a92168d 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -64,7 +64,7 @@ typedef struct { GList *selection); } NautilusViewClass; -GtkType nautilus_view_get_type (void); +GType nautilus_view_get_type (void); NautilusView * nautilus_view_new (GtkWidget *widget); NautilusView * nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control); BonoboControl * nautilus_view_get_bonobo_control (NautilusView *view); diff --git a/src/file-manager/fm-desktop-icon-view.h b/src/file-manager/fm-desktop-icon-view.h index 8b36d4fea..60d8635a5 100644 --- a/src/file-manager/fm-desktop-icon-view.h +++ b/src/file-manager/fm-desktop-icon-view.h @@ -43,7 +43,7 @@ typedef struct { FMIconViewClass parent_class; } FMDesktopIconViewClass; -/* GtkObject support */ -GtkType fm_desktop_icon_view_get_type (void); +/* GObject support */ +GType fm_desktop_icon_view_get_type (void); #endif /* FM_DESKTOP_ICON_VIEW_H */ diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h index 45d3bc5c2..7085ba98d 100644 --- a/src/file-manager/fm-directory-view.h +++ b/src/file-manager/fm-directory-view.h @@ -282,8 +282,8 @@ struct FMDirectoryViewClass { void (* emblems_changed) (FMDirectoryView *view); }; -/* GtkObject support */ -GtkType fm_directory_view_get_type (void); +/* GObject support */ +GType fm_directory_view_get_type (void); /* Component embedding support */ NautilusView * fm_directory_view_get_nautilus_view (FMDirectoryView *view); diff --git a/src/file-manager/fm-icon-view.h b/src/file-manager/fm-icon-view.h index 460e4f3db..5e8455d7e 100644 --- a/src/file-manager/fm-icon-view.h +++ b/src/file-manager/fm-icon-view.h @@ -86,8 +86,8 @@ struct FMIconViewClass { }; -/* GtkObject support */ -GtkType fm_icon_view_get_type (void); +/* GObject support */ +GType fm_icon_view_get_type (void); int fm_icon_view_compare_files (FMIconView *icon_view, NautilusFile *a, NautilusFile *b); diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h index fc47547f2..b2072dc65 100644 --- a/src/file-manager/fm-properties-window.h +++ b/src/file-manager/fm-properties-window.h @@ -59,7 +59,7 @@ typedef struct FMPropertiesWindowClass FMPropertiesWindowClass; -GtkType fm_properties_window_get_type (void); +GType fm_properties_window_get_type (void); void fm_properties_window_present (NautilusFile *file, FMDirectoryView *directory_view); diff --git a/src/file-manager/fm-search-list-view.h b/src/file-manager/fm-search-list-view.h index 4997acb1c..45729dc7b 100644 --- a/src/file-manager/fm-search-list-view.h +++ b/src/file-manager/fm-search-list-view.h @@ -44,7 +44,7 @@ typedef struct { FMListViewClass parent_slot; } FMSearchListViewClass; -/* GtkObject support */ -GtkType fm_search_list_view_get_type (void); +/* GObject support */ +GType fm_search_list_view_get_type (void); #endif /* FM_SEARCH_LIST_VIEW_H */ diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h index 28a20cb55..9743937fc 100644 --- a/src/nautilus-bookmark-list.h +++ b/src/nautilus-bookmark-list.h @@ -54,7 +54,7 @@ struct NautilusBookmarkListClass { void (* contents_changed) (NautilusBookmarkList *bookmarks); }; -GtkType nautilus_bookmark_list_get_type (void); +GType nautilus_bookmark_list_get_type (void); NautilusBookmarkList * nautilus_bookmark_list_new (void); void nautilus_bookmark_list_append (NautilusBookmarkList *bookmarks, NautilusBookmark *bookmark); diff --git a/src/nautilus-complex-search-bar.h b/src/nautilus-complex-search-bar.h index 30c396904..01bcbaf37 100644 --- a/src/nautilus-complex-search-bar.h +++ b/src/nautilus-complex-search-bar.h @@ -53,7 +53,7 @@ typedef struct { NautilusSearchBarClass parent_slot; } NautilusComplexSearchBarClass; -GtkType nautilus_complex_search_bar_get_type (void); +GType nautilus_complex_search_bar_get_type (void); GtkWidget *nautilus_complex_search_bar_new (NautilusWindow *window); GSList * nautilus_complex_search_bar_get_search_criteria (NautilusComplexSearchBar *bar); diff --git a/src/nautilus-component-adapter-factory.h b/src/nautilus-component-adapter-factory.h index 14b42bc26..0931ac511 100644 --- a/src/nautilus-component-adapter-factory.h +++ b/src/nautilus-component-adapter-factory.h @@ -59,7 +59,7 @@ struct NautilusComponentAdapterFactoryClass GtkObjectClass parent_class; }; -GtkType nautilus_component_adapter_factory_get_type (void); +GType nautilus_component_adapter_factory_get_type (void); NautilusComponentAdapterFactory *nautilus_component_adapter_factory_get (void); Nautilus_View nautilus_component_adapter_factory_create_adapter (NautilusComponentAdapterFactory *factory, Bonobo_Unknown component); diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h index 82c961215..c36615470 100644 --- a/src/nautilus-desktop-window.h +++ b/src/nautilus-desktop-window.h @@ -49,7 +49,7 @@ typedef struct { NautilusWindowClass parent_spot; } NautilusDesktopWindowClass; -GtkType nautilus_desktop_window_get_type (void); +GType nautilus_desktop_window_get_type (void); NautilusDesktopWindow *nautilus_desktop_window_new (NautilusApplication *application, GdkScreen *screen); void nautilus_desktop_window_update_directory (NautilusDesktopWindow *window); diff --git a/src/nautilus-information-panel.h b/src/nautilus-information-panel.h index ceb56bdd1..360458094 100644 --- a/src/nautilus-information-panel.h +++ b/src/nautilus-information-panel.h @@ -57,7 +57,7 @@ typedef struct { const char *location); } NautilusInformationPanelClass; -GtkType nautilus_information_panel_get_type (void); +GType nautilus_information_panel_get_type (void); NautilusInformationPanel *nautilus_information_panel_new (void); void nautilus_information_panel_set_uri (NautilusInformationPanel *information_panel, const char *new_uri, diff --git a/src/nautilus-location-bar.h b/src/nautilus-location-bar.h index d4e72537e..aee4899ed 100644 --- a/src/nautilus-location-bar.h +++ b/src/nautilus-location-bar.h @@ -55,7 +55,7 @@ typedef struct { NautilusNavigationBarClass parent_class; } NautilusLocationBarClass; -GtkType nautilus_location_bar_get_type (void); +GType nautilus_location_bar_get_type (void); GtkWidget* nautilus_location_bar_new (NautilusWindow *window); #endif /* NAUTILUS_LOCATION_BAR_H */ diff --git a/src/nautilus-navigation-bar.h b/src/nautilus-navigation-bar.h index 0e1b632e9..97e3ccdfa 100644 --- a/src/nautilus-navigation-bar.h +++ b/src/nautilus-navigation-bar.h @@ -58,7 +58,7 @@ typedef struct { } NautilusNavigationBarClass; -GtkType nautilus_navigation_bar_get_type (void); +GType nautilus_navigation_bar_get_type (void); void nautilus_navigation_bar_activate (NautilusNavigationBar *bar); char * nautilus_navigation_bar_get_location (NautilusNavigationBar *bar); void nautilus_navigation_bar_set_location (NautilusNavigationBar *bar, diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h index 3dc6b99a6..ad20b6743 100644 --- a/src/nautilus-navigation-window.h +++ b/src/nautilus-navigation-window.h @@ -116,7 +116,7 @@ struct NautilusWindow { NautilusWindowShowState show_state; }; -GtkType nautilus_window_get_type (void); +GType nautilus_window_get_type (void); void nautilus_window_ui_freeze (NautilusWindow *window); void nautilus_window_ui_thaw (NautilusWindow *window); void nautilus_window_close (NautilusWindow *window); diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h index 3dc6b99a6..ad20b6743 100644 --- a/src/nautilus-object-window.h +++ b/src/nautilus-object-window.h @@ -116,7 +116,7 @@ struct NautilusWindow { NautilusWindowShowState show_state; }; -GtkType nautilus_window_get_type (void); +GType nautilus_window_get_type (void); void nautilus_window_ui_freeze (NautilusWindow *window); void nautilus_window_ui_thaw (NautilusWindow *window); void nautilus_window_close (NautilusWindow *window); diff --git a/src/nautilus-property-browser.h b/src/nautilus-property-browser.h index d959d5eeb..beeacaf5d 100644 --- a/src/nautilus-property-browser.h +++ b/src/nautilus-property-browser.h @@ -61,7 +61,7 @@ struct NautilusPropertyBrowserClass GtkWindowClass parent_class; }; -GtkType nautilus_property_browser_get_type (void); +GType nautilus_property_browser_get_type (void); NautilusPropertyBrowser *nautilus_property_browser_new (GdkScreen *screen); void nautilus_property_browser_show (GdkScreen *screen); void nautilus_property_browser_set_path (NautilusPropertyBrowser *panel, diff --git a/src/nautilus-search-bar-criterion.h b/src/nautilus-search-bar-criterion.h index deb32c26d..12a9387ac 100644 --- a/src/nautilus-search-bar-criterion.h +++ b/src/nautilus-search-bar-criterion.h @@ -72,7 +72,7 @@ typedef struct { typedef void (* NautilusSearchBarCriterionCallback) (NautilusSearchBarCriterion *old_criterion, gpointer data); -GtkType nautilus_search_bar_criterion_get_type (void); +GType nautilus_search_bar_criterion_get_type (void); /* Three new procedures, each with a separate purpose: create the initial search option with first_new, diff --git a/src/nautilus-search-bar.h b/src/nautilus-search-bar.h index 62c3b8140..7d58625e7 100644 --- a/src/nautilus-search-bar.h +++ b/src/nautilus-search-bar.h @@ -54,6 +54,6 @@ typedef struct { NautilusNavigationBarClass parent_class; } NautilusSearchBarClass; -GtkType nautilus_search_bar_get_type (void); +GType nautilus_search_bar_get_type (void); #endif /* NAUTILUS_SEARCH_BAR_H */ diff --git a/src/nautilus-sidebar-title.h b/src/nautilus-sidebar-title.h index 597927cf8..c6860b983 100644 --- a/src/nautilus-sidebar-title.h +++ b/src/nautilus-sidebar-title.h @@ -52,7 +52,7 @@ typedef struct GtkVBoxClass parent_class; } NautilusSidebarTitleClass; -GtkType nautilus_sidebar_title_get_type (void); +GType nautilus_sidebar_title_get_type (void); GtkWidget *nautilus_sidebar_title_new (void); void nautilus_sidebar_title_set_file (NautilusSidebarTitle *sidebar_title, NautilusFile *file, diff --git a/src/nautilus-simple-search-bar.h b/src/nautilus-simple-search-bar.h index bcd4b2be5..de751e5ac 100644 --- a/src/nautilus-simple-search-bar.h +++ b/src/nautilus-simple-search-bar.h @@ -55,7 +55,7 @@ typedef struct { NautilusSearchBarClass parent_class; } NautilusSimpleSearchBarClass; -GtkType nautilus_simple_search_bar_get_type (void); +GType nautilus_simple_search_bar_get_type (void); GtkWidget* nautilus_simple_search_bar_new (NautilusWindow *window); #endif /* NAUTILUS_SIMPLE_SEARCH_BAR_H */ diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h index 3dc6b99a6..ad20b6743 100644 --- a/src/nautilus-spatial-window.h +++ b/src/nautilus-spatial-window.h @@ -116,7 +116,7 @@ struct NautilusWindow { NautilusWindowShowState show_state; }; -GtkType nautilus_window_get_type (void); +GType nautilus_window_get_type (void); void nautilus_window_ui_freeze (NautilusWindow *window); void nautilus_window_ui_thaw (NautilusWindow *window); void nautilus_window_close (NautilusWindow *window); diff --git a/src/nautilus-switchable-navigation-bar.h b/src/nautilus-switchable-navigation-bar.h index 5dab5ac6d..93a92953a 100644 --- a/src/nautilus-switchable-navigation-bar.h +++ b/src/nautilus-switchable-navigation-bar.h @@ -63,7 +63,7 @@ typedef struct { NautilusSwitchableNavigationBarMode mode); } NautilusSwitchableNavigationBarClass; -GtkType nautilus_switchable_navigation_bar_get_type (void); +GType nautilus_switchable_navigation_bar_get_type (void); GtkWidget* nautilus_switchable_navigation_bar_new (NautilusWindow *window); NautilusSwitchableNavigationBarMode nautilus_switchable_navigation_bar_get_mode (NautilusSwitchableNavigationBar *switchable_navigation_bar); void nautilus_switchable_navigation_bar_set_mode (NautilusSwitchableNavigationBar *switchable_navigation_bar, diff --git a/src/nautilus-switchable-search-bar.h b/src/nautilus-switchable-search-bar.h index c9363c3b8..2fb4c1bb6 100644 --- a/src/nautilus-switchable-search-bar.h +++ b/src/nautilus-switchable-search-bar.h @@ -59,7 +59,7 @@ typedef struct { NautilusSearchBarMode mode); } NautilusSwitchableSearchBarClass; -GtkType nautilus_switchable_search_bar_get_type (void); +GType nautilus_switchable_search_bar_get_type (void); GtkWidget *nautilus_switchable_search_bar_new (NautilusWindow *window); void nautilus_switchable_search_bar_set_mode (NautilusSwitchableSearchBar *search_bar, NautilusSearchBarMode mode); diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index 76d45d967..6fc6b4d6b 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -96,7 +96,7 @@ typedef struct { } NautilusViewFrameClass; /* basic view management */ -GtkType nautilus_view_frame_get_type (void); +GType nautilus_view_frame_get_type (void); NautilusViewFrame *nautilus_view_frame_new (BonoboUIContainer *ui_container, NautilusUndoManager *undo_manager); Bonobo_Control nautilus_view_frame_get_control (NautilusViewFrame *view); diff --git a/src/nautilus-window.h b/src/nautilus-window.h index 3dc6b99a6..ad20b6743 100644 --- a/src/nautilus-window.h +++ b/src/nautilus-window.h @@ -116,7 +116,7 @@ struct NautilusWindow { NautilusWindowShowState show_state; }; -GtkType nautilus_window_get_type (void); +GType nautilus_window_get_type (void); void nautilus_window_ui_freeze (NautilusWindow *window); void nautilus_window_ui_thaw (NautilusWindow *window); void nautilus_window_close (NautilusWindow *window); diff --git a/src/nautilus-zoom-control.h b/src/nautilus-zoom-control.h index 1812b4523..0c0236ff9 100644 --- a/src/nautilus-zoom-control.h +++ b/src/nautilus-zoom-control.h @@ -59,7 +59,7 @@ struct NautilusZoomControlClass { GtkScrollType scroll); }; -GtkType nautilus_zoom_control_get_type (void); +GType nautilus_zoom_control_get_type (void); GtkWidget *nautilus_zoom_control_new (void); void nautilus_zoom_control_set_zoom_level (NautilusZoomControl *zoom_control, |