From e0db07238231ef155e00616f7394fdc198c2dcd1 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Tue, 23 Mar 1999 20:39:29 +0000 Subject: [PATCH] 1999-03-23 Federico Mena Quintero * gnome-file-property-dialog.c (apply_metadata_change): Fixed incorrect logic when testing whether the icon changed or not. This makes icons change correctly again. * Makefile.in (GNOMEHDRS): Added gdesktop-init.h. --- gnome/ChangeLog | 8 ++++++++ gnome/Makefile.in | 1 + gnome/gnome-file-property-dialog.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index a7f624298..c51f7672c 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,11 @@ +1999-03-23 Federico Mena Quintero + + * gnome-file-property-dialog.c (apply_metadata_change): Fixed + incorrect logic when testing whether the icon changed or not. + This makes icons change correctly again. + + * Makefile.in (GNOMEHDRS): Added gdesktop-init.h. + 1999-03-23 Jonathan Blandford * gscreen.c (panel_tree_drag_motion): lets try to cut down on the flickers. diff --git a/gnome/Makefile.in b/gnome/Makefile.in index 43e27a76d..0a13e46f7 100644 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -72,6 +72,7 @@ GNOMEHDRS = \ gcorba.h \ gcustom-layout.h\ gdesktop-icon.h \ + gdesktop-init.h \ gdesktop.h \ gdnd.h \ gicon.h \ diff --git a/gnome/gnome-file-property-dialog.c b/gnome/gnome-file-property-dialog.c index e54ce7383..f30bc159b 100644 --- a/gnome/gnome-file-property-dialog.c +++ b/gnome/gnome-file-property-dialog.c @@ -1365,7 +1365,7 @@ apply_metadata_change (GnomeFilePropertyDialog *fpd) /*gtk_entry_get_text (GTK_ENTRY (gnome_icon_entry_gtk_entry (GNOME_ICON_ENTRY (fpd->button))));*/ if (text) { - if (fpd->icon_filename == NULL || (!strcmp (fpd->icon_filename, text))) + if (fpd->icon_filename == NULL || strcmp (fpd->icon_filename, text) != 0) gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text); g_free (text); }