Commit c9109022 authored by Darin Adler's avatar Darin Adler

Many files. Update for change in Eel boilerplate macro names.

	* Many files.
	Update for change in Eel boilerplate macro names.

	* src/nautilus-application.c: (nautilus_application_startup):
	GtkObject -> GObject.
	* src/nautilus-shell.c: (nautilus_shell_class_init), (finalize),
	(nautilus_shell_new):
	GtkObject -> GObject.
parent bf638f0c
2001-11-03 Darin Adler <darin@bentspoon.com>
* Many files.
Update for change in Eel boilerplate macro names.
* src/nautilus-application.c: (nautilus_application_startup):
GtkObject -> GObject.
* src/nautilus-shell.c: (nautilus_shell_class_init), (finalize),
(nautilus_shell_new):
GtkObject -> GObject.
2001-11-02 Darin Adler <darin@bentspoon.com>
* src/Makefile.am: Put the server file in the right directory.
......
......@@ -58,7 +58,7 @@ static GtkWidget *nautilus_adapter_control_embed_strategy_get_widget (NautilusAd
static BonoboObject *nautilus_adapter_control_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
static void
......
......@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
static void
......
......@@ -51,7 +51,7 @@ static guint signals[LAST_SIGNAL];
static void nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *klass);
static void nautilus_adapter_embed_strategy_init (NautilusAdapterEmbedStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
EEL_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
nautilus_adapter_embed_strategy,
GTK_TYPE_OBJECT)
......
......@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
static void
......
......@@ -83,7 +83,7 @@ static void nautilus_adapter_factory_server_init (NautilusAdapterFactorySe
static void nautilus_adapter_factory_server_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
EEL_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
nautilus_adapter_factory_server,
BONOBO_OBJECT_TYPE)
......
......@@ -53,7 +53,7 @@ static void nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLo
static void nautilus_adapter_file_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
static void
......
......@@ -57,7 +57,7 @@ static void nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrate
static void nautilus_adapter_load_strategy_init (NautilusAdapterLoadStrategy *strategy);
static void nautilus_adapter_load_strategy_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_location)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading)
......
......@@ -64,7 +64,7 @@ static void nautilus_adapter_progressive_load_strategy_load_location (NautilusAd
static void nautilus_adapter_progressive_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
static void
......
......@@ -52,7 +52,7 @@ static void nautilus_adapter_stream_load_strategy_load_location (NautilusAdapter
static void nautilus_adapter_stream_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strategy);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
EEL_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
static void
......
......@@ -75,7 +75,7 @@ static void nautilus_adapter_init (NautilusAdapter *ser
static void nautilus_adapter_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapter,
EEL_CLASS_BOILERPLATE (NautilusAdapter,
nautilus_adapter,
GTK_TYPE_OBJECT)
......
......@@ -94,7 +94,7 @@ static void hardware_view_load_location_callback (NautilusView
static char* make_summary_string (NautilusHardwareView *hardware_view);
static int update_uptime_text (gpointer callback_data);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
EEL_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
#define HARDWARE_DEFAULT_BACKGROUND_COLOR "rgb:DDDD/DDDD/BBBB"
......
......@@ -67,7 +67,7 @@ static void nautilus_history_view_class_init (NautilusHistoryViewClass *klass
static void nautilus_history_view_init (NautilusHistoryView *view);
static void nautilus_history_view_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
EEL_CLASS_BOILERPLATE (NautilusHistoryView,
nautilus_history_view,
NAUTILUS_TYPE_VIEW)
......
......@@ -47,7 +47,7 @@ static void nautilus_content_loser_class_init (NautilusContentLoserClass *klass)
static void nautilus_content_loser_init (NautilusContentLoser *view);
static void nautilus_content_loser_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
EEL_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
static void loser_load_location_callback (NautilusView *nautilus_view,
const char *location,
......
......@@ -49,7 +49,7 @@ static void nautilus_sidebar_loser_class_init (NautilusSidebarLoserClass *klass)
static void nautilus_sidebar_loser_init (NautilusSidebarLoser *view);
static void nautilus_sidebar_loser_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
EEL_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
static void loser_load_location_callback (NautilusView *nautilus_view,
const char *location,
......
......@@ -243,7 +243,7 @@ static void bonobo_control_activate_callback (BonoboObject *control, gboolean st
/***********************************************************************************/
/***********************************************************************************/
EEL_DEFINE_CLASS_BOILERPLATE (NautilusMozillaContentView,
EEL_CLASS_BOILERPLATE (NautilusMozillaContentView,
nautilus_mozilla_content_view,
GTK_TYPE_VBOX);
......
......@@ -226,7 +226,7 @@ static void nautilus_music_view_load_uri (NautilusMusicView *view,
EEL_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
EEL_CLASS_BOILERPLATE (NautilusMusicView,
nautilus_music_view,
NAUTILUS_TYPE_VIEW)
......
......@@ -77,7 +77,7 @@ static void sample_merge_bonobo_items_callback (BonoboControl
#if 0
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView,
EEL_CLASS_BOILERPLATE (NautilusSampleContentView,
nautilus_sample_content_view,
NAUTILUS_TYPE_VIEW)
#else
......
......@@ -115,7 +115,7 @@ static void nautilus_text_view_load_uri (NautilusTextView *view,
const char *uri);
static void font_changed_callback (gpointer callback_data);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTextView,
EEL_CLASS_BOILERPLATE (NautilusTextView,
nautilus_text_view,
NAUTILUS_TYPE_VIEW)
......
......@@ -91,7 +91,7 @@ static void nautilus_throbber_size_allocate (GtkWidget *widget, GtkAllocation
static void nautilus_throbber_size_request (GtkWidget *widget, GtkRequisition *requisition);
static void nautilus_throbber_remove_update_callback (NautilusThrobber *throbber);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
EEL_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
static void
nautilus_throbber_class_init (NautilusThrobberClass *throbber_class)
......
......@@ -41,7 +41,7 @@ static void nautilus_tree_change_queue_init (gpointer object,
gpointer klass);
static void nautilus_tree_change_queue_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
static NautilusTreeChange *nautilus_tree_change_new (NautilusTreeChangeType change_type,
......
......@@ -41,7 +41,7 @@ static void nautilus_tree_expansion_state_init (gpointer
gpointer klass);
static void nautilus_tree_expansion_state_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
static gboolean expansion_table_hash_remove_func (gpointer key,
......
......@@ -93,7 +93,7 @@ static void nautilus_tree_model_directory_done_loading_callback (NautilusDirect
NautilusTreeModel *model);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
/* infrastructure stuff */
......
......@@ -39,7 +39,7 @@ static void nautilus_tree_node_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
static void
......
......@@ -94,7 +94,7 @@ static void insert_unparented_nodes (NautilusTreeView *vie
static void expand_uri_sequence_and_select_end (NautilusTreeView *view);
static gboolean is_anti_aliased (NautilusTreeView *view);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
EEL_CLASS_BOILERPLATE (NautilusTreeView,
nautilus_tree_view,
NAUTILUS_TYPE_VIEW)
......
......@@ -63,7 +63,7 @@ static void nautilus_bookmark_class_init (NautilusBookmarkClass *clas
static void nautilus_bookmark_init (NautilusBookmark *bookmark);
static GtkWidget *create_pixmap_widget_for_bookmark (NautilusBookmark *bookmark);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
/* GtkObject methods. */
......
......@@ -46,7 +46,7 @@ static void corba_metafile_changed (PortableServer_Servant servant,
static void corba_metafile_ready (PortableServer_Servant servant,
CORBA_Environment *ev);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileMonitor,
EEL_BONOBO_BOILERPLATE_FULL (NautilusMetafileMonitor,
Nautilus_MetafileMonitor,
nautilus_metafile_monitor,
BONOBO_OBJECT_TYPE)
......
......@@ -72,7 +72,7 @@ static char * real_get_name_for_self_as_new_file (NautilusDirectory
static void set_directory_uri (NautilusDirectory *directory,
const char *new_uri);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
EEL_CLASS_BOILERPLATE (NautilusDirectory,
nautilus_directory,
GTK_TYPE_OBJECT)
......
......@@ -54,7 +54,7 @@ static guint signals[LAST_SIGNAL];
static void nautilus_entry_init (NautilusEntry *entry);
static void nautilus_entry_class_init (NautilusEntryClass *class);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
EEL_CLASS_BOILERPLATE (NautilusEntry,
nautilus_entry,
GTK_TYPE_ENTRY)
......
......@@ -56,7 +56,7 @@
static void nautilus_file_operations_progress_class_init (NautilusFileOperationsProgressClass *klass);
static void nautilus_file_operations_progress_init (NautilusFileOperationsProgress *dialog);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
EEL_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
nautilus_file_operations_progress,
GNOME_TYPE_DIALOG);
......
......@@ -110,7 +110,7 @@ static char * nautilus_file_get_type_as_string (NautilusFile *file);
static gboolean update_info_and_name (NautilusFile *file,
GnomeVFSFileInfo *info);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
static void
nautilus_file_class_init (NautilusFileClass *klass)
......
......@@ -70,7 +70,7 @@ static void nautilus_font_factory_class_init (NautilusFontFactoryClass *class
static void nautilus_font_factory_init (NautilusFontFactory *factory);
static void destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
EEL_CLASS_BOILERPLATE (NautilusFontFactory,
nautilus_font_factory,
GTK_TYPE_OBJECT)
......
......@@ -62,7 +62,7 @@ static void nautilus_horizontal_splitter_draw (GtkWidget
GdkRectangle *area);
#endif
EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
EEL_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
nautilus_horizontal_splitter,
E_TYPE_HPANED)
......
......@@ -222,7 +222,7 @@ static gboolean hit_test_stretch_handle (NautilusIconCanvasIt
ArtIRect canvas_rect);
static gboolean icon_canvas_item_is_smooth (const NautilusIconCanvasItem *icon_item);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
EEL_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
static EelSmoothTextLayoutCache *layout_cache;
......
......@@ -151,7 +151,7 @@ static void process_pending_icon_to_rename (NautilusIconContainer *
static int click_policy_auto_value;
EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconContainer,
EEL_CLASS_BOILERPLATE (NautilusIconContainer,
nautilus_icon_container,
GNOME_TYPE_CANVAS)
......
......@@ -250,7 +250,7 @@ static CacheIcon *get_icon_from_cache (NautilusScalableIcon
static CacheIcon *load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
const IconSizeRequest *size);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory,
EEL_CLASS_BOILERPLATE (NautilusIconFactory,
nautilus_icon_factory,
GTK_TYPE_OBJECT)
......
......@@ -33,7 +33,7 @@ static void nautilus_keep_last_vertical_box_init (NautilusKeepLastVer
static void nautilus_keep_last_vertical_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
EEL_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
/* Standard class initialization function */
static void
......
......@@ -76,7 +76,7 @@ static guint merged_callback_hash (gconstpointer
static gboolean merged_callback_equal (gconstpointer merged_callback,
gconstpointer merged_callback_2);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
EEL_CLASS_BOILERPLATE (NautilusMergedDirectory,
nautilus_merged_directory,
NAUTILUS_TYPE_DIRECTORY)
......
......@@ -40,7 +40,7 @@ static Nautilus_Metafile corba_open (PortableServer_Servant servant,
const CORBA_char *directory,
CORBA_Environment *ev);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileFactory,
EEL_BONOBO_BOILERPLATE_FULL (NautilusMetafileFactory,
Nautilus_MetafileFactory,
nautilus_metafile_factory,
BONOBO_OBJECT_TYPE)
......
......@@ -156,7 +156,7 @@ static void async_read_cancel (NautilusMetafile *metafile);
static void nautilus_metafile_set_metafile_contents (NautilusMetafile *metafile,
xmlDocPtr metafile_contents);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafile,
EEL_BONOBO_BOILERPLATE_FULL (NautilusMetafile,
Nautilus_Metafile,
nautilus_metafile,
BONOBO_OBJECT_TYPE)
......
......@@ -55,7 +55,7 @@ static void nautilus_trash_directory_class_init (gpointer kla
static void add_volume (NautilusTrashDirectory *trash,
NautilusVolume *volume);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashDirectory,
EEL_CLASS_BOILERPLATE (NautilusTrashDirectory,
nautilus_trash_directory,
NAUTILUS_TYPE_MERGED_DIRECTORY)
......
......@@ -80,7 +80,7 @@ static void nautilus_trash_file_init (gpointer object,
gpointer klass);
static void nautilus_trash_file_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
EEL_CLASS_BOILERPLATE (NautilusTrashFile,
nautilus_trash_file,
NAUTILUS_TYPE_FILE)
......
......@@ -56,7 +56,7 @@ static void nautilus_trash_monitor_init (gpointer object
gpointer klass);
static void destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
static void
nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass)
......
......@@ -44,7 +44,7 @@ static void destroy (GtkOb
static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant,
CORBA_Environment *ev);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoContext,
EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoContext,
Nautilus_Undo_Context,
nautilus_undo_context,
BONOBO_OBJECT_TYPE)
......
......@@ -65,7 +65,7 @@ typedef struct {
static void nautilus_undo_manager_class_init (NautilusUndoManagerClass *class);
static void nautilus_undo_manager_init (NautilusUndoManager *item);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoManager,
EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoManager,
Nautilus_Undo_Manager,
nautilus_undo_manager,
BONOBO_OBJECT_TYPE)
......
......@@ -38,7 +38,7 @@ static void nautilus_vfs_directory_init (gpointer object,
gpointer klass);
static void nautilus_vfs_directory_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
EEL_CLASS_BOILERPLATE (NautilusVFSDirectory,
nautilus_vfs_directory,
NAUTILUS_TYPE_DIRECTORY)
......
......@@ -38,7 +38,7 @@ static void nautilus_vfs_file_init (gpointer object,
gpointer klass);
static void nautilus_vfs_file_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
EEL_CLASS_BOILERPLATE (NautilusVFSFile,
nautilus_vfs_file,
NAUTILUS_TYPE_FILE)
......
......@@ -224,7 +224,7 @@ static void nautilus_volume_free (NautilusVolume
static gboolean locate_audio_cd (void);
#endif
EEL_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
EEL_CLASS_BOILERPLATE (NautilusVolumeMonitor,
nautilus_volume_monitor,
GTK_TYPE_OBJECT)
......
......@@ -58,7 +58,7 @@ static void impl_Nautilus_Undo_Transaction__undo
static void undo_atom_list_free (GList *list);
static void undo_atom_list_undo_and_free (GList *list);
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoTransaction,
EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoTransaction,
Nautilus_Undo_Transaction,
nautilus_undo_transaction,
BONOBO_OBJECT_TYPE)
......
......@@ -87,7 +87,10 @@ static void nautilus_view_init (NautilusView *view);
static void nautilus_view_destroy (GtkObject *object);
static void nautilus_view_class_init (NautilusViewClass *klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE)
EEL_BONOBO_BOILERPLATE (NautilusView,
Nautilus_View,
nautilus_view,
BONOBO_OBJECT_TYPE)
static void
queue_incoming_call (PortableServer_Servant servant,
......
......@@ -122,7 +122,7 @@ static void update_disks_menu (FMDesktopIcon
static void free_volume_black_list (FMDesktopIconView *view);
static gboolean volume_link_is_selection (FMDirectoryView *view);
EEL_DEFINE_CLASS_BOILERPLATE (FMDesktopIconView,
EEL_CLASS_BOILERPLATE (FMDesktopIconView,
fm_desktop_icon_view,
FM_TYPE_ICON_VIEW)
......
......@@ -322,7 +322,7 @@ static void fm_directory_view_select_file (FMDirectoryView
static void monitor_file_for_open_with (FMDirectoryView *view,
NautilusFile *file);
EEL_DEFINE_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
EEL_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, add_file)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, bump_zoom_level)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, zoom_to_level)
......
......@@ -169,7 +169,7 @@ static void icon_view_handle_uri_list (
static int preview_sound_auto_value;
EEL_DEFINE_CLASS_BOILERPLATE (FMIconView,
EEL_CLASS_BOILERPLATE (FMIconView,
fm_icon_view,
FM_TYPE_DIRECTORY_VIEW)
......
......@@ -186,7 +186,7 @@ static void font_or_font_size_changed_callback (gpointer
static void default_sort_criteria_changed_callback (gpointer callback_data);
static void default_zoom_level_changed_callback (gpointer callback_data);
EEL_DEFINE_CLASS_BOILERPLATE (FMListView,
EEL_CLASS_BOILERPLATE (FMListView,
fm_list_view,
FM_TYPE_DIRECTORY_VIEW)
......
......@@ -168,7 +168,7 @@ static void remove_pending_file (StartupData *data
gboolean cancel_timed_wait,
gboolean cancel_destroy_handler);
EEL_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
EEL_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
static void
fm_properties_window_class_init (FMPropertiesWindowClass *class)
......
......@@ -109,7 +109,7 @@ static void reveal_selected_items_callback (BonoboUIComponent *component,
const char *verb);
EEL_DEFINE_CLASS_BOILERPLATE (FMSearchListView,
EEL_CLASS_BOILERPLATE (FMSearchListView,
fm_search_list_view,
FM_TYPE_LIST_VIEW)
......
......@@ -88,7 +88,7 @@ static int update_authors_if_necessary (gpointer callback_d
#define UPDATE_TIME_INTERVAL 8
/* gtk class definition boilerplate */
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAbout, nautilus_about, GNOME_TYPE_DIALOG)
EEL_CLASS_BOILERPLATE (NautilusAbout, nautilus_about, GNOME_TYPE_DIALOG)
static void
nautilus_about_class_init (NautilusAboutClass *about_class)
......
......@@ -95,9 +95,9 @@ static void update_session (gpointer cal
static void init_session (void);
static gboolean is_kdesktop_present (void);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusApplication,
nautilus_application,
BONOBO_GENERIC_FACTORY_TYPE)
EEL_BONOBO_BOILERPLATE (NautilusApplication,
nautilus_application,
BONOBO_GENERIC_FACTORY_TYPE)
static CORBA_Object
create_object (PortableServer_Servant servant,
......@@ -464,7 +464,7 @@ nautilus_application_startup (NautilusApplication *application,
/* Can't register myself due to trouble locating the
* Nautilus_Shell.server file. This has happened when you
* launch Nautilus with an LD_LIBRARY_PATH that
* doesn't include the directory containg the oaf
* doesn't include the directory containing the oaf
* library. It could also happen if the
* Nautilus_Shell.server file was not present for some
* reason. Sometimes killing oafd and gconfd fixes
......
......@@ -92,7 +92,7 @@ nautilus_bookmark_list_init (NautilusBookmarkList *bookmarks)
nautilus_bookmark_list_load_file (bookmarks);
}
EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmarkList, nautilus_bookmark_list, GTK_TYPE_OBJECT)
EEL_CLASS_BOILERPLATE (NautilusBookmarkList, nautilus_bookmark_list, GTK_TYPE_OBJECT)
static void
stop_monitoring_one (gpointer data, gpointer user_data)
......
......@@ -89,7 +89,7 @@ static void update_dynamic_buttons_state (NautilusComplexSearchBar *bar);
static void update_criteria_choices (gpointer list_item,
gpointer data);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusComplexSearchBar, nautilus_complex_search_bar, NAUTILUS_TYPE_SEARCH_BAR)
EEL_CLASS_BOILERPLATE (NautilusComplexSearchBar, nautilus_complex_search_bar, NAUTILUS_TYPE_SEARCH_BAR)
/* called by the criterion when the user chooses
a new criterion type */
......
......@@ -45,7 +45,7 @@ static NautilusComponentAdapterFactory *global_component_adapter_factory = NULL;
static void nautilus_component_adapter_factory_class_init (NautilusComponentAdapterFactoryClass *klass);
static void nautilus_component_adapter_factory_init (NautilusComponentAdapterFactory *factory);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusComponentAdapterFactory,
EEL_CLASS_BOILERPLATE (NautilusComponentAdapterFactory,
nautilus_component_adapter_factory,
GTK_TYPE_OBJECT)
......
......@@ -54,7 +54,7 @@ static void real_add_current_location_to_history_list (NautilusWindow *window)
static void set_wmspec_desktop_hint (GdkWindow *window);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window, NAUTILUS_TYPE_WINDOW)
EEL_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window, NAUTILUS_TYPE_WINDOW)
static void
nautilus_desktop_window_class_init (NautilusDesktopWindowClass *klass)
......
......@@ -169,7 +169,7 @@ typedef enum {
static gboolean confirm_trash_auto_value;
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
EEL_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
/* initializing the class object by installing the operations we override */
static void
......
......@@ -101,7 +101,7 @@ static void nautilus_location_bar_class_init (NautilusLocationBarClass *class);
static void nautilus_location_bar_init (NautilusLocationBar *bar);
static void nautilus_location_bar_update_label (NautilusLocationBar *bar);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusLocationBar,
EEL_CLASS_BOILERPLATE (NautilusLocationBar,
nautilus_location_bar,
NAUTILUS_TYPE_NAVIGATION_BAR)
......
......@@ -43,7 +43,7 @@ static guint signals[LAST_SIGNAL];
static void nautilus_navigation_bar_class_init (NautilusNavigationBarClass *class);
static void nautilus_navigation_bar_init (NautilusNavigationBar *bar);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN)
EEL_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
......
......@@ -134,7 +134,7 @@ static void nautilus_window_unrealize (GtkWidget *widg
static void cancel_view_as_callback (NautilusWindow *window);
static void real_add_current_location_to_history_list (NautilusWindow *window);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
EEL_CLASS_BOILERPLATE (NautilusWindow,
nautilus_window,
BONOBO_TYPE_WINDOW)
......
......@@ -134,7 +134,7 @@ static void nautilus_window_unrealize (GtkWidget *widg
static void cancel_view_as_callback (NautilusWindow *window);
static void real_add_current_location_to_history_list (NautilusWindow *window);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
EEL_CLASS_BOILERPLATE (NautilusWindow,
nautilus_window,
BONOBO_TYPE_WINDOW)
......
......@@ -214,7 +214,7 @@ static GtkTargetEntry drag_types[] = {
static NautilusPropertyBrowser *main_browser = NULL;
EEL_DEFINE_CLASS_BOILERPLATE (NautilusPropertyBrowser,
EEL_CLASS_BOILERPLATE (NautilusPropertyBrowser,
nautilus_property_browser,
GTK_TYPE_WINDOW)
......
......@@ -203,7 +203,7 @@ static NautilusSearchBarCriterionType get_next_criterion_type
GSList *displayed_criteria);
static void nautilus_search_bar_criterion_destroy (GtkObject *object);