Mercurial > geeqie
changeset 1332:4286f08079b6
Fix up color profiles menu: mark empty entries (but not NULL) as inactive.
| author | zas_ |
|---|---|
| date | Fri, 27 Feb 2009 22:28:17 +0000 |
| parents | a5c15bf32cdb |
| children | bdc19836c33d |
| files | src/layout.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/layout.c Fri Feb 27 21:30:28 2009 +0000 +++ b/src/layout.c Fri Feb 27 22:28:17 2009 +0000 @@ -469,7 +469,7 @@ gchar *end; name = options->color_profile.input_name[i]; - if (!name) name = filename_from_path(options->color_profile.input_file[i]); + if (!name || !name[0]) name = filename_from_path(options->color_profile.input_file[i]); end = layout_color_name_parse(name); buf = g_strdup_printf(_("Input _%d: %s"), i + COLOR_PROFILE_FILE, end); @@ -480,7 +480,7 @@ G_CALLBACK(layout_color_menu_input_cb), lw); g_free(buf); g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(i + COLOR_PROFILE_FILE)); - gtk_widget_set_sensitive(item, active && options->color_profile.input_file[i] && !from_image); + gtk_widget_set_sensitive(item, active && !from_image && options->color_profile.input_file[i][0]); } menu_item_add_divider(menu); @@ -496,7 +496,7 @@ _("_Screen profile"), (screen == 1), G_CALLBACK(layout_color_menu_screen_cb), lw); g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(1)); - gtk_widget_set_sensitive(item, active && options->color_profile.screen_file); + gtk_widget_set_sensitive(item, active && options->color_profile.screen_file[0]); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME); #endif /* HAVE_LCMS */