summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog37
-rw-r--r--components/loser/content/nautilus-content-loser-ui.xml2
-rw-r--r--components/loser/sidebar/nautilus-sidebar-loser-ui.xml2
-rw-r--r--components/sample/nautilus-sample-content-view-ui.xml4
-rw-r--r--cut-n-paste-code/widgets/e-paned/e-paned.c2
-rw-r--r--libnautilus-private/Makefile.am2
-rw-r--r--libnautilus-private/nautilus-bonobo-extensions.c5
-rw-r--r--libnautilus-private/nautilus-icon-factory.c3
-rw-r--r--libnautilus/nautilus-clipboard-ui.xml8
-rw-r--r--src/nautilus-shell-ui.xml24
-rw-r--r--src/nautilus-sidebar-title.c3
-rw-r--r--src/nautilus-view-frame.c5
-rw-r--r--src/nautilus-window-toolbars.c4
13 files changed, 76 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 46184095e..aa3461051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2001-11-05 Darin Adler <darin@bentspoon.com>
+
+ * cut-n-paste-code/widgets/e-paned/e-paned.c:
+ (e_paned_handle_shown): Fix a G_OBJECT_CLASS that should
+ have been G_OBJECT_GET_CLASS.
+
+ * libnautilus-private/Makefile.am: Add back the dependency on
+ the cut-n-paste libraries.
+
+ * libnautilus-private/nautilus-bonobo-extensions.c:
+ (nautilus_bonobo_get_hidden): Silently ignore when there's no
+ "hidden" attribute rather than warning every time.
+
+ * libnautilus-private/nautilus-icon-factory.c:
+ (nautilus_icon_factory_get_pixbuf_for_icon): Ref all the pixbufs
+ on their way out of the icon factory since we don't have a new
+ strategy for removing them from the cache when the caller is done
+ yet.
+
+ * src/nautilus-sidebar-title.c:
+ (sidebar_title_create_more_info_label): Don't call make_smaller
+ so Havoc won't complain every time we do it.
+
+ * src/nautilus-view-frame.c: (nautilus_view_frame_destroy): Check
+ for NULL so we can call destroy any number of times.
+
+ * src/nautilus-window-toolbars.c:
+ (nautilus_window_initialize_toolbars): Turn off the code that
+ tries to load the throbber since we aren't compiling it yet.
+
+ * components/loser/content/nautilus-content-loser-ui.xml:
+ * components/loser/sidebar/nautilus-sidebar-loser-ui.xml:
+ * components/sample/nautilus-sample-content-view-ui.xml:
+ * libnautilus/nautilus-clipboard-ui.xml:
+ * src/nautilus-shell-ui.xml:
+ Update for new names of stock icons.
+
2001-11-03 Darin Adler <darin@bentspoon.com>
* Tons of files.
diff --git a/components/loser/content/nautilus-content-loser-ui.xml b/components/loser/content/nautilus-content-loser-ui.xml
index ea3b998f7..6c1bf9fab 100644
--- a/components/loser/content/nautilus-content-loser-ui.xml
+++ b/components/loser/content/nautilus-content-loser-ui.xml
@@ -14,7 +14,7 @@
<toolitem name="Kill Content Loser"
_label="Kill Content Loser"
_tip="Kill the Loser content view"
- pixtype="stock" pixname="Cut"
+ pixtype="stock" pixname="gtk-cut"
verb="Kill Content Loser"/>
</placeholder>
</dockitem>
diff --git a/components/loser/sidebar/nautilus-sidebar-loser-ui.xml b/components/loser/sidebar/nautilus-sidebar-loser-ui.xml
index 2f2b4eb0c..1a82770c5 100644
--- a/components/loser/sidebar/nautilus-sidebar-loser-ui.xml
+++ b/components/loser/sidebar/nautilus-sidebar-loser-ui.xml
@@ -14,7 +14,7 @@
<toolitem name="Kill Sidebar Loser"
_label="Kill Sidebar Loser"
_tip="Kill the Loser sidebar panel"
- pixtype="stock" pixname="Cut"
+ pixtype="stock" pixname="gtk-cut"
verb="Kill Sidebar Loser"/>
</placeholder>
</dockitem>
diff --git a/components/sample/nautilus-sample-content-view-ui.xml b/components/sample/nautilus-sample-content-view-ui.xml
index 41fbdcf0e..ccfeae0e4 100644
--- a/components/sample/nautilus-sample-content-view-ui.xml
+++ b/components/sample/nautilus-sample-content-view-ui.xml
@@ -5,7 +5,7 @@
<menuitem name="Sample Menu Item"
_label="_Sample"
_tip="This is a sample merged menu item"
- pixtype="stock" pixname="About"
+ pixtype="stock" pixname="gtk-new"
verb="Sample Menu Item"/>
</placeholder>
</submenu>
@@ -15,7 +15,7 @@
<toolitem name="Sample Dock Item"
_label="Sample"
_tip="This is a sample merged toolbar button"
- pixtype="stock" pixname="About"
+ pixtype="stock" pixname="gtk-new"
verb="Sample Dock Item"/>
</placeholder>
</dockitem>
diff --git a/cut-n-paste-code/widgets/e-paned/e-paned.c b/cut-n-paste-code/widgets/e-paned/e-paned.c
index 770bed830..8cb258e14 100644
--- a/cut-n-paste-code/widgets/e-paned/e-paned.c
+++ b/cut-n-paste-code/widgets/e-paned/e-paned.c
@@ -616,7 +616,7 @@ e_paned_compute_position(EPaned *paned,
gboolean
e_paned_handle_shown(EPaned *paned)
{
- EPanedClass *klass = E_PANED_CLASS(G_OBJECT_CLASS(paned));
+ EPanedClass *klass = E_PANED_CLASS(G_OBJECT_GET_CLASS(paned));
if (klass->handle_shown)
return (*klass->handle_shown)(paned);
else
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 1d549ec4b..c657b2860 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -173,7 +173,7 @@ libnautilus_private_la_SOURCES = \
fsattributesdir = $(datadir)/nautilus
fsattributes_DATA = filesystem-attributes.xml
-# $(lib_LTLIBRARIES): $(dependency_static_libs)
+$(lib_LTLIBRARIES): $(dependency_static_libs)
$(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp
nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL)
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index 1c38ff29a..4b46f0c09 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -135,10 +135,13 @@ nautilus_bonobo_get_hidden (BonoboUIComponent *ui,
{
char *value;
gboolean hidden;
+ CORBA_Environment ev;
g_return_val_if_fail (BONOBO_IS_UI_COMPONENT (ui), FALSE);
- value = bonobo_ui_component_get_prop (ui, path, "hidden", NULL);
+ CORBA_exception_init (&ev);
+ value = bonobo_ui_component_get_prop (ui, path, "hidden", &ev);
+ CORBA_exception_free (&ev);
if (value == NULL) {
/* No hidden attribute means not hidden. */
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 042b36527..8e103c22c 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -2059,6 +2059,9 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
pixbuf = icon->pixbuf;
if (!icon->outstanding) {
icon->outstanding = TRUE;
+#ifndef GNOME2_CONVERSION_COMPLETE
+ gdk_pixbuf_ref (pixbuf);
+#endif
} else {
gdk_pixbuf_ref (pixbuf);
}
diff --git a/libnautilus/nautilus-clipboard-ui.xml b/libnautilus/nautilus-clipboard-ui.xml
index b673c5a8f..200a15957 100644
--- a/libnautilus/nautilus-clipboard-ui.xml
+++ b/libnautilus/nautilus-clipboard-ui.xml
@@ -26,19 +26,19 @@
<submenu name="Edit">
<menuitem name="Cut"
_label="Cut _Text"
- pixtype="stock" pixname="Cut"
+ pixtype="stock" pixname="gtk-cut"
verb="Cut"/>
<menuitem name="Copy"
_label="_Copy Text"
- pixtype="stock" pixname="Copy"
+ pixtype="stock" pixname="gtk-copy"
verb="Copy"/>
<menuitem name="Paste"
_label="_Paste Text"
- pixtype="stock" pixname="Paste"
+ pixtype="stock" pixname="gtk-paste"
verb="Paste"/>
<menuitem name="Clear"
_label="C_lear Text"
- pixtype="stock" pixname="Clear"
+ pixtype="stock" pixname="gtk-clear"
verb="Clear"/>
<menuitem name="Select All"
_label="Select _All"
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 528ab9d5f..fc5074182 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -93,7 +93,7 @@
<menuitem name="Undo"
_label="_Undo"
_tip="Undo the last text change"
- pixtype="stock" pixname="Undo"
+ pixtype="stock" pixname="gtk-undo"
accel="*Control*z"
verb="Undo"/>
@@ -102,15 +102,15 @@
<menuitem name="Cut"
_label="Cut _Text"
- pixtype="stock" pixname="Cut"
+ pixtype="stock" pixname="gtk-cut"
verb="Cut"/>
<menuitem name="Copy"
_label="_Copy Text"
- pixtype="stock" pixname="Copy"
+ pixtype="stock" pixname="gtk-copy"
verb="Copy"/>
<menuitem name="Paste"
_label="_Paste Text"
- pixtype="stock" pixname="Paste"
+ pixtype="stock" pixname="gtk-paste"
verb="Paste"/>
<menuitem name="Clear"
_label="C_lear Text"
@@ -310,20 +310,20 @@
<control name="BackWrapper"
min_width="48"
- pixtype="stock" pixname="Back"/>
+ pixtype="stock" pixname="gtk-go-back"/>
<control name="ForwardWrapper"
min_width="48"
- pixtype="stock" pixname="Forward"/>
+ pixtype="stock" pixname="gtk-go-forward"/>
<toolitem name="Up"
_label="Up"
min_width="48"
- pixtype="stock" pixname="Up"
+ pixtype="stock" pixname="gtk-go-up"
verb="Up"/>
<toolitem name="Reload"
_label="Refresh"
_tip="Display the latest contents of the current location"
min_width="48"
- pixtype="stock" pixname="Refresh"
+ pixtype="stock" pixname="gtk-refresh"
verb="Reload"/>
<separator/>
@@ -332,24 +332,24 @@
_label="Home"
_tip="Go to the home location"
min_width="48"
- pixtype="stock" pixname="Home"
+ pixtype="stock" pixname="gtk-home"
verb="Home"/>
<toolitem name="Toggle Find Mode"
min_width="48"
type="toggle"
- pixtype="stock" pixname="Search"
+ pixtype="stock" pixname="gtk-find"
verb="Toggle Find Mode"/>
<toolitem name="Go to Web Search"
_label="Web Search"
_tip="Search the World Wide Web"
- pixtype="stock" pixname="Search"
+ pixtype="stock" pixname="gtk-find"
verb="Go to Web Search"/>
<separator/>
<toolitem name="Stop" _label="Stop"
min_width="48"
- pixtype="stock" pixname="Stop"
+ pixtype="stock" pixname="gtk-stop"
verb="Stop"/>
<placeholder name="Extra Buttons Placeholder" delimit="top"/>
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 0807186a1..715b46952 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -887,8 +887,9 @@ sidebar_title_create_more_info_label (void)
GtkWidget *more_info_label;
more_info_label = eel_label_new_with_background ("");
+#if GNOME2_CONVERSION_COMPLETE
eel_label_make_smaller (EEL_LABEL (more_info_label), 2);
- eel_label_set_justify (EEL_LABEL (more_info_label), GTK_JUSTIFY_CENTER);
+#endif
eel_label_set_justify (EEL_LABEL (more_info_label), GTK_JUSTIFY_CENTER);
return more_info_label;
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index ec12b741c..fc014a452 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -378,7 +378,10 @@ nautilus_view_frame_destroy (GtkObject *object)
stop_activation (view);
destroy_view (view);
- nautilus_idle_queue_destroy (view->details->idle_queue);
+ if (view->details->idle_queue != NULL) {
+ nautilus_idle_queue_destroy (view->details->idle_queue);
+ view->details->idle_queue = NULL;
+ }
if (view->details->failed_idle_id != 0) {
gtk_idle_remove (view->details->failed_idle_id);
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 73690115e..33e199c1b 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -390,7 +390,9 @@ void
nautilus_window_initialize_toolbars (NautilusWindow *window)
{
CORBA_Environment ev;
+#ifdef GNOME2_CONVERSION_COMPLETE
char *exception_as_text;
+#endif
CORBA_exception_init (&ev);
@@ -405,6 +407,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window)
* at realize time, but another way is to special-case the
* desktop window.
*/
+#ifdef GNOME2_CONVERSION_COMPLETE
if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
window->throbber = bonobo_get_object ("OAFIID:nautilus_throbber", "IDL:Bonobo/Control:1.0", &ev);
if (BONOBO_EX (&ev)) {
@@ -415,6 +418,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window)
window->throbber = CORBA_OBJECT_NIL;
}
}
+#endif
nautilus_window_ui_freeze (window);
View Lorry Controller Status