diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-04-03 18:27:22 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-04-03 18:27:22 +0000 |
| commit | 2fe15f1645d39857e32adcdb375c93ec1bb2a3ed (patch) | |
| tree | 9f371171bbbad091f58f6f7650c38f032ffdc750 /components/html | |
| parent | 2ee8f8389a3b49c2894529cdd9b5a2bf60dca6a9 (diff) | |
| download | nautilus-2fe15f1645d39857e32adcdb375c93ec1bb2a3ed.tar.gz | |
Fix the build. Changes in GtkHtml and Bonobo required us
to catch up.
* libnautilus/ntl-meta-view-frame.h:
* libnautilus/ntl-meta-view-frame.c:
Rewrote to use the new property bag. This requires us to
store our own properties, since the bag no longer provides
any storage.
(nautilus_meta_view_frame_initialize): Set up the label.
(nautilus_meta_view_frame_new_from_bonobo_control): Make it
actually take a BonoboControl instead of a BonoboObject and
make it set up the property bag.
(nautilus_meta_view_destroy): Free the label.
(autilus_meta_view_frame_set_label): Just set the label.
The property bag simply uses our stored label.
* components/html/ntl-web-browser.c (browser_url_load_gone):
Changed call to match name in new version of GtkHtml.
Unfortunately, the new name makes it clear the call is
intended to be private.
* components/rpmview/.cvsignore: Ignore the actual binary,
not nautilus-music-view.
* components/rpmview/Makefile.am: Turned on -Werror.
* components/music/Makefile.am: Turned on -Werror.
* components/rpmview/nautilus-rpm-view.c: Fixed warnings.
Diffstat (limited to 'components/html')
| -rw-r--r-- | components/html/ntl-web-browser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c index 4897f337a..f0b94839f 100644 --- a/components/html/ntl-web-browser.c +++ b/components/html/ntl-web-browser.c @@ -183,7 +183,8 @@ browser_url_load_done(GtkWidget *htmlw, BrowserInfo *bi) { Nautilus_ProgressRequestInfo pri; - gtk_html_calc_scrollbars(GTK_HTML(bi->htmlw)); + /* FIXME: If this is private, we should not be calling it. */ + gtk_html_private_calc_scrollbars(GTK_HTML(bi->htmlw)); memset(&pri, 0, sizeof(pri)); |