NautilusView is a GObject, not a GtkObject.

2002-04-21  Anders Carlsson  <andersca@gnu.org>

	* components/text/nautilus-text-view.c:
	(nautilus_text_view_finalize), (nautilus_text_view_class_init):
	NautilusView is a GObject, not a GtkObject.

	* src/nautilus-sidebar-title.c:
	(nautilus_sidebar_title_select_text_color),
	Set shadow color and offset using new eel functions.

	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
	Don't show translator credits when we don't need to.
	Also add myself as an author :)

5 files changed, 37 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index c7c360842..e2bc21446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-21  Anders Carlsson  <andersca@gnu.org>
+
+	* components/text/nautilus-text-view.c:
+	(nautilus_text_view_finalize), (nautilus_text_view_class_init):
+	NautilusView is a GObject, not a GtkObject.
+	
+	* src/nautilus-sidebar-title.c:
+	(nautilus_sidebar_title_select_text_color),
+	Set shadow color and offset using new eel functions.
+	
+	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
+	Don't show translator credits when we don't need to.
+	Also add myself as an author :)
+	
 2002-04-20	Diego González  <diego@pemas.net
 
 	* src/nautilus-preferences-dialog.c: split "Windows & Desktop" into two
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index 13c118253..a693a2053 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -196,26 +196,28 @@ nautilus_text_view_instance_init (NautilusTextView *view)
 }
 
 static void
-nautilus_text_view_destroy (GtkObject *object)
+nautilus_text_view_finalize (GObject *object)
 {
         NautilusTextView *view;
         
         view = (NautilusTextView*)object;        
                 
         cancel_load (view);
+
+        G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
 nautilus_text_view_class_init (NautilusTextViewClass *class)
 {
-        GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+        GObjectClass *object_class = G_OBJECT_CLASS (class);
         NautilusViewClass *view_class = NAUTILUS_VIEW_CLASS (class);
         const char *charset;
         gboolean utf8;
 
         view_class->load_location = load_location;
 
-        object_class->destroy = nautilus_text_view_destroy;
+        object_class->finalize = nautilus_text_view_finalize;
 
         n_encodings_to_try = 0;
         utf8 = g_get_charset (&charset);
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 7de65898f..33542aa5b 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -550,6 +550,7 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	const char *authors[] = {
 		"Alexander Larsson",
 		"Ali Abdin",
+		"Anders Carlsson",
 		"Andy Hertzfeld",
 		"Arlo Rose",
 		"Darin Adler",
@@ -606,7 +607,8 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 		 * which will be displayed at the bottom of the about
 		 * box to give credit to the translator(s).
 		 */
-		translator_credits = _("Translator Credits");
+		translator_credits = (strcmp (_("Translator Credits"), "Translator Credits") == 0) ?
+			NULL : _("Translator Credits");
 		
 		about = gnome_about_new (_("Nautilus"),
 					 VERSION,
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 3d5d38a39..8d4237370 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -64,7 +64,7 @@
 
 #define MORE_INFO_FONT_SIZE 	 12
 #define MIN_TITLE_FONT_SIZE 	 12
-#define MAX_TITLE_FONT_SIZE 	 20
+#define MAX_TITLE_FONT_SIZE 	 18
 #define TITLE_PADDING		  4
 
 static void                nautilus_sidebar_title_class_init (NautilusSidebarTitleClass *klass);
@@ -160,9 +160,9 @@ default_font_changed_callback (gpointer callback_data)
 
 static void
 nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
-{ 
+{
 	sidebar_title->details = g_new0 (NautilusSidebarTitleDetails, 1);
-
+	
 	/* Register to find out about icon theme changes */
 	g_signal_connect_object (nautilus_icon_factory_get (), "icons_changed",
 				 G_CALLBACK (update_icon), sidebar_title, G_CONNECT_SWAPPED);
@@ -354,16 +354,15 @@ nautilus_sidebar_title_select_text_color (NautilusSidebarTitle *sidebar_title)
 		eel_gtk_widget_set_foreground_color (sidebar_title->details->more_info_label,
 						     sidebar_info_title_color);
 
-#if GNOME2_CONVERSION_COMPLETE
-		eel_label_set_smooth_drop_shadow_color (EEL_LABEL (sidebar_title->details->title_label),
-							eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
-		eel_label_set_smooth_drop_shadow_color (EEL_LABEL (sidebar_title->details->more_info_label),
-							eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
-		eel_label_set_smooth_drop_shadow_offset (EEL_LABEL (sidebar_title->details->title_label),
-							 sidebar_title->details->shadow_offset);
-		eel_label_set_smooth_drop_shadow_offset (EEL_LABEL (sidebar_title->details->more_info_label),
-							 sidebar_title->details->shadow_offset);
-#endif
+		eel_gtk_label_set_drop_shadow_color (GTK_LABEL (sidebar_title->details->title_label),
+						     eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
+		eel_gtk_label_set_drop_shadow_color (GTK_LABEL (sidebar_title->details->more_info_label),
+						     eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
+
+		eel_gtk_label_set_drop_shadow_offset (GTK_LABEL (sidebar_title->details->title_label),
+						      sidebar_title->details->shadow_offset);
+		eel_gtk_label_set_drop_shadow_offset (GTK_LABEL (sidebar_title->details->more_info_label),
+						      sidebar_title->details->shadow_offset);
 		
 		g_free (sidebar_title_color);	
 		g_free (sidebar_info_title_color);	
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 7de65898f..33542aa5b 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -550,6 +550,7 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	const char *authors[] = {
 		"Alexander Larsson",
 		"Ali Abdin",
+		"Anders Carlsson",
 		"Andy Hertzfeld",
 		"Arlo Rose",
 		"Darin Adler",
@@ -606,7 +607,8 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 		 * which will be displayed at the bottom of the about
 		 * box to give credit to the translator(s).
 		 */
-		translator_credits = _("Translator Credits");
+		translator_credits = (strcmp (_("Translator Credits"), "Translator Credits") == 0) ?
+			NULL : _("Translator Credits");
 		
 		about = gnome_about_new (_("Nautilus"),
 					 VERSION,