Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some upstream fixes #67

Closed
wants to merge 2 commits into from
Closed

some upstream fixes #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e30b72e
some fixes from upstream:
monsta Jan 6, 2015
d2d0ff4
error message area: properly escape the error message markup
monsta Jan 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/eom-error-message-area.c
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@ set_message_area_text_and_icon (GtkInfoBar *message_area,
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (hbox_content), vbox, TRUE, TRUE, 0);

primary_markup = g_strdup_printf ("<b>%s</b>", primary_text);
primary_markup = g_markup_printf_escaped ("<b>%s</b>", primary_text);
primary_label = gtk_label_new (primary_markup);
g_free (primary_markup);

Expand All @@ -75,9 +75,9 @@ set_message_area_text_and_icon (GtkInfoBar *message_area,

gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);

if (secondary_text != NULL) {
secondary_markup = g_strdup_printf ("<small>%s</small>",
secondary_text);
if (secondary_text != NULL) {
secondary_markup = g_markup_printf_escaped ("<small>%s</small>",
secondary_text);
secondary_label = gtk_label_new (secondary_markup);
g_free (secondary_markup);

Expand Down
9 changes: 5 additions & 4 deletions src/eom-image.c
View file
Open in desktop
Expand Up @@ -149,6 +149,7 @@ eom_image_free_mem_private (EomImage *image)
#endif

priv->status = EOM_IMAGE_STATUS_UNKNOWN;
priv->metadata_status = EOM_IMAGE_METADATA_NOT_READ;
}
}

Expand Down Expand Up @@ -1195,17 +1196,17 @@ eom_image_has_data (EomImage *img, EomImageData req_data)
priv = img->priv;

if ((req_data & EOM_IMAGE_DATA_IMAGE) > 0) {
req_data = (req_data & !EOM_IMAGE_DATA_IMAGE);
req_data = (req_data & ~EOM_IMAGE_DATA_IMAGE);
has_data = has_data && (priv->image != NULL);
}

if ((req_data & EOM_IMAGE_DATA_DIMENSION) > 0 ) {
req_data = (req_data & !EOM_IMAGE_DATA_DIMENSION);
req_data = (req_data & ~EOM_IMAGE_DATA_DIMENSION);
has_data = has_data && (priv->width >= 0) && (priv->height >= 0);
}

if ((req_data & EOM_IMAGE_DATA_EXIF) > 0) {
req_data = (req_data & !EOM_IMAGE_DATA_EXIF);
req_data = (req_data & ~EOM_IMAGE_DATA_EXIF);
#ifdef HAVE_EXIF
has_data = has_data && (priv->exif != NULL);
#else
Expand All @@ -1214,7 +1215,7 @@ eom_image_has_data (EomImage *img, EomImageData req_data)
}

if ((req_data & EOM_IMAGE_DATA_XMP) > 0) {
req_data = (req_data & !EOM_IMAGE_DATA_XMP);
req_data = (req_data & ~EOM_IMAGE_DATA_XMP);
#ifdef HAVE_EXEMPI
has_data = has_data && (priv->xmp != NULL);
#endif
Expand Down
44 changes: 36 additions & 8 deletions src/eom-jobs.c
View file
Open in desktop
Expand Up @@ -613,10 +613,24 @@ eom_job_save_run (EomJob *ejob)
eom_image_data_ref (image);

if (!eom_image_has_data (image, EOM_IMAGE_DATA_ALL)) {
eom_image_load (image,
EOM_IMAGE_DATA_ALL,
NULL,
&ejob->error);
EomImageMetadataStatus m_status;
gint data2load = 0;

m_status = eom_image_get_metadata_status (image);
if (!eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE)) {
// Queue full read in this case
data2load = EOM_IMAGE_DATA_ALL;
} else if (m_status == EOM_IMAGE_METADATA_NOT_READ) {
// Load only if we haven't read it yet
data2load = EOM_IMAGE_DATA_EXIF | EOM_IMAGE_DATA_XMP;
}

if (data2load != 0) {
eom_image_load (image,
data2load,
NULL,
&ejob->error);
}
}

handler_id = g_signal_connect (G_OBJECT (image),
Expand Down Expand Up @@ -720,10 +734,24 @@ eom_job_save_as_run (EomJob *ejob)
eom_image_data_ref (image);

if (!eom_image_has_data (image, EOM_IMAGE_DATA_ALL)) {
eom_image_load (image,
EOM_IMAGE_DATA_ALL,
NULL,
&ejob->error);
EomImageMetadataStatus m_status;
gint data2load = 0;

m_status = eom_image_get_metadata_status (image);
if (!eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE)) {
// Queue full read in this case
data2load = EOM_IMAGE_DATA_ALL;
} else if (m_status == EOM_IMAGE_METADATA_NOT_READ) {
// Load only if we haven't read it yet
data2load = EOM_IMAGE_DATA_EXIF | EOM_IMAGE_DATA_XMP;
}

if (data2load != 0) {
eom_image_load (image,
data2load,
NULL,
&ejob->error);
}
}

g_assert (ejob->error == NULL);
Expand Down
12 changes: 8 additions & 4 deletions src/eom-window.c
View file
Open in desktop
Expand Up @@ -487,7 +487,7 @@ update_status_bar (EomWindow *window)
priv = window->priv;

if (priv->image != NULL &&
eom_image_has_data (priv->image, EOM_IMAGE_DATA_ALL)) {
eom_image_has_data (priv->image, EOM_IMAGE_DATA_DIMENSION)) {
int zoom, width, height;
goffset bytes = 0;

Expand Down Expand Up @@ -847,7 +847,7 @@ eom_window_display_image (EomWindow *window, EomImage *image)

eom_debug (DEBUG_WINDOW);

g_assert (eom_image_has_data (image, EOM_IMAGE_DATA_ALL));
g_assert (eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE));

priv = window->priv;

Expand Down Expand Up @@ -1438,7 +1438,7 @@ handle_image_selection_changed_cb (EomThumbView *thumbview, EomWindow *window)
priv->image_info_message_cid);
eom_scroll_view_set_image (EOM_SCROLL_VIEW (priv->view),
NULL);
}
}

if (eom_thumb_view_get_n_selected (EOM_THUMB_VIEW (priv->thumbview)) == 0)
return;
Expand All @@ -1461,7 +1461,11 @@ handle_image_selection_changed_cb (EomThumbView *thumbview, EomWindow *window)
return;
}

if (eom_image_has_data (image, EOM_IMAGE_DATA_ALL)) {
if (eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE)) {
if (priv->image != NULL)
g_object_unref (priv->image);

priv->image = image;
eom_window_display_image (window, image);
return;
}
Expand Down