diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-01-18 08:43:55 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-01-18 08:43:55 +0000 |
| commit | fc5566fb48b417ec896f02c823d0aa829c09ef55 (patch) | |
| tree | 00a1e7172c94c7a662f03d04e5e49580e51a6f66 /src/nautilus-window.c | |
| parent | f51427cb1cc5bdb6216e0ebaa2f72423e709a1ec (diff) | |
| download | nautilus-fc5566fb48b417ec896f02c823d0aa829c09ef55.tar.gz | |
Better default icon. Patch from Jaap Haitsma <jaap@haitsma.org>
2005-01-18 Alexander Larsson <alexl@redhat.com>
* src/nautilus-main.c: (main):
* src/nautilus-window.c: (nautilus_window_class_init):
Better default icon.
Patch from Jaap Haitsma <jaap@haitsma.org>
Diffstat (limited to 'src/nautilus-window.c')
| -rw-r--r-- | src/nautilus-window.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 6cd1e8d77..c29dfaab8 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -124,37 +124,6 @@ G_DEFINE_TYPE_WITH_CODE (NautilusWindow, nautilus_window, GTK_TYPE_WINDOW, G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_WINDOW_INFO, nautilus_window_info_iface_init)); - -static void -set_up_default_icon_list (void) -{ - GList *icon_list; - guint i; - GdkPixbuf *pixbuf; - char *path; - const char *icon_filenames[] = { "nautilus-mini-logo.png", "nautilus-launch-icon.png" }; - - icon_list = NULL; - for (i = 0; i < G_N_ELEMENTS (icon_filenames); i++) { - path = nautilus_pixmap_file (icon_filenames[i]); - - if (path == NULL) { - continue; - } - - pixbuf = gdk_pixbuf_new_from_file (path, NULL); - g_free (path); - - if (pixbuf != NULL) { - icon_list = g_list_prepend (icon_list, pixbuf); - } - } - - gtk_window_set_default_icon_list (icon_list); - - eel_g_list_free_deep_custom (icon_list, (GFunc) g_object_unref, NULL); -} - static void icons_changed_callback (GObject *factory, NautilusWindow *window) { @@ -1483,15 +1452,6 @@ nautilus_window_class_init (NautilusWindowClass *class) NAUTILUS_TYPE_APPLICATION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - /* Set default for all windows. This probably should be done - * in main or NautilusApplication rather than here in case - * some other window is created before the first - * NautilusWindow. Also, do we really want this icon for - * dialogs? - */ - set_up_default_icon_list (); - - signals[GO_UP] = g_signal_new ("go_up", G_TYPE_FROM_CLASS (class), |