Commit e97c47c2 authored by Elliot Lee's avatar Elliot Lee

Now works. Duplicate the URI being requested, since we don't know what the



* components/history/ntl-history-view.c: Now works.
* src/ntl-uri-map.c: Duplicate the URI being requested, since we
don't know what the lifetime of the original value will be.
* src/ntl-window.c: Use the paned instead of hbox, use create_menus_with_data instead.
* src/file-manager: Misc warning fixes.
* src/gtkscrollframe.c: Try to get rid of scrollbar chopping.
parent 9e591b00
1999-12-16 Elliot Lee <sopwith@redhat.com>
* components/history/ntl-history-view.c: Now works.
* src/ntl-uri-map.c: Duplicate the URI being requested, since we
don't know what the lifetime of the original value will be.
* src/ntl-window.c: Use the paned instead of hbox, use create_menus_with_data instead.
* src/file-manager: Misc warning fixes.
* src/gtkscrollframe.c: Try to get rid of scrollbar chopping.
1999-12-16 John Sullivan <sullivan@eazel.com>
* src/ntl-window.c (file_menu_new_window_cb):
......
......@@ -23,7 +23,7 @@ hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
clist = hview->clist;
if(hview->last_row > 0)
if(hview->last_row >= 0)
{
char *uri;
int i;
......@@ -32,14 +32,17 @@ hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
select a new row that is farther ahead in history, or delete
all the history ahead of this point */
gtk_clist_get_text(clist, hview->last_row - 1, 1, &uri);
if(!strcmp(uri, loci->requested_uri))
for(i = -1; i <= 1; i++)
{
new_rownum = --hview->last_row;
goto skip_prepend;
gtk_clist_get_text(clist, hview->last_row + i, 0, &uri);
if(!strcmp(uri, loci->requested_uri))
{
new_rownum = hview->last_row + i;
goto skip_prepend;
}
}
for(i = 0; i <= hview->last_row; i++)
for(i = 0; i < hview->last_row; i++)
gtk_clist_remove(clist, 0);
}
......@@ -107,7 +110,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
/* create interface */
col_titles[0] = _("Path");
clist = gtk_clist_new_with_titles(2, col_titles);
clist = gtk_clist_new_with_titles(1, col_titles);
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_BROWSE);
gtk_clist_columns_autosize(GTK_CLIST(clist));
wtmp = gtk_scrolled_window_new(gtk_clist_get_hadjustment(GTK_CLIST(clist)),
......
......@@ -23,7 +23,7 @@ hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
clist = hview->clist;
if(hview->last_row > 0)
if(hview->last_row >= 0)
{
char *uri;
int i;
......@@ -32,14 +32,17 @@ hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
select a new row that is farther ahead in history, or delete
all the history ahead of this point */
gtk_clist_get_text(clist, hview->last_row - 1, 1, &uri);
if(!strcmp(uri, loci->requested_uri))
for(i = -1; i <= 1; i++)
{
new_rownum = --hview->last_row;
goto skip_prepend;
gtk_clist_get_text(clist, hview->last_row + i, 0, &uri);
if(!strcmp(uri, loci->requested_uri))
{
new_rownum = hview->last_row + i;
goto skip_prepend;
}
}
for(i = 0; i <= hview->last_row; i++)
for(i = 0; i < hview->last_row; i++)
gtk_clist_remove(clist, 0);
}
......@@ -107,7 +110,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
/* create interface */
col_titles[0] = _("Path");
clist = gtk_clist_new_with_titles(2, col_titles);
clist = gtk_clist_new_with_titles(1, col_titles);
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_BROWSE);
gtk_clist_columns_autosize(GTK_CLIST(clist));
wtmp = gtk_scrolled_window_new(gtk_clist_get_hadjustment(GTK_CLIST(clist)),
......
......@@ -613,6 +613,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
if (priv->vsb_visible) {
GtkRequisition vsb_requisition;
gint possible_new_width;
gtk_widget_get_child_requisition (priv->vsb, &vsb_requisition);
......@@ -620,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
|| priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
allocation->x += vsb_requisition.width + priv->sb_spacing;
allocation->width = MAX (1, ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing)));
possible_new_width = ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing));
allocation->width = MAX (0, possible_new_width);
}
if (priv->hsb_visible) {
......@@ -637,7 +639,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
possible_new_height =
( ((gint)allocation->height)
- ((gint)hsb_requisition.height) + ((gint)priv->sb_spacing));
allocation->height = MAX (1, possible_new_height);
allocation->height = MAX (0, possible_new_height);
}
}
......@@ -740,8 +742,12 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (priv->frame_placement == GTK_CORNER_TOP_LEFT
|| priv->frame_placement == GTK_CORNER_TOP_RIGHT)
child_allocation.y = (relative_allocation.y
#if 0
+ relative_allocation.height
+ priv->sb_spacing);
#else
+ relative_allocation.height);
#endif
else
child_allocation.y = GTK_CONTAINER (sf)->border_width;
......
......@@ -62,12 +62,13 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
return new;
}
#if 0
static void
xfer_info_destroy (XferInfo *info)
{
g_free (info);
}
#endif
static void
xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
......@@ -162,9 +163,6 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
default:
dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
error (0, 0,
_("Copy operation failed:\n%s"),
gnome_vfs_result_to_string (progress_info->vfs_status));
dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
gtk_widget_destroy (xfer_info->progress_dialog);
......
......@@ -613,6 +613,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
if (priv->vsb_visible) {
GtkRequisition vsb_requisition;
gint possible_new_width;
gtk_widget_get_child_requisition (priv->vsb, &vsb_requisition);
......@@ -620,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
|| priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
allocation->x += vsb_requisition.width + priv->sb_spacing;
allocation->width = MAX (1, ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing)));
possible_new_width = ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing));
allocation->width = MAX (0, possible_new_width);
}
if (priv->hsb_visible) {
......@@ -637,7 +639,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
possible_new_height =
( ((gint)allocation->height)
- ((gint)hsb_requisition.height) + ((gint)priv->sb_spacing));
allocation->height = MAX (1, possible_new_height);
allocation->height = MAX (0, possible_new_height);
}
}
......@@ -740,8 +742,12 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (priv->frame_placement == GTK_CORNER_TOP_LEFT
|| priv->frame_placement == GTK_CORNER_TOP_RIGHT)
child_allocation.y = (relative_allocation.y
#if 0
+ relative_allocation.height
+ priv->sb_spacing);
#else
+ relative_allocation.height);
#endif
else
child_allocation.y = GTK_CONTAINER (sf)->border_width;
......
......@@ -613,6 +613,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
if (priv->vsb_visible) {
GtkRequisition vsb_requisition;
gint possible_new_width;
gtk_widget_get_child_requisition (priv->vsb, &vsb_requisition);
......@@ -620,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
|| priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
allocation->x += vsb_requisition.width + priv->sb_spacing;
allocation->width = MAX (1, ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing)));
possible_new_width = ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing));
allocation->width = MAX (0, possible_new_width);
}
if (priv->hsb_visible) {
......@@ -637,7 +639,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
possible_new_height =
( ((gint)allocation->height)
- ((gint)hsb_requisition.height) + ((gint)priv->sb_spacing));
allocation->height = MAX (1, possible_new_height);
allocation->height = MAX (0, possible_new_height);
}
}
......@@ -740,8 +742,12 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (priv->frame_placement == GTK_CORNER_TOP_LEFT
|| priv->frame_placement == GTK_CORNER_TOP_RIGHT)
child_allocation.y = (relative_allocation.y
#if 0
+ relative_allocation.height
+ priv->sb_spacing);
#else
+ relative_allocation.height);
#endif
else
child_allocation.y = GTK_CONTAINER (sf)->border_width;
......
......@@ -62,12 +62,13 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
return new;
}
#if 0
static void
xfer_info_destroy (XferInfo *info)
{
g_free (info);
}
#endif
static void
xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
......@@ -162,9 +163,6 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
default:
dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
error (0, 0,
_("Copy operation failed:\n%s"),
gnome_vfs_result_to_string (progress_info->vfs_status));
dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
gtk_widget_destroy (xfer_info->progress_dialog);
......
......@@ -613,6 +613,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
if (priv->vsb_visible) {
GtkRequisition vsb_requisition;
gint possible_new_width;
gtk_widget_get_child_requisition (priv->vsb, &vsb_requisition);
......@@ -620,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
|| priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
allocation->x += vsb_requisition.width + priv->sb_spacing;
allocation->width = MAX (1, ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing)));
possible_new_width = ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing));
allocation->width = MAX (0, possible_new_width);
}
if (priv->hsb_visible) {
......@@ -637,7 +639,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
possible_new_height =
( ((gint)allocation->height)
- ((gint)hsb_requisition.height) + ((gint)priv->sb_spacing));
allocation->height = MAX (1, possible_new_height);
allocation->height = MAX (0, possible_new_height);
}
}
......@@ -740,8 +742,12 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (priv->frame_placement == GTK_CORNER_TOP_LEFT
|| priv->frame_placement == GTK_CORNER_TOP_RIGHT)
child_allocation.y = (relative_allocation.y
#if 0
+ relative_allocation.height
+ priv->sb_spacing);
#else
+ relative_allocation.height);
#endif
else
child_allocation.y = GTK_CONTAINER (sf)->border_width;
......
......@@ -613,6 +613,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
if (priv->vsb_visible) {
GtkRequisition vsb_requisition;
gint possible_new_width;
gtk_widget_get_child_requisition (priv->vsb, &vsb_requisition);
......@@ -620,8 +621,9 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
|| priv->frame_placement == GTK_CORNER_BOTTOM_RIGHT)
allocation->x += vsb_requisition.width + priv->sb_spacing;
allocation->width = MAX (1, ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing)));
possible_new_width = ((gint) allocation->width
- ((gint) vsb_requisition.width + priv->sb_spacing));
allocation->width = MAX (0, possible_new_width);
}
if (priv->hsb_visible) {
......@@ -637,7 +639,7 @@ compute_relative_allocation (GtkWidget *widget, GtkAllocation *allocation)
possible_new_height =
( ((gint)allocation->height)
- ((gint)hsb_requisition.height) + ((gint)priv->sb_spacing));
allocation->height = MAX (1, possible_new_height);
allocation->height = MAX (0, possible_new_height);
}
}
......@@ -740,8 +742,12 @@ gtk_scroll_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (priv->frame_placement == GTK_CORNER_TOP_LEFT
|| priv->frame_placement == GTK_CORNER_TOP_RIGHT)
child_allocation.y = (relative_allocation.y
#if 0
+ relative_allocation.height
+ priv->sb_spacing);
#else
+ relative_allocation.height);
#endif
else
child_allocation.y = GTK_CONTAINER (sf)->border_width;
......
......@@ -182,7 +182,7 @@ create_server (DFOS *dfos,
FileOperationService_base_epv.finalize = NULL;
FileOperationService_base_epv.default_POA = NULL;
FileOperationService_epv.xfer = impl_FileOperationService_xfer;
FileOperationService_epv.xfer = (gpointer)impl_FileOperationService_xfer;
FileOperationService_vepv._base_epv = &FileOperationService_base_epv;
FileOperationService_vepv.GNOME_Desktop_FileOperationService_epv =
......
......@@ -62,12 +62,13 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
return new;
}
#if 0
static void
xfer_info_destroy (XferInfo *info)
{
g_free (info);
}
#endif
static void
xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
......@@ -162,9 +163,6 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
default:
dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
error (0, 0,
_("Copy operation failed:\n%s"),
gnome_vfs_result_to_string (progress_info->vfs_status));
dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
(xfer_info->progress_dialog));
gtk_widget_destroy (xfer_info->progress_dialog);
......
......@@ -35,6 +35,8 @@ static gint
delete_event_cb(GtkWidget* window, GdkEventAny* event, gpointer data)
{
gtk_main_quit();
return TRUE;
}
int
......
......@@ -37,7 +37,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
const char *meta_keys[] = {"icon-filename", NULL};
memset(navinfo, 0, sizeof(*navinfo));
navinfo->navinfo.requested_uri = nri->requested_uri;
navinfo->navinfo.requested_uri = g_strdup(nri->requested_uri);
if(old_navinfo)
{
navinfo->navinfo.referring_uri = old_navinfo->requested_uri;
......@@ -107,4 +107,5 @@ nautilus_navinfo_free(NautilusNavigationInfo *navinfo)
gnome_vfs_file_info_destroy(navinfo->vfs_fileinfo);
g_slist_free(navinfo->meta_iids);
g_free(navinfo->navinfo.requested_uri);
}
......@@ -107,7 +107,8 @@ static void nautilus_window_goto_url_cb (GtkWidget *widget,
const char *url,
GtkWidget *window);
#define CONTENTS_AS_HBOX
#undef CONTENTS_AS_HBOX
/* milliseconds */
#define STATUSBAR_CLEAR_TIMEOUT 5000
......@@ -363,20 +364,11 @@ nautilus_window_constructed(NautilusWindow *window)
{
GnomeApp *app;
GtkWidget *location_bar_box, *statusbar;
GtkMenuBar *menubar;
GtkAccelGroup *ag;
app = GNOME_APP(window);
ag = gtk_accel_group_new();
gtk_object_set_data(GTK_OBJECT(app), "GtkAccelGroup", ag);
gtk_window_add_accel_group(GTK_WINDOW(app), ag);
// set up menu bar
menubar = GTK_MENU_BAR(gtk_menu_bar_new());
gnome_app_fill_menu_with_data(GTK_MENU_SHELL(menubar), main_menu, ag, TRUE, 0, window);
gnome_app_set_menus(GNOME_APP(window), menubar);
gnome_app_create_menus_with_data(app, main_menu, window);
// desensitize the items that haven't yet been implemented
// FIXME: these all need to be implemented. I'm using hardwired numbers
......@@ -395,7 +387,7 @@ nautilus_window_constructed(NautilusWindow *window)
// set up toolbar
gnome_app_create_toolbar_with_data (GNOME_APP(window), toolbar_info, window);
gnome_app_create_toolbar_with_data(app, toolbar_info, window);
window->btn_back = toolbar_info[0].widget;
window->btn_fwd = toolbar_info[1].widget;
......@@ -515,7 +507,7 @@ nautilus_window_set_arg (GtkObject *object,
#ifdef CONTENTS_AS_HBOX
gtk_box_pack_start(GTK_BOX(window->content_hbox), GTK_WIDGET(new_cv), TRUE, TRUE, GNOME_PAD);
#else
gtk_paned_pack1(GTK_PANED(window->content_hbox), new_cv, TRUE, FALSE);
gtk_paned_pack1(GTK_PANED(window->content_hbox), GTK_WIDGET(new_cv), TRUE, FALSE);
#endif
gtk_widget_queue_resize(window->content_hbox);
......
......@@ -107,7 +107,8 @@ static void nautilus_window_goto_url_cb (GtkWidget *widget,
const char *url,
GtkWidget *window);
#define CONTENTS_AS_HBOX
#undef CONTENTS_AS_HBOX
/* milliseconds */
#define STATUSBAR_CLEAR_TIMEOUT 5000
......@@ -363,20 +364,11 @@ nautilus_window_constructed(NautilusWindow *window)
{
GnomeApp *app;
GtkWidget *location_bar_box, *statusbar;
GtkMenuBar *menubar;
GtkAccelGroup *ag;
app = GNOME_APP(window);
ag = gtk_accel_group_new();
gtk_object_set_data(GTK_OBJECT(app), "GtkAccelGroup", ag);
gtk_window_add_accel_group(GTK_WINDOW(app), ag);
// set up menu bar
menubar = GTK_MENU_BAR(gtk_menu_bar_new());
gnome_app_fill_menu_with_data(GTK_MENU_SHELL(menubar), main_menu, ag, TRUE, 0, window);
gnome_app_set_menus(GNOME_APP(window), menubar);
gnome_app_create_menus_with_data(app, main_menu, window);
// desensitize the items that haven't yet been implemented
// FIXME: these all need to be implemented. I'm using hardwired numbers
......@@ -395,7 +387,7 @@ nautilus_window_constructed(NautilusWindow *window)
// set up toolbar
gnome_app_create_toolbar_with_data (GNOME_APP(window), toolbar_info, window);
gnome_app_create_toolbar_with_data(app, toolbar_info, window);
window->btn_back = toolbar_info[0].widget;
window->btn_fwd = toolbar_info[1].widget;
......@@ -515,7 +507,7 @@ nautilus_window_set_arg (GtkObject *object,
#ifdef CONTENTS_AS_HBOX
gtk_box_pack_start(GTK_BOX(window->content_hbox), GTK_WIDGET(new_cv), TRUE, TRUE, GNOME_PAD);
#else
gtk_paned_pack1(GTK_PANED(window->content_hbox), new_cv, TRUE, FALSE);
gtk_paned_pack1(GTK_PANED(window->content_hbox), GTK_WIDGET(new_cv), TRUE, FALSE);
#endif
gtk_widget_queue_resize(window->content_hbox);
......
......@@ -107,7 +107,8 @@ static void nautilus_window_goto_url_cb (GtkWidget *widget,
const char *url,
GtkWidget *window);
#define CONTENTS_AS_HBOX
#undef CONTENTS_AS_HBOX
/* milliseconds */
#define STATUSBAR_CLEAR_TIMEOUT 5000
......@@ -363,20 +364,11 @@ nautilus_window_constructed(NautilusWindow *window)
{
GnomeApp *app;
GtkWidget *location_bar_box, *statusbar;
GtkMenuBar *menubar;
GtkAccelGroup *ag;
app = GNOME_APP(window);
ag = gtk_accel_group_new();
gtk_object_set_data(GTK_OBJECT(app), "GtkAccelGroup", ag);
gtk_window_add_accel_group(GTK_WINDOW(app), ag);
// set up menu bar
menubar = GTK_MENU_BAR(gtk_menu_bar_new());
gnome_app_fill_menu_with_data(GTK_MENU_SHELL(menubar), main_menu, ag, TRUE, 0, window);
gnome_app_set_menus(GNOME_APP(window), menubar);
gnome_app_create_menus_with_data(app, main_menu, window);
// desensitize the items that haven't yet been implemented
// FIXME: these all need to be implemented. I'm using hardwired numbers
......@@ -395,7 +387,7 @@ nautilus_window_constructed(NautilusWindow *window)
// set up toolbar
gnome_app_create_toolbar_with_data (GNOME_APP(window), toolbar_info, window);
gnome_app_create_toolbar_with_data(app, toolbar_info, window);
window->btn_back = toolbar_info[0].widget;
window->btn_fwd = toolbar_info[1].widget;
......@@ -515,7 +507,7 @@ nautilus_window_set_arg (GtkObject *object,
#ifdef CONTENTS_AS_HBOX
gtk_box_pack_start(GTK_BOX(window->content_hbox), GTK_WIDGET(new_cv), TRUE, TRUE, GNOME_PAD);
#else
gtk_paned_pack1(GTK_PANED(window->content_hbox), new_cv, TRUE, FALSE);
gtk_paned_pack1(GTK_PANED(window->content_hbox), GTK_WIDGET(new_cv), TRUE, FALSE);
#endif
gtk_widget_queue_resize(window->content_hbox);
......
......@@ -107,7 +107,8 @@ static void nautilus_window_goto_url_cb (GtkWidget *widget,
const char *url,
GtkWidget *window);
#define CONTENTS_AS_HBOX
#undef CONTENTS_AS_HBOX
/* milliseconds */
#define STATUSBAR_CLEAR_TIMEOUT 5000
......@@ -363,20 +364,11 @@ nautilus_window_constructed(NautilusWindow *window)
{
GnomeApp *app;
GtkWidget *location_bar_box, *statusbar;
GtkMenuBar *menubar;
GtkAccelGroup *ag;
app = GNOME_APP(window);
ag = gtk_accel_group_new();
gtk_object_set_data(GTK_OBJECT(app), "GtkAccelGroup", ag);
gtk_window_add_accel_group(GTK_WINDOW(app), ag);
// set up menu bar
menubar = GTK_MENU_BAR(gtk_menu_bar_new());
gnome_app_fill_menu_with_data(GTK_MENU_SHELL(menubar), main_menu, ag, TRUE, 0, window);
gnome_app_set_menus(GNOME_APP(window), menubar);
gnome_app_create_menus_with_data(app, main_menu, window);
// desensitize the items that haven't yet been implemented
// FIXME: these all need to be implemented. I'm using hardwired numbers
......@@ -395,7 +387,7 @@ nautilus_window_constructed(NautilusWindow *window)
// set up toolbar
gnome_app_create_toolbar_with_data (GNOME_APP(window), toolbar_info, window);
gnome_app_create_toolbar_with_data(app, toolbar_info, window);
window->btn_back = toolbar_info[0].widget;
window->btn_fwd = toolbar_info[1].widget;
......@@ -515,7 +507,7 @@ nautilus_window_set_arg (GtkObject *object,
#ifdef CONTENTS_AS_HBOX
gtk_box_pack_start(GTK_BOX(window->content_hbox), GTK_WIDGET(new_cv), TRUE, TRUE, GNOME_PAD);
#else
gtk_paned_pack1(GTK_PANED(window->content_hbox), new_cv, TRUE, FALSE);
gtk_paned_pack1(GTK_PANED(window->content_hbox), GTK_WIDGET(new_cv), TRUE, FALSE);
#endif
gtk_widget_queue_resize(window->content_hbox);
......
......@@ -37,7 +37,7 @@ nautilus_navinfo_new(NautilusNavigationInfo *navinfo,
const char *meta_keys[] = {"icon-filename", NULL};
memset(navinfo, 0, sizeof(*navinfo));
navinfo->navinfo.requested_uri = nri->requested_uri;