Skip to content

Commit

Permalink
Fix build without XMP support
Browse files Browse the repository at this point in the history
  • Loading branch information
raveit65 committed Aug 5, 2018
1 parent 70fd470 commit 22f5b20
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/eom-image.c
Expand Up @@ -2040,14 +2040,14 @@ eom_image_get_exif_info (EomImage *img)
gpointer
eom_image_get_xmp_info (EomImage *img)
{
EomImagePrivate *priv;
gpointer data = NULL;

g_return_val_if_fail (EOM_IS_IMAGE (img), NULL);

#ifdef HAVE_EXEMPI
EomImagePrivate *priv;
priv = img->priv;

#ifdef HAVE_EXEMPI
g_mutex_lock (&priv->status_mutex);
data = (gpointer) xmp_copy (priv->xmp);
g_mutex_unlock (&priv->status_mutex);
Expand Down
10 changes: 5 additions & 5 deletions src/eom-properties-dialog.c
Expand Up @@ -93,6 +93,9 @@ struct _EomPropertiesDialogPrivate {
GtkWidget *xmp_keywords_label;
GtkWidget *xmp_creator_label;
GtkWidget *xmp_rights_label;
#else
GtkWidget *xmp_box;
GtkWidget *xmp_box_label;
#endif
#if HAVE_METADATA
GtkWidget *metadata_box;
Expand Down Expand Up @@ -685,9 +688,6 @@ static void
eom_properties_dialog_init (EomPropertiesDialog *prop_dlg)
{
EomPropertiesDialogPrivate *priv;
#ifndef HAVE_EXEMPI
GtkWidget *xmp_box, *xmp_box_label;
#endif
#if HAVE_METADATA
GtkWidget *sw;
#endif
Expand Down Expand Up @@ -742,8 +742,8 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg)
}

#ifndef HAVE_EXEMPI
gtk_widget_hide (xmp_box);
gtk_widget_hide (xmp_box_label);
gtk_widget_hide (priv->xmp_box);
gtk_widget_hide (priv->xmp_box_label);
#endif

#else
Expand Down

0 comments on commit 22f5b20

Please sign in to comment.