diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-12-18 18:38:24 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-12-18 18:38:24 +0000 |
| commit | c8a4e89fb37b507c02993740656e93e13797af6d (patch) | |
| tree | 090ffc2e83429467c093a59b2c032d4ade0540e8 /src/nautilus-main.c | |
| parent | 72aa6695e7422ad91231ccf18b26de90aceb1443 (diff) | |
| download | nautilus-c8a4e89fb37b507c02993740656e93e13797af6d.tar.gz | |
Use GtkIconTheme instead of GnomeIconTheme
2003-12-18 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-emblem-utils.c:
* libnautilus-private/nautilus-icon-factory.[ch]:
* src/nautilus-main.c:
* src/nautilus-server-connect.c:
* src/nautilus-window-manage-views.c:
Use GtkIconTheme instead of GnomeIconTheme
Diffstat (limited to 'src/nautilus-main.c')
| -rw-r--r-- | src/nautilus-main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 69c2d4a79..374a03a02 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -130,22 +130,23 @@ nautilus_main_event_loop_quit (void) static void register_icons (void) { - GnomeIconTheme *icon_theme; - char *icon; + GtkIconTheme *icon_theme; + GtkIconInfo *info; + const char *icon; GtkIconSource *source; GtkIconSet *set; GtkIconFactory *factory; icon_theme = nautilus_icon_factory_get_icon_theme (); - icon = gnome_icon_theme_lookup_icon (icon_theme, "gnome-fs-client", 48, - NULL, NULL); - if (icon != NULL) { + info = gtk_icon_theme_lookup_icon (icon_theme, "gnome-fs-client", 48, + 0); + if (info != NULL) { + icon = gtk_icon_info_get_filename (info); factory = gtk_icon_factory_new (); gtk_icon_factory_add_default (factory); source = gtk_icon_source_new (); gtk_icon_source_set_filename (source, icon); - g_free (icon); set = gtk_icon_set_new (); gtk_icon_set_add_source (set, source); @@ -155,12 +156,12 @@ register_icons (void) gtk_icon_source_free (source); + gtk_icon_info_free (info); g_object_unref (factory); } g_object_unref (icon_theme); - } int |