summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--src/nautilus-navigation-window.c14
-rw-r--r--src/nautilus-object-window.c14
-rw-r--r--src/nautilus-shell.c2
-rw-r--r--src/nautilus-spatial-window.c14
-rw-r--r--src/nautilus-window.c14
6 files changed, 40 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index d5f0c6dea..0c66699a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-03 Darin Adler <darin@eazel.com>
+
+ * src/nautilus-shell.c: (display_caveat): Lets call the main
+ branch "Nautilus", not "Nautilus Preview Release 2". Later we
+ should change the caveat for cvs to be worded differently too.
+
+ * src/nautilus-window.c: (nautilus_window_constructed),
+ (nautilus_window_set_arg), (nautilus_window_get_arg),
+ (nautilus_window_set_content_view_widget): Fixed spaces removed
+ by the script (forgot to save this file before committing before).
+
2000-11-03 Ramiro Estrugo <ramiro@eazel.com>
* Makefile.am:
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index f1804d596..30044f10f 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
/* CORBA and Bonobo setup, which must be done before the location bar setup */
window->details->ui_container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (window->details->ui_container,
- BONOBO_WINDOW(window));
+ BONOBO_WINDOW (window));
/* Load the user interface from the XML file. */
window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
}
gtk_widget_show (window->content_hbox);
- bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
/* set up the index panel */
@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
if (GTK_VALUE_STRING (*arg) == NULL) {
return;
}
- old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
- bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
/* This hack of using the time when the name first
* goes non-NULL to be window-constructed time is
* completely lame. But it works, so for now we leave
@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
{
switch(arg_id) {
case ARG_APP_ID:
- GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
break;
case ARG_APP:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -1420,8 +1420,8 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
}
/* Here's an explicit check for a problem that happens all too often. */
- if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
- "/menu/File/Open Placeholder/Open")) {
+ if (bonobo_window_xml_node_exists (BONOBO_WINDOW (window),
+ "/menu/File/Open Placeholder/Open")) {
g_warning ("There's a lingering Open menu item. "
"This usually means a new Bonobo bug.");
}
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index f1804d596..30044f10f 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
/* CORBA and Bonobo setup, which must be done before the location bar setup */
window->details->ui_container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (window->details->ui_container,
- BONOBO_WINDOW(window));
+ BONOBO_WINDOW (window));
/* Load the user interface from the XML file. */
window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
}
gtk_widget_show (window->content_hbox);
- bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
/* set up the index panel */
@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
if (GTK_VALUE_STRING (*arg) == NULL) {
return;
}
- old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
- bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
/* This hack of using the time when the name first
* goes non-NULL to be window-constructed time is
* completely lame. But it works, so for now we leave
@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
{
switch(arg_id) {
case ARG_APP_ID:
- GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
break;
case ARG_APP:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -1420,8 +1420,8 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
}
/* Here's an explicit check for a problem that happens all too often. */
- if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
- "/menu/File/Open Placeholder/Open")) {
+ if (bonobo_window_xml_node_exists (BONOBO_WINDOW (window),
+ "/menu/File/Open Placeholder/Open")) {
g_warning ("There's a lingering Open menu item. "
"This usually means a new Bonobo bug.");
}
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index e01228ffb..54e6b48ec 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -200,7 +200,7 @@ display_caveat (GtkWindow *parent_window)
}
text = nautilus_label_new
- (_("Thank you for your interest in Nautilus Preview Release 2.\n "
+ (_("Thank you for your interest in Nautilus.\n "
"\n"
"As with any software under development, you should exercise caution when "
"using Nautilus. Eazel does not provide any guarantee that it will work "
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index f1804d596..30044f10f 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
/* CORBA and Bonobo setup, which must be done before the location bar setup */
window->details->ui_container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (window->details->ui_container,
- BONOBO_WINDOW(window));
+ BONOBO_WINDOW (window));
/* Load the user interface from the XML file. */
window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
}
gtk_widget_show (window->content_hbox);
- bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
/* set up the index panel */
@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
if (GTK_VALUE_STRING (*arg) == NULL) {
return;
}
- old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
- bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
/* This hack of using the time when the name first
* goes non-NULL to be window-constructed time is
* completely lame. But it works, so for now we leave
@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
{
switch(arg_id) {
case ARG_APP_ID:
- GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
break;
case ARG_APP:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -1420,8 +1420,8 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
}
/* Here's an explicit check for a problem that happens all too often. */
- if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
- "/menu/File/Open Placeholder/Open")) {
+ if (bonobo_window_xml_node_exists (BONOBO_WINDOW (window),
+ "/menu/File/Open Placeholder/Open")) {
g_warning ("There's a lingering Open menu item. "
"This usually means a new Bonobo bug.");
}
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index f1804d596..30044f10f 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
/* CORBA and Bonobo setup, which must be done before the location bar setup */
window->details->ui_container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (window->details->ui_container,
- BONOBO_WINDOW(window));
+ BONOBO_WINDOW (window));
/* Load the user interface from the XML file. */
window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
}
gtk_widget_show (window->content_hbox);
- bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
/* set up the index panel */
@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
if (GTK_VALUE_STRING (*arg) == NULL) {
return;
}
- old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
- bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
/* This hack of using the time when the name first
* goes non-NULL to be window-constructed time is
* completely lame. But it works, so for now we leave
@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
{
switch(arg_id) {
case ARG_APP_ID:
- GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
break;
case ARG_APP:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -1420,8 +1420,8 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
}
/* Here's an explicit check for a problem that happens all too often. */
- if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
- "/menu/File/Open Placeholder/Open")) {
+ if (bonobo_window_xml_node_exists (BONOBO_WINDOW (window),
+ "/menu/File/Open Placeholder/Open")) {
g_warning ("There's a lingering Open menu item. "
"This usually means a new Bonobo bug.");
}
View Lorry Controller Status