diff options
33 files changed, 160 insertions, 230 deletions
@@ -1,5 +1,10 @@ 2001-10-29 Darin Adler <darin@bentspoon.com> + * Lots of files: + libnautilus-private now compiles -- on to src + +2001-10-29 Darin Adler <darin@bentspoon.com> + * configure.in: Locate glib-genmarshal. * libnautilus-private/.cvsignore: * libnautilus-private/Makefile.am: diff --git a/configure.in b/configure.in index 30ce79f75..2011ebae5 100644 --- a/configure.in +++ b/configure.in @@ -107,9 +107,9 @@ LIBNAUTILUS_ADAPTER_MODULES="\ libgnomecanvas-2.0 \ libbonobo-2.0 \ libbonoboui-2.0" -LIBNAUTILUS_ADAPTER_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`" +LIBNAUTILUS_ADAPTER_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_ADAPTER_MODULES`" AC_SUBST(LIBNAUTILUS_ADAPTER_CFLAGS) -LIBNAUTILUS_ADAPTER_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" +LIBNAUTILUS_ADAPTER_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_ADAPTER_MODULES`" AC_SUBST(LIBNAUTILUS_ADAPTER_LIBS) LIBNAUTILUS_ADAPTER_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_ADAPTER_MODULES | $srcdir/add-include-prefix`" AC_SUBST(LIBNAUTILUS_ADAPTER_IDL_INCLUDES) @@ -123,14 +123,33 @@ LIBNAUTILUS_PRIVATE_MODULES="\ gtk+-2.0 \ libgnomecanvas-2.0 \ libbonobo-2.0 \ - libbonoboui-2.0" -LIBNAUTILUS_PRIVATE_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`" + libbonoboui-2.0 \ + librsvg-2.0" +LIBNAUTILUS_PRIVATE_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_PRIVATE_MODULES`" AC_SUBST(LIBNAUTILUS_PRIVATE_CFLAGS) -LIBNAUTILUS_PRIVATE_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" +LIBNAUTILUS_PRIVATE_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_PRIVATE_MODULES`" AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS) LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`" AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) +dnl nautilus-src +NAUTILUS_SRC_MODULES="\ + bonobo-activation-2.0 \ + eel-2.0 \ + glib-2.0 \ + gnome-vfs-2.0 \ + gtk+-2.0 \ + libgnomecanvas-2.0 \ + libbonobo-2.0 \ + libbonoboui-2.0 \ + librsvg-2.0" +NAUTILUS_SRC_CFLAGS="`$PKG_CONFIG --cflags $NAUTILUS_SRC_MODULES`" +AC_SUBST(NAUTILUS_SRC_CFLAGS) +NAUTILUS_SRC_LIBS="`$PKG_CONFIG --libs $NAUTILUS_SRC_MODULES`" +AC_SUBST(NAUTILUS_SRC_LIBS) +NAUTILUS_SRC_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $NAUTILUS_SRC_MODULES | $srcdir/add-include-prefix`" +AC_SUBST(NAUTILUS_SRC_IDL_INCLUDES) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) dnl ==================================== diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index 01202dd59..eab516d62 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -23,7 +23,6 @@ CDDALIBADD = endif libnautilus_private_la_LDFLAGS = \ - $(dependency_static_libs) \ $(LIBNAUTILUS_PRIVATE_LIBS) \ $(CDDALIBADD) \ $(NULL) @@ -178,7 +177,7 @@ libnautilus_private_la_SOURCES = \ fsattributesdir = $(datadir)/nautilus fsattributes_DATA = filesystem-attributes.xml -$(lib_LTLIBRARIES): $(dependency_static_libs) +# $(lib_LTLIBRARIES): $(dependency_static_libs) $(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL) diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 97d3dbc2e..ded64dd30 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -787,7 +787,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container) } dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"), - _("Switch"), GTK_RESPONSE_CANCEL, + _("Switch"), _("Cancel"), GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (container), GTK_TYPE_WINDOW))); diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 02c8f73b1..5c73a6f3e 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -290,7 +290,7 @@ get_icon_factory (void) gtk_signal_connect (GTK_OBJECT (gnome_vfs_mime_monitor_get ()), "data_changed", - mime_type_data_changed_callback, + G_CALLBACK (mime_type_data_changed_callback), NULL); g_atexit (destroy_icon_factory); @@ -398,6 +398,7 @@ cache_key_destroy (CacheKey *key) g_free (key); } +#if GNOME2_CONVERSION_COMPLETE static void mark_icon_not_outstanding (GdkPixbuf *pixbuf, gpointer callback_data) { @@ -415,6 +416,7 @@ mark_icon_not_outstanding (GdkPixbuf *pixbuf, gpointer callback_data) icon->outstanding = FALSE; } +#endif static CacheIcon * cache_icon_new (GdkPixbuf *pixbuf, @@ -432,8 +434,10 @@ cache_icon_new (GdkPixbuf *pixbuf, /* Grab the pixbuf since we are keeping it. */ gdk_pixbuf_ref (pixbuf); +#if GNOME2_CONVERSION_COMPLETE gdk_pixbuf_set_last_unref_handler (pixbuf, mark_icon_not_outstanding, NULL); +#endif /* Make the icon. */ icon = g_new0 (CacheIcon, 1); @@ -517,7 +521,9 @@ cache_icon_unref (CacheIcon *icon) g_hash_table_remove (factory->cache_icons, icon->pixbuf); /* Since it's no longer in the cache, we don't need to notice the last unref. */ +#if GNOME2_CONVERSION_COMPLETE gdk_pixbuf_set_last_unref_handler (icon->pixbuf, NULL, NULL); +#endif /* Let go of the pixbuf if we were holding a reference to it. * If it was still outstanding, we didn't have a reference to it, @@ -1424,14 +1430,7 @@ get_next_icon_size_to_try (guint target_size, guint *current_size) static GdkPixbuf * load_pixbuf_svg (const char *path, guint size_in_pixels, gboolean is_emblem) { - FILE *f; - GdkPixbuf *pixbuf; - double actual_size_in_pixels; - - f = fopen (path, "rb"); - if (f == NULL) { - return NULL; - } + double actual_size_in_pixels, zoom; /* FIXME: the nominal size of .svg emblems is too large, so we scale it * down here if the file is an emblem. This code should be removed @@ -1442,11 +1441,9 @@ load_pixbuf_svg (const char *path, guint size_in_pixels, gboolean is_emblem) } else { actual_size_in_pixels = size_in_pixels; } + zoom = actual_size_in_pixels / NAUTILUS_ICON_SIZE_STANDARD; - pixbuf = rsvg_render_file (f, (double) (actual_size_in_pixels / NAUTILUS_ICON_SIZE_STANDARD)); - fclose (f); - - return pixbuf; + return rsvg_pixbuf_from_file_at_zoom (path, zoom, zoom, NULL); } static gboolean diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c index 35f747167..7391fc482 100644 --- a/libnautilus-private/nautilus-icon-text-item.c +++ b/libnautilus-private/nautilus-icon-text-item.c @@ -13,6 +13,8 @@ #include <config.h> #include "nautilus-icon-text-item.h" +#if GNOME2_CONVERSION_COMPLETE + #include "nautilus-entry.h" #include "nautilus-theme.h" @@ -1618,3 +1620,5 @@ restore_from_undo_snapshot_callback (GtkObject *target, gpointer callback_data) /* Reset the registered flag so we get a new item for future editing. */ priv->undo_registered = FALSE; } + +#endif diff --git a/libnautilus-private/nautilus-link-desktop-file.c b/libnautilus-private/nautilus-link-desktop-file.c index d852a485e..71f8afb30 100644 --- a/libnautilus-private/nautilus-link-desktop-file.c +++ b/libnautilus-private/nautilus-link-desktop-file.c @@ -490,6 +490,8 @@ nautilus_link_desktop_file_get_link_icon_given_file_contents (const char *link_f } +#if GNOME2_CONVERSION_COMPLETE + void nautilus_link_desktop_file_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const char *dest_path, @@ -530,3 +532,4 @@ nautilus_link_desktop_file_local_create_from_gnome_entry (GnomeDesktopEntry *ent gnome_desktop_entry_free (new_entry); } +#endif diff --git a/libnautilus-private/nautilus-link-desktop-file.h b/libnautilus-private/nautilus-link-desktop-file.h index 792b88c13..ee7b035da 100644 --- a/libnautilus-private/nautilus-link-desktop-file.h +++ b/libnautilus-private/nautilus-link-desktop-file.h @@ -50,10 +50,11 @@ char * nautilus_link_desktop_file_get_link_name_given_file_contents (c int link_file_size); char * nautilus_link_desktop_file_get_link_icon_given_file_contents (const char *link_file_contents, int link_file_size); +#if GNOME2_CONVERSION_COMPLETE void nautilus_link_desktop_file_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const char *dest_path, const GdkPoint *position); - +#endif #endif /* NAUTILUS_LINK_DESKTOP_FILE_H */ diff --git a/libnautilus-private/nautilus-link-historical.c b/libnautilus-private/nautilus-link-historical.c index b3dadc3d2..230941fa5 100644 --- a/libnautilus-private/nautilus-link-historical.c +++ b/libnautilus-private/nautilus-link-historical.c @@ -374,6 +374,7 @@ nautilus_link_historical_local_is_trash_link (const char *path) return nautilus_link_historical_local_get_link_type (path) == NAUTILUS_LINK_TRASH; } +#if GNOME2_CONVERSION_COMPLETE void nautilus_link_historical_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const char *dest_path, const GdkPoint *position) @@ -432,4 +433,4 @@ nautilus_link_historical_local_create_from_gnome_entry (GnomeDesktopEntry *entry g_free (arguments); } - +#endif diff --git a/libnautilus-private/nautilus-link-historical.h b/libnautilus-private/nautilus-link-historical.h index b9781d04e..b66c87fc0 100644 --- a/libnautilus-private/nautilus-link-historical.h +++ b/libnautilus-private/nautilus-link-historical.h @@ -51,8 +51,11 @@ char * nautilus_link_historical_get_link_uri_given_file_contents (con int link_file_size); char * nautilus_link_historical_get_link_icon_given_file_contents (const char *link_file_contents, int link_file_size); + +#if GNOME2_CONVERSION_COMPLETE void nautilus_link_historical_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const char *dest_path, const GdkPoint *position); +#endif #endif /* NAUTILUS_LINK_HISTORICAL_H */ diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c index bedf5954c..9a8c71b3f 100644 --- a/libnautilus-private/nautilus-link.c +++ b/libnautilus-private/nautilus-link.c @@ -353,9 +353,12 @@ nautilus_link_local_is_trash_link (const char *path) return retval; } +#if GNOME2_CONVERSION_COMPLETE void nautilus_link_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const char *dest_path, const GdkPoint *position) { nautilus_link_desktop_file_local_create_from_gnome_entry (entry, dest_path, position); } + +#endif diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c index c641c32ee..b0e003b7a 100644 --- a/libnautilus-private/nautilus-merged-directory.c +++ b/libnautilus-private/nautilus-merged-directory.c @@ -502,7 +502,7 @@ merged_add_real_directory (NautilusMergedDirectory *merged, gtk_signal_connect (GTK_OBJECT (real_directory), "done_loading", - done_loading_callback, + G_CALLBACK (done_loading_callback), merged); /* FIXME bugzilla.gnome.org 45084: The done_loading part won't work for the case where @@ -517,11 +517,11 @@ merged_add_real_directory (NautilusMergedDirectory *merged, gtk_signal_connect (GTK_OBJECT (real_directory), "files_added", - forward_files_added_cover, + G_CALLBACK (forward_files_added_cover), merged); gtk_signal_connect (GTK_OBJECT (real_directory), "files_changed", - forward_files_changed_cover, + G_CALLBACK (forward_files_changed_cover), merged); } diff --git a/libnautilus-private/nautilus-metafile-factory.c b/libnautilus-private/nautilus-metafile-factory.c index 0f10eb922..e18760ff3 100644 --- a/libnautilus-private/nautilus-metafile-factory.c +++ b/libnautilus-private/nautilus-metafile-factory.c @@ -38,10 +38,12 @@ static void nautilus_metafile_factory_class_init (NautilusMetafileFactoryClass * static void destroy (GtkObject *factory); static Nautilus_Metafile corba_open (PortableServer_Servant servant, - const Nautilus_URI directory, + const CORBA_char *directory, CORBA_Environment *ev); -NAUTILUS_BONOBO_X_BOILERPLATE (NautilusMetafileFactory, Nautilus_MetafileFactory, BONOBO_X_OBJECT_TYPE, nautilus_metafile_factory) +EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileFactory, + nautilus_metafile_factory, + BONOBO_OBJECT_TYPE) static void nautilus_metafile_factory_class_init (NautilusMetafileFactoryClass *klass) @@ -100,7 +102,7 @@ nautilus_metafile_factory_get_instance (void) static Nautilus_Metafile corba_open (PortableServer_Servant servant, - const Nautilus_URI directory, + const CORBA_char *directory, CORBA_Environment *ev) { BonoboObject *object; diff --git a/libnautilus-private/nautilus-metafile-factory.h b/libnautilus-private/nautilus-metafile-factory.h index 76c5d9d68..50759b6a0 100644 --- a/libnautilus-private/nautilus-metafile-factory.h +++ b/libnautilus-private/nautilus-metafile-factory.h @@ -26,7 +26,6 @@ #include <libnautilus-private/nautilus-metafile-server.h> #include <bonobo/bonobo-object.h> -#include <bonobo/bonobo-xobject.h> #define NAUTILUS_TYPE_METAFILE_FACTORY (nautilus_metafile_factory_get_type ()) #define NAUTILUS_METAFILE_FACTORY(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_METAFILE_FACTORY, NautilusMetafileFactory)) @@ -37,16 +36,16 @@ typedef struct NautilusMetafileFactoryDetails NautilusMetafileFactoryDetails; typedef struct { - BonoboXObject parent_slot; + BonoboObject parent_slot; NautilusMetafileFactoryDetails *details; } NautilusMetafileFactory; typedef struct { - BonoboXObjectClass parent_slot; + BonoboObjectClass parent_slot; POA_Nautilus_MetafileFactory__epv epv; } NautilusMetafileFactoryClass; -GtkType nautilus_metafile_factory_get_type (void); +GType nautilus_metafile_factory_get_type (void); #define METAFILE_FACTORY_IID "OAFIID:nautilus_metafile_factory:bc318c01-4106-4622-8d6c-b419ec89e4c6" diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index df3deb6ac..16e3ca495 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/nautilus-metafile.c @@ -93,7 +93,7 @@ static void corba_set_list (PortableServer_Servant servant, static void corba_copy (PortableServer_Servant servant, const CORBA_char *source_file_name, - const Nautilus_URI destination_directory_uri, + const CORBA_char *destination_directory_uri, const CORBA_char *destination_file_name, CORBA_Environment *ev); static void corba_remove (PortableServer_Servant servant, @@ -157,7 +157,7 @@ static void async_read_cancel (NautilusMetafile *metafile); static void nautilus_metafile_set_metafile_contents (NautilusMetafile *metafile, xmlDocPtr metafile_contents); -NAUTILUS_BONOBO_X_BOILERPLATE (NautilusMetafile, Nautilus_Metafile, BONOBO_X_OBJECT_TYPE, nautilus_metafile) +EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafile, nautilus_metafile, BONOBO_OBJECT_TYPE) typedef struct MetafileReadState { gboolean use_public_metafile; @@ -586,7 +586,7 @@ corba_set_list (PortableServer_Servant servant, static void corba_copy (PortableServer_Servant servant, const CORBA_char *source_file_name, - const Nautilus_URI destination_directory_uri, + const CORBA_char *destination_directory_uri, const CORBA_char *destination_file_name, CORBA_Environment *ev) { @@ -1595,7 +1595,7 @@ remove_file_metadata (NautilusMetafile *metafile, g_hash_table_remove (hash, file_name); xmlFree (key); - eel_xml_remove_node (file_node); + xmlUnlinkNode (file_node); xmlFreeNode (file_node); directory_request_write_metafile (metafile); } @@ -1776,6 +1776,7 @@ metafile_read_check_for_directory (NautilusMetafile *metafile) (&metafile->details->read_state->get_file_info_handle, &fake_list, GNOME_VFS_FILE_INFO_FOLLOW_LINKS, + GNOME_VFS_PRIORITY_DEFAULT, metafile_read_check_for_directory_callback, metafile); } @@ -1874,7 +1875,9 @@ metafile_read_restart (NautilusMetafile *metafile) GNOME_VFS_URI_HIDE_NONE); metafile->details->read_state->handle = eel_read_entire_file_async - (text_uri, metafile_read_done_callback, metafile); + (text_uri, + GNOME_VFS_PRIORITY_DEFAULT, + metafile_read_done_callback, metafile); g_free (text_uri); } @@ -2060,6 +2063,7 @@ metafile_write_start (NautilusMetafile *metafile) ? metafile->details->public_vfs_uri : metafile->details->private_vfs_uri, GNOME_VFS_OPEN_WRITE, FALSE, METAFILE_PERMISSIONS, + GNOME_VFS_PRIORITY_DEFAULT, metafile_write_create_callback, metafile); } diff --git a/libnautilus-private/nautilus-metafile.h b/libnautilus-private/nautilus-metafile.h index 394fd0871..04875cdf3 100644 --- a/libnautilus-private/nautilus-metafile.h +++ b/libnautilus-private/nautilus-metafile.h @@ -26,7 +26,6 @@ #include "nautilus-metafile-server.h" #include <bonobo/bonobo-object.h> -#include <bonobo/bonobo-xobject.h> #include <libxml/tree.h> #include "nautilus-directory.h" @@ -41,12 +40,12 @@ typedef struct NautilusMetafileDetails NautilusMetafileDetails; typedef struct { - BonoboXObject parent_slot; + BonoboObject parent_slot; NautilusMetafileDetails *details; } NautilusMetafile; typedef struct { - BonoboXObjectClass parent_slot; + BonoboObjectClass parent_slot; POA_Nautilus_Metafile__epv epv; } NautilusMetafileClass; diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 0728493aa..7b7111202 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -1497,11 +1497,11 @@ mime_type_hash_table_destroy (GHashTable *table) static gboolean server_has_content_requirements (Bonobo_ServerInfo *server) { - OAF_Property *prop; + Bonobo_ActivationProperty *prop; - prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); + prop = bonobo_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); - if (prop == NULL || prop->v._d != OAF_P_STRINGV) { + if (prop == NULL || prop->v._d != Bonobo_ACTIVATION_P_STRINGV) { return FALSE; } else { return TRUE; @@ -1513,8 +1513,8 @@ server_matches_content_requirements (Bonobo_ServerInfo *server, GHashTable *type_table, GList *explicit_iids) { - OAF_Property *prop; - GNOME_stringlist types; + Bonobo_ActivationProperty *prop; + Bonobo_StringList types; guint i; /* Components explicitly requested in the metafile are not capability tested. */ @@ -1525,7 +1525,7 @@ server_matches_content_requirements (Bonobo_ServerInfo *server, if (!server_has_content_requirements (server)) { return TRUE; } else { - prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); + prop = bonobo_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); types = prop->v._u.value_stringv; diff --git a/libnautilus-private/nautilus-mime-actions.h b/libnautilus-private/nautilus-mime-actions.h index ffc5bd72d..1fa37bdda 100644 --- a/libnautilus-private/nautilus-mime-actions.h +++ b/libnautilus-private/nautilus-mime-actions.h @@ -37,7 +37,7 @@ GnomeVFSMimeActionType nautilus_mime_get_default_action_type_for_file GnomeVFSMimeAction * nautilus_mime_get_default_action_for_file (NautilusFile *file); GnomeVFSMimeApplication *nautilus_mime_get_default_application_for_file (NautilusFile *file); gboolean nautilus_mime_is_default_application_for_file_user_chosen (NautilusFile *file); -OAF_ServerInfo * nautilus_mime_get_default_component_for_file (NautilusFile *file); +Bonobo_ServerInfo * nautilus_mime_get_default_component_for_file (NautilusFile *file); gboolean nautilus_mime_is_default_component_for_file_user_chosen (NautilusFile *file); GList * nautilus_mime_get_short_list_applications_for_file (NautilusFile *file); GList * nautilus_mime_get_short_list_components_for_file (NautilusFile *file); diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c index 49ba03218..f4600f896 100644 --- a/libnautilus-private/nautilus-program-chooser.c +++ b/libnautilus-private/nautilus-program-chooser.c @@ -416,6 +416,7 @@ nautilus_program_chooser_get_status_label (GnomeDialog *chooser) static void nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean cancellable) { +#if GNOME2_CONVERSION_COMPLETE GtkButton *done_button, *cancel_button; cancel_button = eel_gnome_dialog_get_button_by_index @@ -430,6 +431,7 @@ nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean canc gtk_widget_hide (GTK_WIDGET (cancel_button)); gtk_widget_show (GTK_WIDGET (done_button)); } +#endif } static void @@ -1230,7 +1232,7 @@ create_program_clist () gtk_signal_connect (GTK_OBJECT (clist), "click_column", - switch_sort_column, + G_CALLBACK (switch_sort_column), NULL); @@ -1312,10 +1314,12 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, clist = create_program_clist (); gtk_container_add (GTK_CONTAINER (list_scroller), clist); +#if GNOME2_CONVERSION_COMPLETE eel_gtk_clist_set_double_click_button (GTK_CLIST (clist), eel_gnome_dialog_get_button_by_index (GNOME_DIALOG (window), GNOME_OK)); +#endif gtk_object_set_data (GTK_OBJECT (window), "list", clist); repopulate_program_list (GNOME_DIALOG (window), file, GTK_CLIST (clist)); @@ -1346,7 +1350,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, gtk_signal_connect (GTK_OBJECT (change_button), "clicked", - run_program_configurator_callback, + G_CALLBACK (run_program_configurator_callback), window); /* Framed area with button to launch mime type editing capplet. */ @@ -1366,7 +1370,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, eel_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button)); gtk_signal_connect (GTK_OBJECT (capplet_button), "clicked", - launch_mime_capplet_and_close_dialog, + G_CALLBACK (launch_mime_capplet_and_close_dialog), window); gtk_widget_show (capplet_button); gtk_box_pack_start (GTK_BOX (capplet_button_vbox), capplet_button, TRUE, FALSE, 0); @@ -1396,7 +1400,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, /* Update selected item info whenever selection changes. */ gtk_signal_connect (GTK_OBJECT (clist), "select_row", - program_list_selection_changed_callback, + G_CALLBACK (program_list_selection_changed_callback), window); return GNOME_DIALOG (window); @@ -1481,7 +1485,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_ char *unavailable_message; char *file_name; char *dialog_title; - GnomeDialog *dialog; + GtkDialog *dialog; file_name = get_file_name_for_display (file); @@ -1507,7 +1511,9 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_ dialog = eel_show_yes_no_dialog (prompt, dialog_title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window); +#if GNOME2_CONVERSION_COMPLETE gnome_dialog_button_connect (dialog, GNOME_OK, launch_mime_capplet, nautilus_file_get_mime_type (file)); +#endif g_free (unavailable_message); g_free (file_name); diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index f3c4e0eb6..dd676b2bb 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -483,7 +483,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application, const char *uri_scheme, GtkWindow *parent_window) { - GnomeDialog *message_dialog; + GtkDialog *message_dialog; LaunchParameters *launch_parameters; char *message; char *file_name; @@ -496,11 +496,11 @@ application_cannot_open_location (GnomeVFSMimeApplication *application, application->name, file_name, application->name, uri_scheme); message_dialog = eel_show_yes_no_dialog (message, - _("Can't Open Location"), - GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, - parent_window); - if (gnome_dialog_run (message_dialog) == GNOME_OK) { + _("Can't Open Location"), + _("OK"), + _("Cancel"), + parent_window); + if (gtk_dialog_run (message_dialog) == GTK_RESPONSE_OK) { launch_parameters = launch_parameters_new (file, parent_window); nautilus_choose_application_for_file (file, @@ -625,7 +625,7 @@ get_xalf_prefix (const char *name) s = g_string_new (xalf_executable); g_string_append (s, " --title "); - quoted = eel_shell_quote (name); + quoted = g_shell_quote (name); g_string_append (s, quoted); g_free (quoted); g_string_append_c (s, ' '); @@ -633,7 +633,7 @@ get_xalf_prefix (const char *name) gnome_config_get_vector ("/xalf/settings/options", &argc, &argv); for (i = 0; i < argc; i++) { - quoted = eel_shell_quote (argv[i]); + quoted = g_shell_quote (argv[i]); g_free (argv[i]); g_string_append (s, quoted); @@ -670,7 +670,7 @@ nautilus_launch_application_from_command (const char *name, char *xalf_prefix; if (parameter != NULL) { - quoted_parameter = eel_shell_quote (parameter); + quoted_parameter = g_shell_quote (parameter); full_command = g_strconcat (command_string, " ", quoted_parameter, NULL); g_free (quoted_parameter); } else { diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c index cfcd50304..b2439243f 100644 --- a/libnautilus-private/nautilus-theme.c +++ b/libnautilus-private/nautilus-theme.c @@ -398,12 +398,7 @@ nautilus_theme_make_preview_pixbuf (const char *theme_name) /* load the icon that we found and return it */ if (eel_istr_has_suffix (pixbuf_file, ".svg")) { - FILE *f = fopen (pixbuf_file, "rb"); - if (f != NULL) { - pixbuf = rsvg_render_file (f, 1.0); - fclose (f); - } - + pixbuf = rsvg_pixbuf_from_file (pixbuf_file, NULL); } else { pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL); } @@ -605,8 +600,7 @@ theme_get_themes_for_location (const char *themes_location_uri, possible_theme_directories = NULL; result = gnome_vfs_directory_list_load (&possible_theme_directories, themes_location_uri, - GNOME_VFS_FILE_INFO_FOLLOW_LINKS, - NULL); + GNOME_VFS_FILE_INFO_FOLLOW_LINKS); if (result != GNOME_VFS_OK) { return NULL; @@ -804,7 +798,7 @@ nautilus_theme_install_user_theme (const char *theme_to_install_path) char *theme_destination_path; if (theme_to_install_path == NULL - || !g_file_test (theme_to_install_path, G_FILE_TEST_EXISTS | G_FILE_TEST_ISDIR)) { + || !g_file_test (theme_to_install_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { return NAUTILUS_THEME_INSTALL_NOT_A_THEME_DIRECTORY; } diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index 2df7d4526..389ea2798 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -570,11 +570,7 @@ make_thumbnails (gpointer data) if (nautilus_file_is_mime_type (file, "image/svg")) { thumbnail_path = gnome_vfs_get_local_path_from_uri (info->thumbnail_uri); if (thumbnail_path != NULL) { - FILE *f = fopen (thumbnail_path, "rb"); - if (f != NULL) { - full_size_image = rsvg_render_file (f, 1.0); - fclose (f); - } + full_size_image = rsvg_pixbuf_from_file (thumbnail_path, NULL); } #ifdef HAVE_LIBJPEG } else if (nautilus_file_is_mime_type (file, "image/jpeg")) { diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c index 6c80505fc..6796f3f86 100644 --- a/libnautilus-private/nautilus-trash-directory.c +++ b/libnautilus-private/nautilus-trash-directory.c @@ -190,6 +190,7 @@ add_volume (NautilusTrashDirectory *trash, gnome_vfs_async_find_directory (&trash_volume->handle, &vfs_uri_as_list, GNOME_VFS_DIRECTORY_KIND_TRASH, FALSE, TRUE, 0777, + GNOME_VFS_PRIORITY_DEFAULT, find_directory_callback, trash_volume); gnome_vfs_uri_unref (volume_mount_uri); @@ -318,10 +319,10 @@ nautilus_trash_directory_init (gpointer object, gpointer klass) gtk_signal_connect (GTK_OBJECT (volume_monitor), "volume_mounted", - volume_mounted_callback, trash); + G_CALLBACK (volume_mounted_callback), trash); gtk_signal_connect (GTK_OBJECT (volume_monitor), "volume_unmount_started", - volume_unmount_started_callback, trash); + G_CALLBACK (volume_unmount_started_callback), trash); } /* Finish initializing a new NautilusTrashDirectory. We have to do the @@ -338,7 +339,7 @@ nautilus_trash_directory_finish_initializing (NautilusTrashDirectory *trash) gtk_signal_connect (GTK_OBJECT (nautilus_trash_monitor_get ()), "check_trash_directory_added", - check_trash_directory_added_callback, trash); + G_CALLBACK (check_trash_directory_added_callback), trash); nautilus_volume_monitor_each_mounted_volume (volume_monitor, add_one_volume, trash); } diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c index cb0070dc2..6a325a5f9 100644 --- a/libnautilus-private/nautilus-trash-file.c +++ b/libnautilus-private/nautilus-trash-file.c @@ -286,7 +286,7 @@ add_real_file (NautilusTrashFile *trash, gtk_signal_connect (GTK_OBJECT (real_file), "changed", - real_file_changed_callback, + G_CALLBACK (real_file_changed_callback), trash); /* Add the file to any extant monitors. */ @@ -331,7 +331,7 @@ remove_real_file (NautilusTrashFile *trash, real_file); gtk_signal_disconnect_by_func (GTK_OBJECT (real_file), - real_file_changed_callback, + G_CALLBACK (real_file_changed_callback), trash); trash->details->files = g_list_remove @@ -754,12 +754,12 @@ nautilus_trash_file_init (gpointer object, gpointer klass) trash_file->details->add_directory_connection_id = gtk_signal_connect (GTK_OBJECT (trash_directory), "add_real_directory", - add_directory_callback, + G_CALLBACK (add_directory_callback), trash_file); trash_file->details->remove_directory_connection_id = gtk_signal_connect (GTK_OBJECT (trash_directory), "remove_real_directory", - remove_directory_callback, + G_CALLBACK (remove_directory_callback), trash_file); real_directories = nautilus_merged_directory_get_real_directories diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c index a53c3dc33..3cb1c93c2 100644 --- a/libnautilus-private/nautilus-trash-monitor.c +++ b/libnautilus-private/nautilus-trash-monitor.c @@ -147,13 +147,13 @@ nautilus_trash_monitor_init (gpointer object, gpointer klass) gtk_signal_connect_while_alive (GTK_OBJECT (trash_directory), "files_added", - nautilus_trash_files_changed_callback, + G_CALLBACK (nautilus_trash_files_changed_callback), trash_monitor, GTK_OBJECT (trash_monitor)); gtk_signal_connect_while_alive (GTK_OBJECT (trash_directory), "files_changed", - nautilus_trash_files_changed_callback, + G_CALLBACK (nautilus_trash_files_changed_callback), trash_monitor, GTK_OBJECT (trash_monitor)); } diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c index d12c34ce8..51b90e788 100644 --- a/libnautilus-private/nautilus-undo-context.c +++ b/libnautilus-private/nautilus-undo-context.c @@ -45,60 +45,7 @@ static void destroy (GtkOb static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, CORBA_Environment *ev); -EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE) - -POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv = -{ - NULL, /* _private */ - &impl_Nautilus_Undo_Context__get_undo_manager, -}; - -static PortableServer_ServantBase__epv base_epv; -static POA_Nautilus_Undo_Context__vepv vepv = -{ - &base_epv, - NULL, - &libnautilus_Nautilus_Undo_Context_epv -}; - -static void -impl_Nautilus_Undo_Context__destroy (BonoboObject *object, - PortableServer_Servant servant) -{ - PortableServer_ObjectId *object_id; - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - object_id = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev); - CORBA_free (object_id); - object->servant = NULL; - - POA_Nautilus_Undo_Context__fini (servant, &ev); - g_free (servant); - - CORBA_exception_free (&ev); -} - -static Nautilus_Undo_Context -impl_Nautilus_Undo_Context__create (NautilusUndoContext *bonobo_object, - CORBA_Environment *ev) -{ - impl_POA_Nautilus_Undo_Context *servant; - - servant = g_new0 (impl_POA_Nautilus_Undo_Context, 1); - servant->servant.vepv = &vepv; - vepv.Bonobo_Unknown_epv = nautilus_bonobo_object_get_epv (); - POA_Nautilus_Undo_Context__init ((PortableServer_Servant) servant, ev); - - gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy", - GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), - servant); - - servant->bonobo_object = bonobo_object; - return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant); -} +EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE) static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, @@ -130,14 +77,6 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) static void nautilus_undo_context_init (NautilusUndoContext *context) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - bonobo_object_construct (BONOBO_OBJECT (context), - impl_Nautilus_Undo_Context__create (context, &ev)); - - CORBA_exception_free (&ev); } static void @@ -160,4 +99,6 @@ static void nautilus_undo_context_class_init (NautilusUndoContextClass *klass) { GTK_OBJECT_CLASS (klass)->destroy = destroy; + + klass->epv._get_undo_manager = impl_Nautilus_Undo_Context__get_undo_manager; } diff --git a/libnautilus-private/nautilus-undo-context.h b/libnautilus-private/nautilus-undo-context.h index 2559f764e..9aea27bce 100644 --- a/libnautilus-private/nautilus-undo-context.h +++ b/libnautilus-private/nautilus-undo-context.h @@ -47,9 +47,10 @@ typedef struct { typedef struct { BonoboObjectClass parent_slot; + POA_Nautilus_Undo_Context__epv epv; } NautilusUndoContextClass; -GtkType nautilus_undo_context_get_type (void); +GType nautilus_undo_context_get_type (void); NautilusUndoContext *nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager); #endif /* NAUTILUS_UNDO_CONTEXT_H */ diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index d82a6210f..b3db266da 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/nautilus-undo-manager.c @@ -98,50 +98,6 @@ static POA_Nautilus_Undo_Manager__vepv vepv = { }; static void -destroy_servant (BonoboObject *object, - UndoManagerServant *servant) -{ - PortableServer_ObjectId *object_id; - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - /* Deactivate the object. */ - object_id = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev); - CORBA_free (object_id); - - /* Disconnect the object from the servant. */ - object->servant = NULL; - - /* Free the servant. */ - POA_Nautilus_Undo_Manager__fini (servant, &ev); - g_free (servant); - - CORBA_exception_free (&ev); -} - -static Nautilus_Undo_Manager -create_servant (NautilusUndoManager *bonobo_object, - CORBA_Environment *ev) -{ - UndoManagerServant *servant; - - /* Create the servant. */ - servant = g_new0 (UndoManagerServant, 1); - servant->servant.vepv = &vepv; - servant->bonobo_object = bonobo_object; - POA_Nautilus_Undo_Manager__init ((PortableServer_Servant) servant, ev); - - /* Set up code so we will destroy the servant when the bonobo_object is destroyed. */ - gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy", - destroy_servant, servant); - - /* Activate the servant to create the CORBA object. */ - return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant); -} - -static void release_transaction (NautilusUndoManager *manager) { Nautilus_Undo_Transaction transaction; @@ -239,16 +195,7 @@ nautilus_undo_manager_new (void) static void nautilus_undo_manager_init (NautilusUndoManager *manager) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - manager->details = g_new0 (NautilusUndoManagerDetails, 1); - - bonobo_object_construct (BONOBO_OBJECT (manager), - create_servant (manager, &ev)); - - CORBA_exception_free (&ev); } static void @@ -323,13 +270,13 @@ destroy (GtkObject *object) } void -nautilus_undo_manager_attach (NautilusUndoManager *manager, GtkObject *target) +nautilus_undo_manager_attach (NautilusUndoManager *manager, GObject *target) { g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); g_return_if_fail (GTK_IS_OBJECT (target)); nautilus_undo_attach_undo_manager - (target, + (GTK_OBJECT (target), bonobo_object_corba_objref (BONOBO_OBJECT (manager))); } diff --git a/libnautilus-private/nautilus-undo-manager.h b/libnautilus-private/nautilus-undo-manager.h index 354ba6034..2f2e0cbf3 100644 --- a/libnautilus-private/nautilus-undo-manager.h +++ b/libnautilus-private/nautilus-undo-manager.h @@ -27,6 +27,7 @@ #define NAUTILUS_UNDO_MANAGER_H #include <bonobo/bonobo-object.h> +#include <libnautilus/nautilus-distributed-undo.h> #define NAUTILUS_TYPE_UNDO_MANAGER \ (nautilus_undo_manager_get_type ()) @@ -48,10 +49,11 @@ typedef struct { typedef struct { BonoboObjectClass parent_slot; - void (* changed) (GtkObject *object, gpointer data); + POA_Nautilus_Undo_Manager__epv epv; + void (* changed) (GObject *object, gpointer data); } NautilusUndoManagerClass; -GtkType nautilus_undo_manager_get_type (void); +GType nautilus_undo_manager_get_type (void); NautilusUndoManager *nautilus_undo_manager_new (void); /* Undo operations. */ @@ -69,7 +71,7 @@ void nautilus_undo_manager_set_up_bonobo_ui_handler_undo_item (N /* Attach the undo manager to a Gtk object so that object and the widgets inside it can participate in undo. */ void nautilus_undo_manager_attach (NautilusUndoManager *manager, - GtkObject *object); + GObject *object); /* Attach the undo manager to a Bonobo object so another component can find it. */ void nautilus_undo_manager_add_interface (NautilusUndoManager *manager, diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c index 2d708b312..cab6660d8 100644 --- a/libnautilus-private/nautilus-undo-signal-handlers.c +++ b/libnautilus-private/nautilus-undo-signal-handlers.c @@ -30,6 +30,7 @@ #include <libnautilus/nautilus-undo.h> #include <eel/eel-gtk-macros.h> +#include <string.h> #include "nautilus-undo-signal-handlers.h" @@ -160,11 +161,12 @@ editable_register_edit_undo (GtkEditable *editable) return; } - undo_data = g_new (EditableUndoData, 1); + undo_data = g_new0 (EditableUndoData, 1); undo_data->undo_text = g_strdup (gtk_editable_get_chars (editable, 0, -1)); undo_data->position = gtk_editable_get_position (editable); - undo_data->selection_start = editable->selection_start_pos; - undo_data->selection_end = editable->selection_end_pos; + gtk_editable_get_selection_bounds (editable, + &undo_data->selection_start, + &undo_data->selection_end); nautilus_undo_register (GTK_OBJECT (editable), diff --git a/libnautilus-private/nautilus-view-identifier.c b/libnautilus-private/nautilus-view-identifier.c index a35833be9..f77152777 100644 --- a/libnautilus-private/nautilus-view-identifier.c +++ b/libnautilus-private/nautilus-view-identifier.c @@ -85,7 +85,8 @@ static GSList * get_lang_list (void) { GSList *retval; - char *lang, *lang_with_locale, *tmp, *org_pointer; + const char *tmp; + char *lang, *lang_with_locale, *org_pointer; char *equal_char; retval = NULL; @@ -132,7 +133,7 @@ get_lang_list (void) } NautilusViewIdentifier * -nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerInfo *server, char *name_attribute) +nautilus_view_identifier_new_from_bonobo_server_info (Bonobo_ServerInfo *server, char *name_attribute) { const char *view_as_name; const char *view_as_label; @@ -141,12 +142,12 @@ nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerIn langs = get_lang_list (); - view_as_name = bonobo_activation_server_info_prop_lookup (server, name_attribute, langs); - view_as_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:view_as_label", langs); - viewer_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:viewer_label", langs); + view_as_name = bonobo_server_info_prop_lookup (server, name_attribute, langs); + view_as_label = bonobo_server_info_prop_lookup (server, "nautilus:view_as_label", langs); + viewer_label = bonobo_server_info_prop_lookup (server, "nautilus:viewer_label", langs); if (view_as_name == NULL) { - view_as_name = bonobo_activation_server_info_prop_lookup (server, "name", langs); + view_as_name = bonobo_server_info_prop_lookup (server, "name", langs); } if (view_as_name == NULL) { view_as_name = server->iid; @@ -178,21 +179,21 @@ nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerIn NautilusViewIdentifier * nautilus_view_identifier_new_from_content_view (Bonobo_ServerInfo *server) { - return nautilus_view_identifier_new_from_bonobo_activation_server_info + return nautilus_view_identifier_new_from_bonobo_server_info (server, "nautilus:view_as_name"); } NautilusViewIdentifier * nautilus_view_identifier_new_from_property_page (Bonobo_ServerInfo *server) { - return nautilus_view_identifier_new_from_bonobo_activation_server_info + return nautilus_view_identifier_new_from_bonobo_server_info (server, "nautilus:property_page_name"); } NautilusViewIdentifier * nautilus_view_identifier_new_from_sidebar_panel (Bonobo_ServerInfo *server) { - return nautilus_view_identifier_new_from_bonobo_activation_server_info + return nautilus_view_identifier_new_from_bonobo_server_info (server, "nautilus:sidebar_panel_name"); } diff --git a/libnautilus-private/nautilus-view-identifier.h b/libnautilus-private/nautilus-view-identifier.h index d4f4d84ca..22a3baf74 100644 --- a/libnautilus-private/nautilus-view-identifier.h +++ b/libnautilus-private/nautilus-view-identifier.h @@ -34,17 +34,17 @@ typedef struct { char *viewer_label; /* "<name> Viewer" */ } NautilusViewIdentifier; -NautilusViewIdentifier *nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerInfo *server, - char *name_attribute); -NautilusViewIdentifier *nautilus_view_identifier_new_from_content_view (Bonobo_ServerInfo *server); -NautilusViewIdentifier *nautilus_view_identifier_new_from_sidebar_panel (Bonobo_ServerInfo *server); -NautilusViewIdentifier *nautilus_view_identifier_new_from_property_page (Bonobo_ServerInfo *server); -NautilusViewIdentifier *nautilus_view_identifier_copy (const NautilusViewIdentifier *identifier); -void nautilus_view_identifier_free (NautilusViewIdentifier *identifier); -int nautilus_view_identifier_compare (const NautilusViewIdentifier *a, - const NautilusViewIdentifier *b); +NautilusViewIdentifier *nautilus_view_identifier_new_from_bonobo_server_info (Bonobo_ServerInfo *server, + char *name_attribute); +NautilusViewIdentifier *nautilus_view_identifier_new_from_content_view (Bonobo_ServerInfo *server); +NautilusViewIdentifier *nautilus_view_identifier_new_from_sidebar_panel (Bonobo_ServerInfo *server); +NautilusViewIdentifier *nautilus_view_identifier_new_from_property_page (Bonobo_ServerInfo *server); +NautilusViewIdentifier *nautilus_view_identifier_copy (const NautilusViewIdentifier *identifier); +void nautilus_view_identifier_free (NautilusViewIdentifier *identifier); +int nautilus_view_identifier_compare (const NautilusViewIdentifier *a, + const NautilusViewIdentifier *b); /* lists of NautilusViewIdentifier */ -GList * nautilus_view_identifier_list_copy (GList *list); -void nautilus_view_identifier_list_free (GList *list); +GList * nautilus_view_identifier_list_copy (GList *list); +void nautilus_view_identifier_list_free (GList *list); #endif /* NAUTILUS_VIEW_IDENTIFIER */ diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index c637ac828..e8e265814 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -1493,7 +1493,7 @@ mount_unmount_callback (void *arg) { FILE *file; MountThreadInfo *info; - gchar *old_locale; + const char *old_locale; info = arg; |