diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 2 | ||||
-rw-r--r-- | src/file-manager/fm-directory-view.c | 6 | ||||
-rw-r--r-- | src/file-manager/fm-list-view.c | 2 | ||||
-rw-r--r-- | src/nautilus-bookmark-list.c | 4 | ||||
-rw-r--r-- | src/nautilus-bookmark-parsing.c | 4 | ||||
-rw-r--r-- | src/nautilus-search-bar-criterion.c | 2 | ||||
-rw-r--r-- | src/nautilus-sidebar-title.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index e76a835c9..e0143f461 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -548,7 +548,7 @@ change_background_callback (BonoboUIComponent *component, gpointer data, const char *verb) { - eel_launch_application_from_command + nautilus_launch_application_from_command ("background-properties-capplet", NULL, FALSE); } diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 4a7485a9a..19ea3c53a 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3462,7 +3462,7 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const if (nautilus_directory_is_local (launch_parameters->directory_view->details->model)) { parameters = get_file_names_as_parameter_string (selected_files); - /* FIXME: must append command and parameters here, because eel_launch_application_from_command + /* FIXME: must append command and parameters here, because nautilus_launch_application_from_command * quotes all parameters as if they are a single parameter. Should add or change API in * nautilus-program-choosing.c to support multiple parameters. */ @@ -3476,7 +3476,7 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const } /* FIXME: handle errors with dialog? Or leave up to each script? */ - eel_launch_application_from_command (command, NULL, FALSE); + nautilus_launch_application_from_command (command, NULL, FALSE); g_free (command); nautilus_file_list_free (selected_files); @@ -4480,7 +4480,7 @@ activate_callback (NautilusFile *file, gpointer callback_data) * lame way to run command-line tools, since * there's no terminal for the output. */ - eel_launch_application_from_command (quoted_path, NULL, FALSE); + nautilus_launch_application_from_command (quoted_path, NULL, FALSE); g_free (quoted_path); } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index ec3e4192e..eda433ef2 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2095,7 +2095,7 @@ fm_list_view_get_emblem_pixbufs_for_file (FMListView *list_view, } emblem_pixbufs = g_list_reverse (emblem_pixbufs); - eel_scalable_icon_list_free (emblem_icons); + nautilus_scalable_icon_list_free (emblem_icons); return emblem_pixbufs; } diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c index a3b28c3b6..d8f5c764f 100644 --- a/src/nautilus-bookmark-list.c +++ b/src/nautilus-bookmark-list.c @@ -155,10 +155,10 @@ append_bookmark_node (gpointer data, gpointer user_data) icon = nautilus_bookmark_get_icon (bookmark); if (icon != NULL) { /* Don't bother storing modifier or embedded text for bookmarks. */ - eel_scalable_icon_get_text_pieces (icon, &icon_uri, &icon_name, NULL, NULL); + nautilus_scalable_icon_get_text_pieces (icon, &icon_uri, &icon_name, NULL, NULL); xmlSetProp (bookmark_node, "icon_uri", icon_uri); xmlSetProp (bookmark_node, "icon_name", icon_name); - eel_scalable_icon_unref (icon); + nautilus_scalable_icon_unref (icon); g_free (icon_uri); g_free (icon_name); } diff --git a/src/nautilus-bookmark-parsing.c b/src/nautilus-bookmark-parsing.c index 65092106b..c84adb90c 100644 --- a/src/nautilus-bookmark-parsing.c +++ b/src/nautilus-bookmark-parsing.c @@ -51,12 +51,12 @@ nautilus_bookmark_new_from_node (xmlNodePtr node) if (icon_uri == NULL && icon_name == NULL) { icon = NULL; } else { - icon = eel_scalable_icon_new_from_text_pieces + icon = nautilus_scalable_icon_new_from_text_pieces (icon_uri, icon_name, NULL, NULL, FALSE); } new_bookmark = nautilus_bookmark_new_with_icon (uri, name, icon); if (icon != NULL) { - eel_scalable_icon_unref (icon); + nautilus_scalable_icon_unref (icon); } xmlFree (name); diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index eb1b9cf91..85c1ea809 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -617,7 +617,7 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio } else if (criterion->details->use_value_entry) { value_text = gtk_entry_get_text (GTK_ENTRY (criterion->details->value_entry)); } else if (criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) { - value_text = eel_gnome_date_edit_get_date_as_string (criterion->details->date); + value_text = nautilus_gnome_date_edit_get_date_as_string (criterion->details->date); } switch (name_number) { diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index 36d7511e5..3db7df0ce 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -645,7 +645,7 @@ update_emblems (NautilusSidebarTitle *sidebar_title) } } - eel_scalable_icon_list_free (icons); + nautilus_scalable_icon_list_free (icons); } static void |