summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Camp <dave@ximian.com>2003-08-01 18:19:52 +0000
committerDave Camp <campd@src.gnome.org>2003-08-01 18:19:52 +0000
commit3f5c0ce05398d9a7732b634169af0cb6513e15e8 (patch)
tree4cf222d756748de74f3d9dbce8a3bc5efcf67ff9
parentfd3daf1a80096a45ab13a8fdbe10016365ca95a2 (diff)
downloadnautilus-3f5c0ce05398d9a7732b634169af0cb6513e15e8.tar.gz
Backport from 2.4.
2003-08-01 Dave Camp <dave@ximian.com> 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.
-rw-r--r--ChangeLog9
-rw-r--r--src/nautilus-view-frame.c13
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 <dave@ximian.com>
+
+ 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 <dave@ximian.com>
* 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);
}
}