From 3f5c0ce05398d9a7732b634169af0cb6513e15e8 Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Fri, 1 Aug 2003 18:19:52 +0000 Subject: Backport from 2.4. 2003-08-01 Dave Camp Backport from 2.4. * src/nautilus-view-frame.c: (nautilus_view_frame_get_first_visible_file), (nautilus_view_frame_scroll_to_file): Pass envs to the CORBA calls. --- ChangeLog | 9 +++++++++ src/nautilus-view-frame.c | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ce502d15..b3e3e2a19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-08-01 Dave Camp + + Backport from 2.4. + + * src/nautilus-view-frame.c: + (nautilus_view_frame_get_first_visible_file), + (nautilus_view_frame_scroll_to_file): Pass envs to the CORBA + calls. + 2003-07-20 Dave Camp * libnautilus-private/nautilus-link-desktop-file.c: diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index c6a98945a..afc1396ff 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -1091,10 +1091,15 @@ nautilus_view_frame_get_first_visible_file (NautilusViewFrame *view) ret = NULL; if (view->details->positionable) { - uri = Nautilus_ScrollPositionable_get_first_visible_file (view->details->positionable, NULL); + CORBA_Environment ev; + + CORBA_exception_init (&ev); + uri = Nautilus_ScrollPositionable_get_first_visible_file (view->details->positionable, &ev); ret = g_strdup (uri); CORBA_free (uri); + CORBA_exception_free (&ev); } + return ret; } @@ -1103,9 +1108,13 @@ nautilus_view_frame_scroll_to_file (NautilusViewFrame *view, const char *uri) { if (view->details->positionable) { + CORBA_Environment ev; + + CORBA_exception_init (&ev); Nautilus_ScrollPositionable_scroll_to_file (view->details->positionable, uri, - NULL); + &ev); + CORBA_exception_free (&ev); } } -- cgit v1.2.1