Commit 5b9963c2 authored by Darin Adler's avatar Darin Adler
Browse files

libnautilus-private now compiles -- on to src

        * Lots of files:
	libnautilus-private now compiles -- on to src
parent 93359a3e
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.
......
......@@ -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 ====================================
......
......@@ -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)
......
......@@ -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)));
......
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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 */
......@@ -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
......@@ -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 */
......@@ -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
......@@ -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);
}
......
......@@ -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;
......
......@@ -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"
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment