Don't give critical warnings if we have no startup_id.

2005-02-22  Alexander Larsson  <alexl@redhat.com>

	* src/nautilus-application.c: (end_startup_notification):
	Don't give critical warnings if we have no startup_id.

	* src/nautilus-window.c: (nautilus_window_update_icon):
	Use names and not pixbufs for the window icons.
	This means the icons of the best size are used.
	Patch from Jaap Haitsma <jaap@haitsma.org>

3 files changed, 20 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b751f53d..2aa2fc44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2005-02-22  Alexander Larsson  <alexl@redhat.com>
 
+	* src/nautilus-application.c: (end_startup_notification):
+	Don't give critical warnings if we have no startup_id.
+	
+	* src/nautilus-window.c: (nautilus_window_update_icon):
+	Use names and not pixbufs for the window icons.
+	This means the icons of the best size are used.
+	Patch from Jaap Haitsma <jaap@haitsma.org>
+
+2005-02-22  Alexander Larsson  <alexl@redhat.com>
+
 	* src/nautilus-application.c: (create_window):
 	* src/nautilus-window-private.h:
 	* src/nautilus-window.c: (nautilus_window_init),
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index eaf8f6175..34c9a32be 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1007,7 +1007,9 @@ end_startup_notification (GtkWidget  *widget,
 	GdkDisplay *display;
 	GdkScreen  *screen;
 
-	g_return_if_fail (startup_id != NULL);
+	if (startup_id == NULL) {
+		return;
+	}
   
 	if (!GTK_WIDGET_REALIZED (widget)) {
 		gtk_widget_realize (widget);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index f36ef8bb2..8531d4577 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1072,28 +1072,19 @@ nautilus_window_update_title (NautilusWindow *window)
 void
 nautilus_window_update_icon (NautilusWindow *window)
 {
-	GdkPixbuf *pixbuf;
-        GtkIconTheme *icon_theme;
+	char *icon_name = NULL;
 
-	pixbuf = NULL;
-	
 	/* Desktop window special icon */
 	if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
-                icon_theme = nautilus_icon_factory_get_icon_theme ();
-                pixbuf = gtk_icon_theme_load_icon (icon_theme,
-						   "gnome-fs-desktop", 48,
-						   0, NULL);
-                g_object_unref(icon_theme);
-
+		icon_name = g_strdup ("gnome-fs-desktop");
 	} else {
-		pixbuf = nautilus_icon_factory_get_pixbuf_for_file (window->details->viewed_file,
-								    "open",
-								    NAUTILUS_ICON_SIZE_STANDARD);
+		icon_name = nautilus_icon_factory_get_icon_for_file (window->details->viewed_file,
+								     FALSE);
 	}
 
-	if (pixbuf != NULL) {
-		gtk_window_set_icon (GTK_WINDOW (window), pixbuf);
-		g_object_unref (pixbuf);
+	if (icon_name != NULL) {
+		gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
+		g_free (icon_name);
 	}
 }